X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=47e7291de8a18660de9dffa45eeccb155fb33da7;hb=de23afd;hp=719f94e51a7c7b5eac3ff5229a34d975787cfc96;hpb=351026b0595385ca5376211c1af965bf2d4731b9;p=collectd.git

diff --git a/configure.in b/configure.in
index 719f94e5..47e7291d 100644
--- a/configure.in
+++ b/configure.in
@@ -67,21 +67,36 @@ fi
 
 if test "x$ac_system" = "xSolaris"
 then
-	CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
+	AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1, [Define to enforce POSIX thread semantics under Solaris.])
 fi
 
 # Where to install .pc files.
 pkgconfigdir="${libdir}/pkgconfig"
 AC_SUBST(pkgconfigdir)
 
+# Check for standards compliance mode
+AC_ARG_ENABLE(standards,
+	      AS_HELP_STRING([--enable-standards], [Enable standards compliance mode]),
+	      [enable_standards="$enableval"],
+	      [enable_standards="no"])
+if test "x$enable_standards" = "xyes"
+then
+	AC_DEFINE(_ISOC99_SOURCE,        1, [Define to enforce ISO C99 compliance.])
+	AC_DEFINE(_POSIX_C_SOURCE, 200112L, [Define to enforce POSIX.1-2001 compliance.])
+	AC_DEFINE(_XOPEN_SOURCE,       600, [Define to enforce X/Open 6 (XSI) compliance.])
+	AC_DEFINE(_REENTRANT,            1, [Define to enable reentrancy interfaces.])
+fi
+AM_CONDITIONAL(BUILD_FEATURE_STANDARDS, test "x$enable_standards" = "xyes")
+
 #
 # Checks for header files.
 #
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
+AC_HEADER_STDBOOL
 
