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

diff --git a/configure.in b/configure.in
index 16ffe1ad..2379cbe7 100644
--- a/configure.in
+++ b/configure.in
@@ -367,8 +367,7 @@ AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr
 
 AC_FUNC_STRERROR_R
 
-AC_CHECK_FUNCS(getpwnam_r)
-AC_CHECK_FUNCS(getgrnam_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)))
@@ -378,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"])
@@ -670,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"
@@ -770,7 +798,7 @@ AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to l
 	then
 		with_libcurl="yes"
 	else
-		if test -x "$withval"
+		if test -f "$withval" && test -x "$withval"
 		then
 			with_curl_config="$withval"
 			with_libcurl="yes"
@@ -779,6 +807,7 @@ AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to l
 			with_curl_config="$withval/bin/curl-config"
 			with_libcurl="yes"
 		fi; fi
+		with_libcurl="yes"
 	fi; fi
 ],
 [
@@ -944,13 +973,14 @@ AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to
 	then
 		with_libmysql="yes"
 	else
-		if test -x "$withval";
+		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
 ],
 [
@@ -1233,7 +1263,7 @@ AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Pat
  	if test "x$withval" = "xno"
 	then
 		with_libnetsnmp="no"
-	else if "x$withval" = "xyes"
+	else if test "x$withval" = "xyes"
 	then
 		with_libnetsnmp="yes"
 	else
@@ -1250,7 +1280,7 @@ AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Pat
 [with_libnetsnmp="yes"])
 if test "x$with_libnetsnmp" = "xyes"
 then
-	with_snmp_cflags=`$with_snmp_config --cflags >/dev/null`
+	with_snmp_cflags=`$with_snmp_config --cflags 2>/dev/null`
 	snmp_config_status=$?
 
 	if test $snmp_config_status -ne 0
@@ -1267,7 +1297,7 @@ then
 fi
 if test "x$with_libnetsnmp" = "xyes"
 then
-	with_snmp_libs=`$with_snmp_config --libs >/dev/null`
+	with_snmp_libs=`$with_snmp_config --libs 2>/dev/null`
 	snmp_config_status=$?
 
 	if test $snmp_config_status -ne 0
@@ -1280,7 +1310,7 @@ then
 		[$with_snmp_libs])
 	fi
 fi
-if test "x$with_libsnmp" = "xyes"
+if test "x$with_libnetsnmp" = "xyes"
 then
 	BUILD_WITH_LIBSNMP_CFLAGS="$with_snmp_cflags"
 	BUILD_WITH_LIBSNMP_LIBS="$with_snmp_libs"
@@ -1298,16 +1328,16 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@],
 	then
 		with_libupsclient="no"
 	else
-		with_libupsclient="yes"
 		if test "x$withval" != "xyes"
 		then
-			if test -x "$withval"
+			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
 ],
 [
@@ -1372,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"
@@ -1885,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