build system: Fixed indentation and unconditionally declare CFLAGS and LIBADD.

diff --git a/configure.in b/configure.in
index 7477f4191ea3552c61f242613791ba72d663192c..d817becc9a6f28c6f1eff25ffa67d90134ea4d89 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2337,7 +2337,7 @@ then
        plugin_load="yes"
        plugin_memory="yes"
        plugin_swap="yes"
-       plugin_users="yes"
+       plugin_users="yes"
 fi
 
 if test "x$with_libcurl" = "xyes" && test "x$with_libxml2" = "xyes"

diff --git a/src/Makefile.am b/src/Makefile.am
index 2618ba9e04ddda5f81789e51ef126d63aaff356c..1f7caef78812554c99c866ea6642dc62674df285 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,7 +145,9 @@ endif
 if BUILD_PLUGIN_CPU
 pkglib_LTLIBRARIES += cpu.la
 cpu_la_SOURCES = cpu.c
+cpu_la_CFLAGS =
 cpu_la_LDFLAGS = -module -avoid-version
+cpu_la_LIBADD = 
 if BUILD_WITH_LIBKSTAT
 cpu_la_LDFLAGS += -lkstat
 endif
@@ -153,8 +155,8 @@ if BUILD_WITH_LIBDEVINFO
 cpu_la_LDFLAGS += -ldevinfo
 endif
 if BUILD_WITH_LIBSTATGRAB
-cpu_la_CFLAGS = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-cpu_la_LIBADD = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+cpu_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+cpu_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 endif
 collectd_LDADD += "-dlopen" cpu.la
 collectd_DEPENDENCIES += cpu.la
@@ -187,7 +189,9 @@ endif
 if BUILD_PLUGIN_DISK
 pkglib_LTLIBRARIES += disk.la
 disk_la_SOURCES = disk.c
+disk_la_CFLAGS =
 disk_la_LDFLAGS = -module -avoid-version
+disk_la_LIBADD = 
 if BUILD_WITH_LIBKSTAT
 disk_la_LDFLAGS += -lkstat
 endif
@@ -198,8 +202,8 @@ if BUILD_WITH_LIBIOKIT
 disk_la_LDFLAGS += -lIOKit
 endif
 if BUILD_WITH_LIBSTATGRAB
-disk_la_CFLAGS = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)  
-disk_la_LIBADD = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+disk_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)  
+disk_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 endif
 collectd_LDADD += "-dlopen" disk.la
 collectd_DEPENDENCIES += disk.la
@@ -641,10 +645,12 @@ endif
 if BUILD_PLUGIN_USERS
 pkglib_LTLIBRARIES += users.la
 users_la_SOURCES = users.c
+users_la_CFLAGS =
 users_la_LDFLAGS = -module -avoid-version
+users_la_LIBADD =
 if BUILD_WITH_LIBSTATGRAB
-users_la_CFLAGS = $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
-users_la_LIBADD = $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
+users_la_CFLAGS += $(BUILD_WITH_LIBSTATGRAB_CFLAGS)
+users_la_LIBADD += $(BUILD_WITH_LIBSTATGRAB_LDFLAGS)
 endif
 collectd_LDADD += "-dlopen" users.la
 collectd_DEPENDENCIES += users.la