X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=2379cbe79dbb31755647951f6718d53cab8b5f12;hb=b5c5890955fa19651ad8b3f48d99364d270a0d8f;hp=5b3a54a6548bbe687efea5d0a4032eeb654db7b8;hpb=8583b0d30a4f34a59914f3d1fe8ef82b0e399855;p=collectd.git

diff --git a/configure.in b/configure.in
index 5b3a54a6..2379cbe7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(collectd, 4.0.5)
+AC_INIT(collectd, m4_esyscmd(./version-gen.sh))
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -30,6 +30,24 @@ AC_PROG_LEX
 AC_PROG_YACC
 AC_CONFIG_SUBDIRS(libltdl)
 
+AC_MSG_CHECKING([for kernel type ($host_os)])
+case $host_os in
+	*linux*)
+	AC_DEFINE([KERNEL_LINUX], 1, [True if program is to be compiled for a Linux kernel])
+	ac_system="Linux"
+	;;
+	*solaris*)
+	AC_DEFINE([KERNEL_SOLARIS], 1, [True if program is to be compiled for a Solaris kernel])
+	ac_system="Solaris"
+	;;
+	*darwin*)
+	ac_system="Darwin"
+	;;
+	*)
+	ac_system="unknown"
+esac
+AC_MSG_RESULT([$ac_system])
+
 #
 # Checks for header files.
 #
@@ -174,7 +192,12 @@ AC_CHECK_HEADERS(netinet/udp.h, [], [],
 ])
 
 # For cpu modules
-AC_CHECK_HEADERS(sys/dkstat.h mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
+AC_CHECK_HEADERS(sys/dkstat.h)
+if test "x$ac_system" = "xDarwin"
+then
+	AC_CHECK_HEADERS(mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
+	AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h)
+fi
 AC_CHECK_HEADERS(sys/sysctl.h, [], [],
 [
 #if HAVE_SYS_TYPES_H
@@ -188,9 +211,6 @@ AC_CHECK_HEADERS(sys/sysctl.h, [], [],
 # For hddtemp module
 AC_CHECK_HEADERS(linux/major.h libgen.h)
 
-# For the apple_sensors module
-AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h)
-
 # For the battery plugin
 AC_CHECK_HEADERS(IOKit/ps/IOPowerSources.h, [], [],
 [
@@ -281,7 +301,7 @@ AC_CHECK_HEADERS(linux/un.h, [], [],
 #endif
 ])
 
-AC_CHECK_HEADERS(curl/curl.h 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)
+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)
 
 # For the dns plugin
 AC_CHECK_HEADERS(arpa/nameser.h)
@@ -345,8 +365,9 @@ AC_HEADER_TIME
 AC_PROG_GCC_TRADITIONAL
 AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog)
 
-AC_CHECK_FUNCS(getpwnam_r)
-AC_CHECK_FUNCS(getgrnam_r)
+AC_FUNC_STRERROR_R
+
+AC_CHECK_FUNCS(getpwnam_r getgrnam_r setgroups regcomp regerror regexec regfree)
 
 socket_needs_socket="no"
 AC_CHECK_FUNCS(socket, [], AC_CHECK_LIB(socket, socket, [socket_needs_socket="yes"], AC_MSG_ERROR(cannot find socket)))
@@ -356,8 +377,6 @@ nanosleep_needs_rt="no"
 AC_CHECK_FUNCS(nanosleep, [], AC_CHECK_LIB(rt, nanosleep, [nanosleep_needs_rt="yes"], AC_MSG_ERROR(cannot find nanosleep)))
 AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes")
 
-AC_CHECK_FUNCS(regcomp regerror regexec regfree)
-
 AC_CHECK_FUNCS(sysctlbyname, [have_sysctlbyname="yes"], [have_sysctlbyname="no"])
 AC_CHECK_FUNCS(host_statistics, [have_host_statistics="yes"], [have_host_statistics="no"])
 AC_CHECK_FUNCS(processor_info, [have_processor_info="yes"], [have_processor_info="no"])
@@ -635,21 +654,6 @@ AC_CHECK_MEMBERS([kstat_io_t.nwritten, kstat_io_t.writes, kstat_io_t.nwrites, ks
 #endif
 	])
 
-AC_MSG_CHECKING([for kernel type ($host_os)])
-case $host_os in
-	*linux*)
-	AC_DEFINE([KERNEL_LINUX], 1, [True if program is to be compiled for a Linux kernel])
-	ac_system="Linux"
-	;;
-	*solaris*)
-	AC_DEFINE([KERNEL_SOLARIS], 1, [True if program is to be compiled for a Solaris kernel])
-	ac_system="Solaris"
-	;;
-	*)
-	ac_system="unknown"
-esac
-AC_MSG_RESULT([$ac_system])
-
 with_libresolv="yes"
 AC_CHECK_LIB(resolv, res_search,
 [
@@ -663,35 +667,66 @@ m4_divert_once([HELP_WITH], [
 collectd additional packages:])
 
 # AC_ARG_WITH (package, help-string, [action-if-given], [action-if-not-given])
+librrd_cflags=""
+librrd_ldflags=""
+librrd_threadsafe="yes"
 AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to rrdtool.])],
 [	if test "x$withval" != "xno" && test "x$withval" != "xyes"
 	then
-		LDFLAGS="$LDFLAGS -L$withval/lib"
-		CPPFLAGS="$CPPFLAGS -I$withval/include"
+		librrd_cflags="-I$withval/include"
+		librrd_ldflags="-L$withval/lib"
 		with_rrdtool="yes"
 	fi
 ], [with_rrdtool="yes"])
 if test "x$with_rrdtool" = "xyes"
 then
