X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=07a4e2986b4b79d0f9f49409fbee219acadbb41a;hb=bc51ef217e871b80152eccd4e5f32659500f75f3;hp=4d47a9fd143272a90da7db6b13a355ca50d1b943;hpb=0f60795bc1b2b409ba5eb132975714de8d0cec89;p=collectd.git

diff --git a/configure.in b/configure.in
index 4d47a9fd..07a4e298 100644
--- a/configure.in
+++ b/configure.in
@@ -67,13 +67,27 @@ 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.
 #
@@ -347,7 +361,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)
@@ -876,8 +890,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 +943,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 +1310,95 @@ 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)"])
+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.])],
@@ -1353,18 +1489,34 @@ 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 -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 -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 -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
 	else if test "x$with_java_home" != "x"
 	then
@@ -2024,8 +2176,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 +2255,6 @@ then
 	LDFLAGS=$SAVE_LDFLAGS
 fi
 
-c_cv_have_broken_perl_load_module="no"
 if test "x$with_libperl" = "xyes"
 then
 	SAVE_CFLAGS=$CFLAGS
@@ -2243,6 +2395,10 @@ then
 		[with_libpq="yes"],
 		[with_libpq="no (symbol 'PQconnectdb' not found)"])
 
+	AC_CHECK_LIB(pq, PQserverVersion,
+		[with_libpq="yes"],
+		[with_libpq="no (symbol 'PQserverVersion' not found)"])
+
 	LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_libpq" = "xyes"
