@cryptotaxi247 / netdata-1 / commits / 873264345

fix identation and excessive conditionals

Costa Tsaousis (ktsaou) committed Mar 3, 2017 at 10:07 UTC 8732643451056cb1ae257728cf26dc968d2e3cc6
2 files changed +7 -9
configure.ac
+3 -4
@@ -202,13 +202,12 @@ if test "${enable_plugin_freeipmi}" = "yes"; then
202 [IPMIMONITORING],
203 [libipmimonitoring],
204 )
205 - test -z "${IPMIMONITORING_LIBS}" && AC_MSG_ERROR([ipmimonitoring required but not found. Try installing 'libipmimonitoring-dev' or 'libipmimonitoring-devel'])
206 - freeipmi=yes
207 - AC_DEFINE([HAVE_FREEIPMI], [1], [ipmimonitoring usability])
205 + test -z "${IPMIMONITORING_LIBS}" && AC_MSG_ERROR([ipmimonitoring required but not found. Try installing 'libipmimonitoring-dev' or 'libipmimonitoring-devel'])
206 + AC_DEFINE([HAVE_FREEIPMI], [1], [ipmimonitoring usability])
207 OPTIONAL_IPMIMONITORING_CLFAGS="${IPMIMONITORING_CFLAGS}"
208 OPTIONAL_IPMIMONITORING_LIBS="${IPMIMONITORING_LIBS}"
209 fi
211 -AM_CONDITIONAL([FREEIPMI], [test x$freeipmi = xyes])
210 +AM_CONDITIONAL([FREEIPMI], [test x$enable_plugin_freeipmi = xyes])
211
212 if test "${enable_plugin_nfacct}" = "yes"; then
213 PKG_CHECK_MODULES(
src/Makefile.am
+4 -5
@@ -29,6 +29,9 @@ plugins_PROGRAMS =
29 if !MACOS
30 plugins_PROGRAMS += apps.plugin
31 endif
32 +if FREEIPMI
33 +plugins_PROGRAMS += freeipmi.plugin
34 +endif
35
36 netdata_SOURCES = \
37 appconfig.c appconfig.h \
@@ -161,14 +164,10 @@ apps_plugin_LDADD = \
164 $(OPTIONAL_CAP_LIBS) \
165 $(NULL)
166
164 -if FREEIPMI
165 -plugins_PROGRAMS += freeipmi.plugin
166 -
167 freeipmi_plugin_SOURCES = \
168 freeipmi_plugin.c \
169 $(NULL)
170
171 freeipmi_plugin_LDADD = \
172 - $(OPTIONAL_IPMIMONITORING_LIBS) \
172 + $(OPTIONAL_IPMIMONITORING_LIBS) \
173 $(NULL)
174 -endif