-	AC_CHECK_LIB(rrd, rrd_update,
-	[
-		AC_DEFINE(HAVE_LIBRRD, 1, [Define to 1 if you have the rrd library (-lrrd).])
-	],
-	[with_rrdtool="no (librrd not found)"], [-lm])
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	SAVE_LDFLAGS="$LDFLAGS"
+
+	CPPFLAGS="$CPPFLAGS $librrd_cflags"
+	LDFLAGS="$LDFLAGS $librrd_ldflags"
+
+	AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no (rrd.h not found)"])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+	LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_rrdtool" = "xyes"
 then
-	AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no (rrd.h not found)"])
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	SAVE_LDFLAGS="$LDFLAGS"
+
+	CPPFLAGS="$CPPFLAGS $librrd_cflags"
+	LDFLAGS="$LDFLAGS $librrd_ldflags"
+
+	AC_CHECK_LIB(rrd_th, rrd_update_r,
+	[with_rrdtool="yes"
+	 librrd_ldflags="$librrd_ldflags -lrrd_th -lm"
+	],
+	[librrd_threadsafe="no"
+	 AC_CHECK_LIB(rrd, rrd_update,
+	 [with_rrdtool="yes"
+	  librrd_ldflags="$librrd_ldflags -lrrd -lm"
+	 ],
+	 [with_rrdtool="no (symbol 'rrd_update' not found)"],
+	 [-lm])
+	]
+	[-lm])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+	LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_rrdtool" = "xyes"
 then
-	collect_rrdtool=1
-else
-	collect_rrdtool=0
+	BUILD_WITH_LIBRRD_CFLAGS="$librrd_cflags"
+	BUILD_WITH_LIBRRD_LDFLAGS="$librrd_ldflags"
+	AC_SUBST(BUILD_WITH_LIBRRD_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBRRD_LDFLAGS)
+fi
+if test "x$librrd_threadsafe" = "xyes"
+then
+	AC_DEFINE(HAVE_THREADSAFE_LIBRRD, 1, [Define to 1 if you have the threadsafe rrd library (-lrrd_th).])
 fi