@@ -2748,6 +2904,57 @@ AC_DEFINE_UNQUOTED(HAVE_LIBXMMS, [$with_libxmms_numeric], [Define to 1 if you ha
 AM_CONDITIONAL(BUILD_WITH_LIBXMMS, test "x$with_libxmms" = "xyes")
 # }}}
 
+# --with-libyajl {{{
+with_libyajl_cppflags=""
+with_libyajl_ldflags=""
+AC_ARG_WITH(libyajl, [AS_HELP_STRING([--with-libyajl@<:@=PREFIX@:>@], [Path to libyajl.])],
+[
+	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+	then
+		with_libyajl_cppflags="-I$withval/include"
+		with_libyajl_ldflags="-L$withval/lib"
+		with_libyajl="yes"
+	else
+		with_libyajl="$withval"
+	fi
+],
+[
+	with_libyajl="yes"
+])
+if test "x$with_libyajl" = "xyes"
+then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
+
+	AC_CHECK_HEADERS(yajl/yajl_parse.h, [with_libyajl="yes"], [with_libyajl="no (yajl/yajl_parse.h not found)"])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+fi
+if test "x$with_libyajl" = "xyes"
+then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	SAVE_LDFLAGS="$LDFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_libyajl_cppflags"
+	LDFLAGS="$LDFLAGS $with_libyajl_ldflags"
+
+	AC_CHECK_LIB(yajl, yajl_alloc, [with_libyajl="yes"], [with_libyajl="no (Symbol 'yajl_alloc' not found)"])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+	LDFLAGS="$SAVE_LDFLAGS"
+fi
+if test "x$with_libyajl" = "xyes"
+then
+	BUILD_WITH_LIBYAJL_CPPFLAGS="$with_libyajl_cppflags"
+	BUILD_WITH_LIBYAJL_LDFLAGS="$with_libyajl_ldflags"
+	BUILD_WITH_LIBYAJL_LIBS="-lyajl"
+	AC_SUBST(BUILD_WITH_LIBYAJL_CPPFLAGS)
+	AC_SUBST(BUILD_WITH_LIBYAJL_LDFLAGS)
+	AC_SUBST(BUILD_WITH_LIBYAJL_LIBS)
+	AC_DEFINE(HAVE_LIBYAJL, 1, [Define if libyajl is present and usable.])
+fi
+AM_CONDITIONAL(BUILD_WITH_LIBYAJL, test "x$with_libyajl" = "xyes")
+# }}}
+
 # pkg-config --exists 'libxml-2.0'; pkg-config --exists libvirt {{{
 with_libxml2="no (pkg-config isn't available)"
 with_libxml2_cflags=""
@@ -3063,6 +3270,8 @@ dependency_error="no"
 plugin_ascent="no"
 plugin_battery="no"
 plugin_bind="no"
+plugin_conntrack="no"
+plugin_couchdb="no"
 plugin_cpu="no"
 plugin_cpufreq="no"
 plugin_df="no"
@@ -3077,6 +3286,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"
@@ -3096,6 +3306,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"
@@ -3105,6 +3316,7 @@ then
 	plugin_load="yes"
 	plugin_memory="yes"
 	plugin_nfs="yes"
+	plugin_fscache="yes"
 	plugin_processes="yes"
 	plugin_protocols="yes"
 	plugin_serial="yes"
@@ -3177,6 +3389,11 @@ then
 	plugin_ipmi="yes"
 fi
 
+if test "x$with_libcurl" = "xyes" && test "x$with_libyajl" = "xyes"
+then
+	plugin_couchdb="yes"
+fi
+
 if test "x$have_processor_info" = "xyes"
 then
 	plugin_cpu="yes"
@@ -3184,6 +3401,7 @@ fi
 if test "x$have_sysctl" = "xyes"
 then
 	plugin_cpu="yes"
+	plugin_memory="yes"
 	plugin_swap="yes"
 	plugin_uptime="yes"
 fi
@@ -3240,7 +3458,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
@@ -3278,6 +3496,8 @@ 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([couchdb],     [$plugin_couchdb],    [CouchDB statistics])
 AC_PLUGIN([cpufreq],     [$plugin_cpufreq],    [CPU frequency statistics])
 AC_PLUGIN([cpu],         [$plugin_cpu],        [CPU usage statistics])
 AC_PLUGIN([csv],         [yes],                [CSV output plugin])
@@ -3313,6 +3533,7 @@ AC_PLUGIN([mysql],       [$with_libmysql],     [MySQL statistics])
 AC_PLUGIN([netlink],     [$with_libnetlink],   [Enhanced Linux network statistics])
 AC_PLUGIN([network],     [yes],                [Network communication plugin])
 AC_PLUGIN([nfs],         [$plugin_nfs],        [NFS statistics])
+AC_PLUGIN([fscache],     [$plugin_fscache],    [fscache statistics])
 AC_PLUGIN([nginx],       [$with_libcurl],      [nginx statistics])
 AC_PLUGIN([notify_desktop], [$with_libnotify], [Desktop notifications])
 AC_PLUGIN([notify_email], [$with_libesmtp],    [Email notifier])
@@ -3520,6 +3741,7 @@ Configuration:
     libcurl . . . . . . . $with_libcurl
     libdbi  . . . . . . . $with_libdbi
     libesmtp  . . . . . . $with_libesmtp
+    libgcrypt . . . . . . $with_libgcrypt
     libiokit  . . . . . . $with_libiokit
     libiptc . . . . . . . $with_libiptc
     libjvm  . . . . . . . $with_java
@@ -3559,6 +3781,8 @@ Configuration:
     ascent  . . . . . . . $enable_ascent
     battery . . . . . . . $enable_battery
     bind  . . . . . . . . $enable_bind
+    conntrack . . . . . . $enable_conntrack
+    couchdb . . . . . . . $enable_couchdb
     cpu . . . . . . . . . $enable_cpu
     cpufreq . . . . . . . $enable_cpufreq
     csv . . . . . . . . . $enable_csv
@@ -3594,6 +3818,7 @@ Configuration:
     netlink . . . . . . . $enable_netlink
     network . . . . . . . $enable_network
     nfs . . . . . . . . . $enable_nfs
+    fscache . . . . . . . $enable_fscache
     nginx . . . . . . . . $enable_nginx
     notify_desktop  . . . $enable_notify_desktop
     notify_email  . . . . $enable_notify_email