fix identation and excessive conditionals

diff --git a/configure.ac b/configure.ac
index 2aa742df86756ac7b82ffdf9bc2ed2cb41be85e6..bd0371a3c969b8363d0efce8edff389552d003bd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -202,13 +202,12 @@ if test "${enable_plugin_freeipmi}" = "yes"; then
                [IPMIMONITORING],
                [libipmimonitoring],
        )
-    test -z "${IPMIMONITORING_LIBS}" && AC_MSG_ERROR([ipmimonitoring required but not found. Try installing 'libipmimonitoring-dev' or 'libipmimonitoring-devel'])
-    freeipmi=yes
-    AC_DEFINE([HAVE_FREEIPMI], [1], [ipmimonitoring usability])
+       test -z "${IPMIMONITORING_LIBS}" && AC_MSG_ERROR([ipmimonitoring required but not found. Try installing 'libipmimonitoring-dev' or 'libipmimonitoring-devel'])
+       AC_DEFINE([HAVE_FREEIPMI], [1], [ipmimonitoring usability])
        OPTIONAL_IPMIMONITORING_CLFAGS="${IPMIMONITORING_CFLAGS}"
        OPTIONAL_IPMIMONITORING_LIBS="${IPMIMONITORING_LIBS}"
 fi
-AM_CONDITIONAL([FREEIPMI], [test x$freeipmi = xyes])
+AM_CONDITIONAL([FREEIPMI], [test x$enable_plugin_freeipmi = xyes])
 
 if test "${enable_plugin_nfacct}" = "yes"; then
        PKG_CHECK_MODULES(

diff --git a/src/Makefile.am b/src/Makefile.am
index 2c672391e3fd1b173a53722a743cb6e7bf28c18c..16dc2c6f1c77989aa0ca26ca47650484ee938659 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,6 +29,9 @@ plugins_PROGRAMS =
 if !MACOS
 plugins_PROGRAMS += apps.plugin
 endif
+if FREEIPMI
+plugins_PROGRAMS += freeipmi.plugin
+endif
 
 netdata_SOURCES = \
        appconfig.c appconfig.h \
@@ -161,14 +164,10 @@ apps_plugin_LDADD = \
        $(OPTIONAL_CAP_LIBS) \
        $(NULL)
 
-if FREEIPMI
-plugins_PROGRAMS += freeipmi.plugin
-
 freeipmi_plugin_SOURCES = \
        freeipmi_plugin.c \
        $(NULL)
 
 freeipmi_plugin_LDADD = \
-    $(OPTIONAL_IPMIMONITORING_LIBS) \
+       $(OPTIONAL_IPMIMONITORING_LIBS) \
        $(NULL)
-endif