-AC_DEFINE_UNQUOTED(COLLECT_RRDTOOL, [$collect_rrdtool],
-	[Wether or not to use rrdtool library])
-AM_CONDITIONAL(BUILD_WITH_RRDTOOL, test "x$with_rrdtool" = "xyes")
 
 AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
 [	if test "x$withval" != "xno" -a "x$withval" != "xyes"
@@ -724,7 +759,7 @@ AC_DEFINE_UNQUOTED(HAVE_LIBPTHREAD, [$collect_pthread],
 	[Wether or not to use pthread (POSIX threads) library])
 AM_CONDITIONAL(BUILD_WITH_LIBPTHREAD, test "x$with_libpthread" = "xyes")
 
-if test "$ac_system" = "Solaris"
+if test "x$ac_system" = "xSolaris"
 then
 	with_kstat="yes"
 	with_devinfo="yes"
@@ -752,70 +787,71 @@ AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
 
 ### BEGIN of check for libcurl ###
 with_curl_config="curl-config"
-with_curl_prefix=0
+with_curl_cflags=""
 with_curl_libs=""
 AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to libcurl.])],
 [
-	if test "x$withval" != "xno" -a "x$withval" != "xyes"
-	then
-		if test -x "$withval/bin/curl-config"
-		then
-			with_curl_config="$withval/bin/curl-config"
-			with_curl_prefix=1
-		fi
-	fi
 	if test "x$withval" = "xno"
 	then
 		with_libcurl="no"
+	else if test "x$withval" = "xyes"
+	then
+		with_libcurl="yes"
 	else
+		if test -f "$withval" && test -x "$withval"
+		then
+			with_curl_config="$withval"
+			with_libcurl="yes"
+		else if test -x "$withval/bin/curl-config"
+		then
+			with_curl_config="$withval/bin/curl-config"
+			with_libcurl="yes"
+		fi; fi
 		with_libcurl="yes"
-	fi
+	fi; fi
 ],
 [
 	with_libcurl="yes"
 ])
 if test "x$with_libcurl" = "xyes"
 then
-	with_curl_libs=`$with_curl_config --libs 2>/dev/null`
+	with_curl_cflags=`$with_curl_config --cflags 2>/dev/null`
 	curl_config_status=$?
 
 	if test $curl_config_status -ne 0
 	then
-		with_libcurl="no"
+		with_libcurl="no ($with_curl_config failed)"
 	else
-		AC_CHECK_LIB(curl, curl_easy_init,
-		[
-			BUILD_WITH_LIBCURL_LIBS="$with_curl_libs"
-			AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
-		],
-		[
-			with_libcurl="no"
-		],
-		[$with_curl_libs])
+		SAVE_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $with_curl_cflags"
+
+		AC_CHECK_HEADERS(curl/curl.h, [], [with_libcurl="no (curl/curl.h not found)"], [])
+
+		CFLAGS="$SAVE_CFLAGS"
 	fi
 fi
-if test "x$with_libcurl" = "xyes" -a $with_curl_prefix -ne 0
+if test "x$with_libcurl" = "xyes"
 then
-	with_curl_prefix=`$with_curl_config --libs 2>/dev/null`
+	with_curl_libs=`$with_curl_config --libs 2>/dev/null`
 	curl_config_status=$?
 
 	if test $curl_config_status -ne 0
 	then
-		with_libcurl="no"
+		with_libcurl="no ($with_curl_config failed)"
 	else
-		if test -d "$with_curl_prefix/include"
-		then
-			CPPFLAGS="$CPPFLAGS -I$with_curl_prefix/include"
-		fi
+		AC_CHECK_LIB(curl, curl_easy_init,
+		 [with_libcurl="yes"],
+		 [with_libcurl="no (symbol 'curl_easy_init' not found)"],
+		 [$with_curl_libs])
 	fi
 fi
-
-with_libcurl_numeric=0
 if test "x$with_libcurl" = "xyes"
 then