-AC_CHECK_HEADERS(stdio.h stdint.h stdbool.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
+AC_CHECK_HEADERS(stdio.h stdint.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
 
 # For ping library
 AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
@@ -250,7 +265,7 @@ AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [],
 
 # For the swap module
 have_sys_swap_h="yes"
-AC_CHECK_HEADERS(sys/swap.h, [], [have_sys_swap_h="no"],
+AC_CHECK_HEADERS(sys/swap.h vm/anon.h, [], [have_sys_swap_h="no"],
 [
 #if HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -262,7 +277,14 @@ AC_CHECK_HEADERS(sys/swap.h, [], [have_sys_swap_h="no"],
 
 if test "x$have_sys_swap_h$ac_system" = "xnoSolaris"
 then
-	AC_MSG_NOTICE([Solaris detected and sys/swap.h not found: Try building a 64bit binary.])
+	hint_64=""
+	if test "x$GCC" = "xyes"
+	then
+		hint_64="CFLAGS='-m64'"
+	else
+		hint_64="CFLAGS='-xarch=v9'"
+	fi
+	AC_MSG_NOTICE([Solaris detected and sys/swap.h not usable. Try building a 64-bit binary ($hint_64 ./configure).])
 fi
 
 # For load module
@@ -347,7 +369,7 @@ AC_CHECK_HEADERS(linux/un.h, [], [],
 #endif
 ])
 
-AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h sys/quota.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h wordexp.h)
+AC_CHECK_HEADERS(pwd.h grp.h sys/un.h ctype.h limits.h xfs/xqm.h fs_info.h fshelp.h paths.h mntent.h mnttab.h sys/fstyp.h sys/fs_types.h sys/mntent.h sys/mnttab.h sys/statfs.h sys/statvfs.h sys/vfs.h sys/vfstab.h kvm.h wordexp.h)
 
 # For the dns plugin
 AC_CHECK_HEADERS(arpa/nameser.h)
@@ -799,7 +821,6 @@ if test "x$have_getmntent" = "xc"; then
 		[c_cv_have_one_getmntent],
 		AC_COMPILE_IFELSE(
 			AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
-#include <mntent.h>
 #include "$srcdir/src/utils_mount.h"]],
 				[[
 				 FILE *fh;
@@ -816,7 +837,6 @@ if test "x$have_getmntent" = "xc"; then
 		[c_cv_have_two_getmntent],
 		AC_COMPILE_IFELSE(
 			AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
-#include <sys/mnttab.h>
 #include "$srcdir/src/utils_mount.h"]],
 				[[
 				 FILE *fh;
@@ -876,8 +896,40 @@ AC_CHECK_MEMBERS([struct net_device_stats.rx_bytes, struct net_device_stats.tx_p
 	#include <linux/netdevice.h>
 	])
 
+AC_CHECK_MEMBERS([struct kinfo_proc.ki_pid, struct kinfo_proc.ki_rssize, struct kinfo_proc.ki_rusage],
+	[
+		AC_DEFINE(HAVE_STRUCT_KINFO_PROC_FREEBSD, 1,
+			[Define if struct kinfo_proc exists in the FreeBSD variant.])
+		have_struct_kinfo_proc_freebsd="yes"
+	],
+	[
+		have_struct_kinfo_proc_freebsd="no"
+	],
+	[
+#include <kvm.h>
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+	])
+
+AC_CHECK_MEMBERS([struct kinfo_proc.kp_proc, struct kinfo_proc.kp_eproc],
+	[
+		AC_DEFINE(HAVE_STRUCT_KINFO_PROC_OPENBSD, 1,
+			[Define if struct kinfo_proc exists in the OpenBSD variant.])
+		have_struct_kinfo_proc_openbsd="yes"
+	],
+	[
+		have_struct_kinfo_proc_openbsd="no"
+	],
+	[
+#include <sys/param.h>
+#include <sys/sysctl.h>
+#include <kvm.h>
+	])
+
 AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
-[#if HAVE_STDINT_H
+[#define _BSD_SOURCE
+#if HAVE_STDINT_H
 # include <stdint.h>
 #endif
 #if HAVE_SYS_TYPES_H
@@ -897,7 +949,8 @@ AC_CHECK_MEMBERS([struct udphdr.uh_dport, struct udphdr.uh_sport], [], [],
 #endif
 ])
 AC_CHECK_MEMBERS([struct udphdr.dest, struct udphdr.source], [], [],
-[#if HAVE_STDINT_H
+[#define _BSD_SOURCE
+#if HAVE_STDINT_H
 # include <stdint.h>
 #endif
 #if HAVE_SYS_TYPES_H
@@ -1263,6 +1316,99 @@ AC_SUBST(GANGLIA_LIBS)
 AM_CONDITIONAL(BUILD_WITH_LIBGANGLIA, test "x$with_libganglia" = "xyes")
 # }}}
 
+# --with-libgcrypt {{{
+GCRYPT_CPPFLAGS="$GCRYPT_CPPFLAGS"
+GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS"
+GCRYPT_LIBS="$GCRYPT_LIBS"
+AC_ARG_WITH(libgcrypt, [AS_HELP_STRING([--with-libgcrypt@<:@=PREFIX@:>@], [Path to libgcrypt.])],
+[
+ if test -f "$withval" && test -x "$withval"
+ then
+	 with_libgcrypt_config="$withval"
+	 with_libgcrypt="yes"
+ else if test -f "$withval/bin/gcrypt-config" && test -x "$withval/bin/gcrypt-config"
+ then
+	 with_libgcrypt_config="$withval/bin/gcrypt-config"
+	 with_libgcrypt="yes"
+ else if test -d "$withval"
+ then
+	 GCRYPT_CPPFLAGS="$GCRYPT_CPPFLAGS -I$withval/include"
+	 GCRYPT_LDFLAGS="$GCRYPT_LDFLAGS -L$withval/lib"
+	 with_libgcrypt="yes"
+ else
+	 with_libgcrypt_config="gcrypt-config"
+	 with_libgcrypt="$withval"
+ fi; fi; fi
+],
+[
+ with_libgcrypt_config="libgcrypt-config"
+ with_libgcrypt="yes"
+])
+
+if test "x$with_libgcrypt" = "xyes" && test "x$with_libgcrypt_config" != "x"
+then
+	if test "x$GCRYPT_CPPFLAGS" = "x"
+	then
+		GCRYPT_CPPFLAGS=`"$with_libgcrypt_config" --cflags 2>/dev/null`
+	fi
+
+	if test "x$GCRYPT_LDFLAGS" = "x"
+	then
+		gcrypt_exec_prefix=`"$with_libgcrypt_config" --exec-prefix 2>/dev/null`
+		GCRYPT_LDFLAGS="-L$gcrypt_exec_prefix/lib"
+	fi
+
+	if test "x$GCRYPT_LIBS" = "x"
+	then
+		GCRYPT_LIBS=`"$with_libgcrypt_config" --libs 2>/dev/null`
+	fi
+fi
+
+SAVE_CPPFLAGS="$CPPFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+CPPFLAGS="$CPPFLAGS $GCRYPT_CPPFLAGS"
+LDFLAGS="$LDFLAGS $GCRYPT_LDFLAGS"
+
+if test "x$with_libgcrypt" = "xyes"
+then
+	if test "x$GCRYPT_CPPFLAGS" != "x"
+	then
+		AC_MSG_NOTICE([gcrypt CPPFLAGS: $GCRYPT_CPPFLAGS])
+	fi
+	AC_CHECK_HEADERS(gcrypt.h,
+		[with_libgcrypt="yes"],
+		[with_libgcrypt="no (gcrypt.h not found)"])
+fi
+
+if test "x$with_libgcrypt" = "xyes"
+then
+	if test "x$GCRYPT_LDFLAGS" != "x"
+	then
+		AC_MSG_NOTICE([gcrypt LDFLAGS: $GCRYPT_LDFLAGS])
+	fi
+	AC_CHECK_LIB(gcrypt, gcry_md_hash_buffer,
+		[with_libgcrypt="yes"],
+		[with_libgcrypt="no (symbol gcry_md_hash_buffer not found)"])
+
+	if test "$with_libgcrypt" != "no"; then
+		AM_PATH_LIBGCRYPT(1:1.2.0,,with_libgcrypt="no (version 1.2.0+ required)")
+	fi
+fi
+
+CPPFLAGS="$SAVE_CPPFLAGS"
+LDFLAGS="$SAVE_LDFLAGS"
+
+if test "x$with_libgcrypt" = "xyes"
+then
+	AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define to 1 if you have the gcrypt library (-lgcrypt).])
+fi
+
+AC_SUBST(GCRYPT_CPPFLAGS)
+AC_SUBST(GCRYPT_LDFLAGS)
+AC_SUBST(GCRYPT_LIBS)
+AM_CONDITIONAL(BUILD_WITH_LIBGCRYPT, test "x$with_libgcrypt" = "xyes")
+# }}}
+
 # --with-libiptc {{{
 with_own_libiptc="no"
 AC_ARG_WITH(libiptc, [AS_HELP_STRING([--with-libiptc@<:@=PREFIX@:>@], [Path to libiptc.])],
@@ -1335,6 +1481,7 @@ with_java_home="$JAVA_HOME"
 with_java_vmtype="client"
 with_java_cflags=""
 with_java_libs=""
+JAVAC="$JAVAC"
 AC_ARG_WITH(java, [AS_HELP_STRING([--with-java@<:@=PREFIX@:>@], [Path to Java home.])],
 [
 	if test "x$withval" = "xno"
@@ -1353,18 +1500,47 @@ if test "x$with_java" = "xyes"
 then
 	if test -d "$with_java_home"
 	then
-		if test -d "$with_java_home/include"
+		AC_MSG_CHECKING([for jni.h])
+		TMPDIR=`find -L "$with_java_home" -name jni.h -type f -exec 'dirname' '{}' ';' | head -n 1`
+		if test "x$TMPDIR" != "x"
 		then
-			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$with_java_home/include"
+			AC_MSG_RESULT([found in $TMPDIR])
+			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMPDIR"
 		else
-			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$with_java_home"
+			AC_MSG_RESULT([not found])
 		fi
-		
-		if test -d "$with_java_home/lib"
+
+		AC_MSG_CHECKING([for jni_md.h])
+		TMPDIR=`find -L "$with_java_home" -name jni_md.h -type f -exec 'dirname' '{}' ';' | head -n 1`
+		if test "x$TMPDIR" != "x"
 		then
-			JAVA_LDFLAGS="$JAVA_LDFLAGS -L$with_java_home/lib"
+			AC_MSG_RESULT([found in $TMPDIR])
+			JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$TMPDIR"
 		else
-			JAVA_LDFLAGS="$JAVA_LDFLAGS -L$with_java_home"
+			AC_MSG_RESULT([not found])
+		fi
+
+		AC_MSG_CHECKING([for libjvm.so])
+		TMPDIR=`find -L "$with_java_home" -name libjvm.so -type f -exec 'dirname' '{}' ';' | head -n 1`
+		if test "x$TMPDIR" != "x"
+		then
+			AC_MSG_RESULT([found in $TMPDIR])
+			JAVA_LDFLAGS="$JAVA_LDFLAGS -L$TMPDIR"
+		else
+			AC_MSG_RESULT([not found])
+		fi
+
+		if test "x$JAVAC" = "x"
+		then
+			AC_MSG_CHECKING([for javac])
+			TMPDIR=`find -L "$with_java_home" -name javac -type f | head -n 1`
+			if test "x$TMPDIR" != "x"
+			then
+				JAVAC="$TMPDIR"
+				AC_MSG_RESULT([$JAVAC])
+			else
+				AC_MSG_RESULT([not found])
+			fi
 		fi
 	else if test "x$with_java_home" != "x"
 	then
@@ -1384,6 +1560,24 @@ if test "x$JAVA_LDFLAGS" != "x"
 then
 	AC_MSG_NOTICE([Building with JAVA_LDFLAGS set to: $JAVA_LDFLAGS])
 fi
+if test "x$JAVAC" = "x"
+then
+	with_javac_path="$PATH"
+	if test "x$with_java_home" != "x"
+	then
+		with_javac_path="$with_java_home:with_javac_path"
+		if test -d "$with_java_home/bin"
+		then
+			with_javac_path="$with_java_home/bin:with_javac_path"
+		fi
+	fi
+
+	AC_PATH_PROG(JAVAC, javac, [], "$with_javac_path")
+fi
+if test "x$JAVAC" = "x"
+then
+	with_java="no (javac not found)"
+fi
 
 SAVE_CPPFLAGS="$CPPFLAGS"
 SAVE_CFLAGS="$CFLAGS"
@@ -1539,6 +1733,11 @@ then
 		 [with_libmysql="yes"],
 		 [with_libmysql="no (symbol 'mysql_init' not found)"],
 		 [$with_mysql_libs])
+
+		AC_CHECK_LIB(mysqlclient, mysql_get_server_version,
+		 [with_libmysql="yes"],
+		 [with_libmysql="no (symbol 'mysql_get_server_version' not found)"],
+		 [$with_mysql_libs])
 	fi
 fi
 if test "x$with_libmysql" = "xyes"
@@ -2024,8 +2223,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"
 
@@ -2102,7 +2302,6 @@ then
 	LDFLAGS=$SAVE_LDFLAGS
 fi
 
-c_cv_have_broken_perl_load_module="no"
 if test "x$with_libperl" = "xyes"
 then
 	SAVE_CFLAGS=$CFLAGS
@@ -3024,28 +3223,42 @@ AC_DEFUN(
   [AC_PLUGIN],
   [
     enable_plugin="no"
+    force="no"
     AC_ARG_ENABLE([$1], AC_HELP_STRING([--enable-$1], [$3]),
     [
      if test "x$enableval" = "xyes"
      then
 	     enable_plugin="yes"
-     else
-	     enable_plugin="no"
-     fi
-    ],
-    [
-     if test "x$2" = "xyes"
+     else if test "x$enableval" = "xforce"
      then
 	     enable_plugin="yes"
+	     force="yes"
      else
 	     enable_plugin="no"
-     fi
+     fi; fi
+    ],
+    [
+	 if test "x$enable_all_plugins" = "xauto"
+	 then
+	     if test "x$2" = "xyes"
+	     then
+		     enable_plugin="yes"
+	     else
+		     enable_plugin="no"
+	     fi
+	 else
+	     enable_plugin="$enable_all_plugins"
+	 fi
     ])
     if test "x$enable_plugin" = "xyes"
     then
-	    if test "x$2" = "xyes"
+	    if test "x$2" = "xyes" || test "x$force" = "xyes"
 	    then
 		    AC_DEFINE([HAVE_PLUGIN_]my_toupper([$1]), 1, [Define to 1 if the $1 plugin is enabled.])
+		    if test "x$2" != "xyes"
+		    then
+			    dependency_warning="yes"
+		    fi
 	    else # User passed "yes" but dependency checking yielded "no" => Dependency problem.
 		    dependency_error="yes"
 		    enable_plugin="no (dependency error)"
@@ -3063,10 +3276,13 @@ AC_COLLECTD([debug],     [enable],  [feature], [debugging])
 AC_COLLECTD([daemon],    [disable], [feature], [daemon mode])
 AC_COLLECTD([getifaddrs],[enable],  [feature], [getifaddrs under Linux])
 
+dependency_warning="no"
 dependency_error="no"
+
 plugin_ascent="no"
 plugin_battery="no"
 plugin_bind="no"
+plugin_conntrack="no"
 plugin_cpu="no"
 plugin_cpufreq="no"
 plugin_df="no"
@@ -3081,6 +3297,7 @@ plugin_load="no"
 plugin_memory="no"
 plugin_multimeter="no"
 plugin_nfs="no"
+plugin_fscache="no"
 plugin_perl="no"
 plugin_processes="no"
 plugin_protocols="no"
@@ -3100,6 +3317,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"
@@ -3109,6 +3327,7 @@ then
 	plugin_load="yes"
 	plugin_memory="yes"
 	plugin_nfs="yes"
+	plugin_fscache="yes"
 	plugin_processes="yes"
 	plugin_protocols="yes"
 	plugin_serial="yes"
@@ -3188,6 +3407,7 @@ fi
 if test "x$have_sysctl" = "xyes"
 then
 	plugin_cpu="yes"
+	plugin_memory="yes"
 	plugin_swap="yes"
 	plugin_uptime="yes"
 fi
@@ -3198,14 +3418,40 @@ then
 	plugin_tcpconns="yes"
 fi
 
-if test "x$have_statfs" = "xyes"
+# Df plugin: Check if we know how to determine mount points first.
+#if test "x$have_listmntent" = "xyes"; then
+#	plugin_df="yes"
+#fi
+if test "x$have_getvfsstat" = "xyes" || test "x$have_getfsstat" = "xyes"
 then
 	plugin_df="yes"
 fi
-if test "x$have_statvfs" = "xyes"
+if test "x$c_cv_have_two_getmntent" = "xyes" || test "x$have_getmntent" = "xgen" || test "x$have_getmntent" = "xsun"
 then
 	plugin_df="yes"
 fi
+#if test "x$have_getmntent" = "xseq"
+#then
+#	plugin_df="yes"
+#fi
+if test "x$c_cv_have_one_getmntent" = "xyes"
+then
+	plugin_df="yes"
+fi
+
+# Df plugin: Check if we have either `statfs' or `statvfs' second.
+if test "x$plugin_df" = "xyes"
+then
+	plugin_df="no"
+	if test "x$have_statfs" = "xyes"
+	then
+		plugin_df="yes"
+	fi
+	if test "x$have_statvfs" = "xyes"
+	then
+		plugin_df="yes"
+	fi
+fi
 
 if test "x$have_getifaddrs" = "xyes"
 then
@@ -3244,7 +3490,7 @@ then
 	plugin_processes="yes"
 fi
 
-if test "x$with_kvm_getprocs" = "xyes"
+if test "x$with_kvm_getprocs" = "xyes" && test "x$have_struct_kinfo_proc_freebsd" = "xyes"
 then
 	plugin_processes="yes"
 fi
@@ -3276,12 +3522,31 @@ fi
 m4_divert_once([HELP_ENABLE], [
 collectd plugins:])
 
+AC_ARG_ENABLE([all-plugins],
+		AC_HELP_STRING([--enable-all-plugins],
+				[enable all plugins (auto by def)]),
+		[
+		 if test "x$enableval" = "xyes"
+		 then
+			 enable_all_plugins="yes"
+		 else if test "x$enableval" = "xauto"
+		 then
+			 enable_all_plugins="auto"
+		 else
+			 enable_all_plugins="no"
+		 fi; fi
+		],
+		[enable_all_plugins="auto"])
+
+m4_divert_once([HELP_ENABLE], [])
+
 AC_PLUGIN([apache],      [$with_libcurl],      [Apache httpd statistics])
 AC_PLUGIN([apcups],      [yes],                [Statistics of UPSes by APC])
 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])
@@ -3294,6 +3559,7 @@ AC_PLUGIN([email],       [yes],                [EMail statistics])
 AC_PLUGIN([entropy],     [$plugin_entropy],    [Entropy statistics])
 AC_PLUGIN([exec],        [yes],                [Execution of external programs])
 AC_PLUGIN([filecount],   [yes],                [Count files in directories])
+AC_PLUGIN([fscache],     [$plugin_fscache],    [fscache statistics])
 AC_PLUGIN([gmond],       [$with_libganglia],   [Ganglia plugin])
 AC_PLUGIN([hddtemp],     [yes],                [Query hddtempd])
 AC_PLUGIN([interface],   [$plugin_interface],  [Interface traffic statistics])
@@ -3491,7 +3757,7 @@ AC_SUBST(LCC_VERSION_STRING)
 
 AC_CONFIG_FILES(src/libcollectdclient/lcc_features.h)
 
-AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile)
+AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/libcollectdclient/Makefile src/libcollectdclient/libcollectdclient.pc src/liboconfig/Makefile bindings/Makefile bindings/java/Makefile)
 
 if test "x$with_librrd" = "xyes" \
 	&& test "x$librrd_threadsafe" != "xyes"
@@ -3524,6 +3790,7 @@ Configuration:
     libcurl . . . . . . . $with_libcurl
     libdbi  . . . . . . . $with_libdbi
     libesmtp  . . . . . . $with_libesmtp
+    libgcrypt . . . . . . $with_libgcrypt
     libiokit  . . . . . . $with_libiokit
     libiptc . . . . . . . $with_libiptc
     libjvm  . . . . . . . $with_java
@@ -3563,6 +3830,7 @@ Configuration:
     ascent  . . . . . . . $enable_ascent
     battery . . . . . . . $enable_battery
     bind  . . . . . . . . $enable_bind
+    conntrack . . . . . . $enable_conntrack
     cpu . . . . . . . . . $enable_cpu
     cpufreq . . . . . . . $enable_cpufreq
     csv . . . . . . . . . $enable_csv
@@ -3575,6 +3843,7 @@ Configuration:
     entropy . . . . . . . $enable_entropy
     exec  . . . . . . . . $enable_exec
     filecount . . . . . . $enable_filecount
+    fscache . . . . . . . $enable_fscache
     gmond . . . . . . . . $enable_gmond
     hddtemp . . . . . . . $enable_hddtemp
     interface . . . . . . $enable_interface
@@ -3641,7 +3910,11 @@ Configuration:
 EOF
 
 if test "x$dependency_error" = "xyes"; then
-	AC_MSG_ERROR("Some plugins are missing dependencies - see above summary for details")
+	AC_MSG_ERROR("Some plugins are missing dependencies - see the summary above for details")
+fi
+
+if test "x$dependency_warning" = "xyes"; then
+	AC_MSG_WARN("Some plugins seem to have missing dependencies but have been enabled forcibly - see the summary above for details")
 fi
 
 # vim: set fdm=marker :