X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=7c4e417d90719f8097763c7c334b5375f4304903;hb=d0b24727ec39bf1486c90eeb28a73eacc1a53aca;hp=3540a3e2b18c1305a8b5dd395bd81ef3487377f4;hpb=6c4006c26484b1b28d59d4e65623b96ac0767919;p=collectd.git

diff --git a/configure.in b/configure.in
index 3540a3e2..7c4e417d 100644
--- a/configure.in
+++ b/configure.in
@@ -2108,8 +2108,9 @@ if test "x$with_libperl" = "xyes" \
 then
   SAVE_CFLAGS=$CFLAGS
   SAVE_LDFLAGS=$LDFLAGS
-  PERL_CFLAGS=`$perl_interpreter -MExtUtils::Embed -e ccopts`
-  PERL_LDFLAGS=`$perl_interpreter -MExtUtils::Embed -e ldopts`
+dnl ARCHFLAGS="" -> disable multi -arch on OSX (see Config_heavy.pl:fetch_string)
+  PERL_CFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ccopts`
+  PERL_LDFLAGS=`ARCHFLAGS="" $perl_interpreter -MExtUtils::Embed -e ldopts`
   CFLAGS="$CFLAGS $PERL_CFLAGS"
   LDFLAGS="$LDFLAGS $PERL_LDFLAGS"
 
@@ -3151,6 +3152,7 @@ dependency_error="no"
 plugin_ascent="no"
 plugin_battery="no"
 plugin_bind="no"
+plugin_conntrack="no"
 plugin_cpu="no"
 plugin_cpufreq="no"
 plugin_df="no"
@@ -3184,6 +3186,7 @@ plugin_wireless="no"
 if test "x$ac_system" = "xLinux"
 then
 	plugin_battery="yes"
+	plugin_conntrack="yes"
 	plugin_cpu="yes"
 	plugin_cpufreq="yes"
 	plugin_disk="yes"
@@ -3272,6 +3275,7 @@ fi
 if test "x$have_sysctl" = "xyes"
 then
 	plugin_cpu="yes"
+	plugin_memory="yes"
 	plugin_swap="yes"
 	plugin_uptime="yes"
 fi
@@ -3366,6 +3370,7 @@ AC_PLUGIN([apple_sensors], [$with_libiokit],   [Apple's hardware sensors])
 AC_PLUGIN([ascent],      [$plugin_ascent],     [AscentEmu player statistics])
 AC_PLUGIN([battery],     [$plugin_battery],    [Battery statistics])
 AC_PLUGIN([bind],        [$plugin_bind],       [ISC Bind nameserver statistics])
+AC_PLUGIN([conntrack],   [$plugin_conntrack],  [nf_conntrack statistics])
 AC_PLUGIN([cpufreq],     [$plugin_cpufreq],    [CPU frequency statistics])
 AC_PLUGIN([cpu],         [$plugin_cpu],        [CPU usage statistics])
 AC_PLUGIN([csv],         [yes],                [CSV output plugin])
@@ -3647,6 +3652,7 @@ Configuration:
     ascent  . . . . . . . $enable_ascent
     battery . . . . . . . $enable_battery
     bind  . . . . . . . . $enable_bind
+    conntrack . . . . . . $enable_conntrack
     cpu . . . . . . . . . $enable_cpu
     cpufreq . . . . . . . $enable_cpufreq
     csv . . . . . . . . . $enable_csv