-	with_libcurl_numeric=1
+	BUILD_WITH_LIBCURL_CFLAGS="$with_curl_cflags"
+	BUILD_WITH_LIBCURL_LIBS="$with_curl_libs"
+	AC_SUBST(BUILD_WITH_LIBCURL_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
 fi
-AC_DEFINE_UNQUOTED(HAVE_LIBCURL, [$with_libcurl_numeric], [Define to 1 if you have the 'curl' library (-lcurl).])
 AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
 ### END of check for libcurl ###
 
@@ -896,7 +932,7 @@ AC_ARG_WITH(lm-sensors, [AS_HELP_STRING([--with-lm-sensors@<:@=PREFIX@:>@], [Pat
 	then
 		with_lm_sensors="yes"
 	else
-		with_lm_sensors="no"
+		with_lm_sensors="no (Linux only library)"
 	fi
 ])
 if test "x$with_lm_sensors" = "xyes"
@@ -925,40 +961,70 @@ AC_DEFINE_UNQUOTED(COLLECT_LM_SENSORS, [$collect_lm_sensors],
 	[Wether or not to use sensors library])
 AM_CONDITIONAL(BUILD_WITH_LM_SENSORS, test "x$with_lm_sensors" = "xyes")
 
+with_mysql_config="mysql_config"
+with_mysql_cflags=""
+with_mysql_libs=""
 AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to libmysql.])],
 [
-	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+	if test "x$withval" = "xno"
+	then
+		with_libmysql="no"
+	else if test "x$withval" = "xyes"
 	then
-		LDFLAGS="$LDFLAGS -L$withval/lib"
-		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		with_libmysql="yes"
-	fi
+	else
+		if test -f "$withval" && test -x "$withval";
+		then
+			with_mysql_config="$withval"
+		else if test -x "$withval/bin/mysql_config"
+		then
+			with_mysql_config="$withval/bin/mysql_config"
+		fi; fi
+		with_libmysql="yes"
+	fi; fi
 ],
 [
 	with_libmysql="yes"
 ])
 if test "x$with_libmysql" = "xyes"
 then
-	AC_CHECK_LIB(mysqlclient, mysql_init,
-	[
-		AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1, [Define to 1 if you have the mysqlclient library (-lmysqlclient).])
-	], [with_libmysql="no (libmysql not found)"])
+	with_mysql_cflags=`$with_mysql_config --cflags 2>/dev/null`
+	mysql_config_status=$?
+
+	if test $mysql_config_status -ne 0
+	then
+		with_libmysql="no"
+	else
+		SAVE_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $with_mysql_cflags"
+
+		AC_CHECK_HEADERS(mysql/mysql.h, [], [with_libmysql="no (mysql/mysql.h not found)"], [])
+
+		CFLAGS="$SAVE_CFLAGS"
+	fi
 fi
 if test "x$with_libmysql" = "xyes"
 then
-	AC_CHECK_HEADERS(mysql/mysql.h,
-	[
-		AC_DEFINE(HAVE_MYSQL_MYSQL_H, 1, [Define to 1 if you have the <mysql/mysql.h> header file.])
-	], [with_libmysql="no (mysql/mysql.h not found)"])
+	with_mysql_libs=`$with_mysql_config --libs 2>/dev/null`
+	mysql_config_status=$?
+
+	if test $mysql_config_status -ne 0
+	then
+		with_libmysql="no"
+	else
+		AC_CHECK_LIB(mysqlclient, mysql_init,
+		 [with_libmysql="yes"],
+		 [with_libmysql="no (symbol 'mysql_init' not found)"],
+		 [$with_mysql_libs])
+	fi
 fi
 if test "x$with_libmysql" = "xyes"
 then
-	collect_libmysql=1
-else
-	collect_libmysql=0
+	BUILD_WITH_LIBMYSQL_CFLAGS="$with_mysql_cflags"
+	BUILD_WITH_LIBMYSQL_LIBS="$with_mysql_libs"
+	AC_SUBST(BUILD_WITH_LIBMYSQL_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBMYSQL_LIBS)
 fi
-AC_DEFINE_UNQUOTED(COLLECT_LIBMYSQL, [$collect_libmysql],
-	[Wether or not to use mysql library])
 AM_CONDITIONAL(BUILD_WITH_LIBMYSQL, test "x$with_libmysql" = "xyes")
 
 with_own_liboconfig="no"
@@ -1189,29 +1255,67 @@ else
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 
+with_snmp_config="net-snmp-config"
+with_snmp_cflags=""
+with_snmp_libs=""
 AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
 [
-	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+ 	if test "x$withval" = "xno"
+	then
+		with_libnetsnmp="no"
+	else if test "x$withval" = "xyes"
 	then
-		LDFLAGS="$LDFLAGS -L$withval/lib"
-		CPPFLAGS="$CPPFLAGS -I$withval/include"
 		with_libnetsnmp="yes"
-	fi
+	else
+	       	if test -x "$withval"
+		then
+			with_snmp_config="$withval"
+			with_libnetsnmp="yes"
+		else
+			with_snmp_config="$withval/bin/net-snmp-config"
+			with_libnetsnmp="yes"
+		fi
+	fi; fi
 ],
 [with_libnetsnmp="yes"])
 if test "x$with_libnetsnmp" = "xyes"
 then
-	AC_CHECK_LIB(netsnmp, init_snmp,
-	[
-		AC_DEFINE(HAVE_LIBSNMP, 1, [Define to 1 if you have the Net-SNMP library (-lnetsnmp).])
-	], [with_libnetsnmp="no (libnetsnmp not found)"])
+	with_snmp_cflags=`$with_snmp_config --cflags 2>/dev/null`
+	snmp_config_status=$?
+
+	if test $snmp_config_status -ne 0
+	then
+		with_libnetsnmp="no ($with_snmp_config failed)"
+	else
+		SAVE_CFLAGS=$CFLAGS
+		CFLAGS="$CFLAGS $with_snmp_cflags"
+		
+		AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"])
+
+		CFLAGS="$SAVE_CFLAGS"
+	fi
 fi
 if test "x$with_libnetsnmp" = "xyes"
 then
-	AC_CHECK_HEADERS(net-snmp/net-snmp-config.h,
-	[
-		AC_DEFINE(HAVE_NET_SNMP_NET_SNMP_CONFIG_H, 1, [Define to 1 if you have the <net-snmp/net-snmp-config.h> header file.])
-	], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"])
+	with_snmp_libs=`$with_snmp_config --libs 2>/dev/null`
+	snmp_config_status=$?
+
+	if test $snmp_config_status -ne 0
+	then
+		with_libnetsnmp="no ($with_snmp_config failed)"
+	else
+		AC_CHECK_LIB(netsnmp, init_snmp,
+		[with_libnetsnmp="yes"],
+		[with_libnetsnmp="no (libnetsnmp not found)"],
+		[$with_snmp_libs])
+	fi
+fi
+if test "x$with_libnetsnmp" = "xyes"
+then
+	BUILD_WITH_LIBSNMP_CFLAGS="$with_snmp_cflags"
+	BUILD_WITH_LIBSNMP_LIBS="$with_snmp_libs"
+	AC_SUBST(BUILD_WITH_LIBSNMP_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBSNMP_LIBS)
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes")
 
@@ -1224,11 +1328,16 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@],
 	then
 		with_libupsclient="no"
 	else
-		with_libupsclient="yes"
-		if "x$withval" != "xyes"
+		if test "x$withval" != "xyes"
 		then
-			with_upsclient_config="$withval/bin/libupsclient-config"
+			if test -f "$withval" && test -x "$withval";
+			then
+				with_upsclient_config="$withval"
+			else
+				with_upsclient_config="$withval/bin/libupsclient-config"
+			fi
 		fi
+		with_libupsclient="yes"
 	fi
 ],
 [
@@ -1241,25 +1350,30 @@ then
 
 	if test $upsclient_config_status -ne 0
 	then
-		with_libupsclient="no"
+		with_libupsclient="no ($with_upsclient_config failed)"
 	fi
 fi
 if test "x$with_libupsclient" = "xyes"
 then
+	SAVE_CFLAGS="$CFLAGS"
+	CFLAGS="$CFLAGS $with_upsclient_cflags"
+
+	AC_CHECK_HEADERS(upsclient.h, [], [with_libupsclient="no (upsclient.h not found)"])
+
+	CFLAGS="$SAVE_CFLAGS"
+fi
+if test "x$with_libupsclient" = "xyes"
+then
 	with_upsclient_libs=`$with_upsclient_config --libs 2>/dev/null`
 	upsclient_config_status=$?
 
 	if test $upsclient_config_status -ne 0
 	then
-		with_libupsclient="no"
+		with_libupsclient="no ($with_upsclient_config failed)"
 	fi
 fi
 if test "x$with_libupsclient" = "xyes"
 then
-	CFLAGS_ORIG=$CFLAGS
-	CFLAGS="$CFLAGS $with_upsclient_cflags"
-	LDFLAGS_ORIG=$LDFLAGS
-	LDFLAGS="$LDFLAGS $with_upsclient_libs"
 	AC_CHECK_LIB(upsclient, upscli_connect,
 	[
 		BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_upsclient_cflags"
@@ -1268,14 +1382,15 @@ then
 		AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS)
 	],
 	[
-		with_libupsclient="no"
-	])
-	CFLAGS=$CFLAGS_ORIG
-	LDFLAGS=$LDFLAGS_ORIG
+		with_libupsclient="no (symbol 'upscli_connect' not found)"
+	], [$with_upsclient_libs])
 fi
 if test "x$with_libupsclient" = "xyes"
 then
-	AC_DEFINE(HAVE_LIBUPSCLIENT, 1, [Define to 1 if you have the upsclient library (-lupsclient).])
+	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [], 
+[#include <stdlib.h>
+#include <stdio.h>
+#include <upsclient.h>])
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBUPSCLIENT, test "x$with_libupsclient" = "xyes")
 
@@ -1287,17 +1402,20 @@ AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to l
 [
 	if test "x$withval" != "xno" -a "x$withval" != "xyes"
 	then
-		if test -x "$withval/bin/xmms-config"
+		if test -f "$withval" && test -x "$withval";
+		then
+			with_xmms_config="$withval"
+		else if test -x "$withval/bin/xmms-config"
 		then
 			with_xmms_config="$withval/bin/xmms-config"
-		fi
-	fi
-	if test "x$withval" = "xno"
+		fi; fi
+		with_libxmms="yes"
+	else if test "x$withval" = "xno"
 	then
 		with_libxmms="no"
 	else
 		with_libxmms="yes"
-	fi
+	fi; fi
 ],
 [
 	with_libxmms="yes"
@@ -1345,6 +1463,110 @@ AC_DEFINE_UNQUOTED(HAVE_LIBXMMS, [$with_libxmms_numeric], [Define to 1 if you ha
 AM_CONDITIONAL(BUILD_WITH_LIBXMMS, test "x$with_libxmms" = "xyes")
 ### END of check for libxmms ###
 
+with_libnetlink_cflags=""
+with_libnetlink_libs="-lnetlink"
+AC_ARG_WITH(libnetlink, [AS_HELP_STRING([--with-libnetlink@<:@=PREFIX@:>@], [Path to libnetlink.])],
+[
+ echo "libnetlink: withval = $withval"
+ if test "x$withval" = "xyes"
+ then
+	 with_libnetlink="yes"
+ else if test "x$withval" = "xno"
+ then
+	 with_libnetlink="no"
+ else
+	 if test -d "$withval/include"
+	 then
+		 with_libnetlink_cflags="-I$withval/include"
+		 with_libnetlink_libs="-L$withval/lib -lnetlink"
+		 with_libnetlink="yes"
+	 else
+		 AC_MSG_ERROR("no such directory: $withval/include")
+	 fi
+ fi; fi
+],
+[
+ if test "x$ac_system" = "xLinux"
+ then
+	 with_libnetlink="yes"
+ else
+	 with_libnetlink="no (Linux only library)"
+ fi
+])
+if test "x$with_libnetlink" = "xyes"
+then
+	SAVE_CFLAGS=$CFLAGS
+	CFLAGS="$CFLAGS $with_libnetlink_cflags"
+
+	with_libnetlink="no (libnetlink.h not found)"
+
+	AC_CHECK_HEADERS(libnetlink.h iproute/libnetlink.h linux/libnetlink.h,
+	[
+	 with_libnetlink="yes"
+	 break
+	], [],
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>])
+	AC_CHECK_HEADERS(linux/gen_stats.h linux/pkt_sched.h, [], [],
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>])
+
+	AC_COMPILE_IFELSE(
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+int main (void)
+{
+	int retval = TCA_STATS2;
+	return (retval);
+}],
+	[AC_DEFINE([HAVE_TCA_STATS2], 1, [True if the enum-member TCA_STATS2 exists])]
+	[]);
+
+	AC_COMPILE_IFELSE(
+[#include <stdio.h>
+#include <sys/types.h>
+#include <asm/types.h>
+#include <sys/socket.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+
+int main (void)
+{
+	int retval = TCA_STATS;
+	return (retval);
+}],
+	[AC_DEFINE([HAVE_TCA_STATS], 1, [True if the enum-member TCA_STATS exists])]
+	[]);
+
+	CFLAGS="$SAVE_CFLAGS"
+fi
+if test "x$with_libnetlink" = "xyes"
+then
+	AC_CHECK_LIB(netlink, rtnl_open,
+		     [with_libnetlink="yes"],
+		     [with_libnetlink="no (symbol 'rtnl_open' not found)"],
+		     [$with_libnetlink_libs])
+fi
+if test "x$with_libnetlink" = "xyes"
+then
+	BUILD_WITH_LIBNETLINK_CFLAGS="$with_libnetlink_cflags"
+	BUILD_WITH_LIBNETLINK_LIBS="$with_libnetlink_libs"
+	AC_SUBST(BUILD_WITH_LIBNETLINK_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBNETLINK_LIBS)
+fi
+AM_CONDITIONAL(BUILD_WITH_LIBNETLINK, test "x$with_libnetlink" = "xyes")
+
 # Check for enabled/disabled features
 #
 
@@ -1602,6 +1824,7 @@ AC_PLUGIN([mbmon],       [yes],                [Query mbmond])
 AC_PLUGIN([memory],      [$plugin_memory],     [Memory usage])
 AC_PLUGIN([multimeter],  [$plugin_multimeter], [Read multimeter values])
 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([ntpd],        [yes],                [NTPd statistics])
@@ -1646,6 +1869,7 @@ Configuration:
     libkstat  . . . . . $with_kstat
     libkvm  . . . . . . $with_libkvm
     libmysql  . . . . . $with_libmysql
+    libnetlink  . . . . $with_libnetlink
     libnetsnmp  . . . . $with_libnetsnmp
     liboconfig  . . . . $with_liboconfig
     liboping  . . . . . $with_liboping
@@ -1686,6 +1910,7 @@ Configuration:
     memory  . . . . . . $enable_memory
     multimeter  . . . . $enable_multimeter
     mysql . . . . . . . $enable_mysql
+    netlink . . . . . . $enable_netlink
     network . . . . . . $enable_network
     nfs . . . . . . . . $enable_nfs
     ntpd  . . . . . . . $enable_ntpd
@@ -1693,6 +1918,7 @@ Configuration:
     perl  . . . . . . . $enable_perl
     ping  . . . . . . . $enable_ping
     processes . . . . . $enable_processes
+    rrdtool . . . . . . $enable_rrdtool
     sensors . . . . . . $enable_sensors
     serial  . . . . . . $enable_serial
     snmp  . . . . . . . $enable_snmp