X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.in;h=85518ffc3dd7ca13968ed12137d0d813e62a7a50;hb=5d99fadf9afc1de198576e1ce5f24ef423333f72;hp=59f3dce2c0d745417ccc85419abab4649bb1f555;hpb=988688ace2eee6b19595c780ef776785b387f80d;p=collectd.git

diff --git a/configure.in b/configure.in
index 59f3dce2..85518ffc 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.6)
+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)
@@ -752,70 +752,73 @@ 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
+	else if test "x$withval" = "xyes"
+	then
 		with_libcurl="yes"
-	fi
+	else
+		if test -x "$withval"
+		then
+			with_curl_config="$withval"
+		else if test -x "$withval/bin/curl-config"
+		then
+			with_curl_config="$withval/bin/curl-config"
+		fi; 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"
 	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"
 	else
-		if test -d "$with_curl_prefix/include"
-		then
-			CPPFLAGS="$CPPFLAGS -I$with_curl_prefix/include"
-		fi
+		AC_CHECK_LIB(curl, curl_easy_init,
+		 [
+		  # We need to do this to have `HAVE_LIBCURL' defined but
+		  # `-lcurl' NOT added to the default LDFLAGS.
+			AC_DEFINE(HAVE_LIBCURL, 1,
+				  [Define to 1 if you have the curl library.])
+		 ],
+		 [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 ###
 
@@ -925,40 +928,74 @@ 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 -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
+	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,
+		 [
+		  # We need to do this to have `HAVE_LIBMYSQLCLIENT' defined
+		  # but `-lmysqlclient' NOT added to the default LDFLAGS.
+			AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1,
+				  [Define to 1 if you have the mysqlclient library.])
+		 ],
+		 [with_libmysql="no (libmysql 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"
@@ -1277,6 +1314,13 @@ if test "x$with_libupsclient" = "xyes"
 then
 	AC_DEFINE(HAVE_LIBUPSCLIENT, 1, [Define to 1 if you have the upsclient library (-lupsclient).])
 fi
+if test "x$with_libupsclient" = "xyes"
+then
+	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")
 
 ### BEGIN of check for libxmms ###
@@ -1345,6 +1389,9 @@ 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="yes"
+AC_CHECK_LIB(netlink, rtnl_open, [with_libnetlink="yes"], [with_libnetlink="no"])
+
 # Check for enabled/disabled features
 #
 
@@ -1602,6 +1649,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])
@@ -1686,6 +1734,7 @@ Configuration:
     memory  . . . . . . $enable_memory
     multimeter  . . . . $enable_multimeter
     mysql . . . . . . . $enable_mysql
+    netlink . . . . . . $enable_network
     network . . . . . . $enable_network
     nfs . . . . . . . . $enable_nfs
     ntpd  . . . . . . . $enable_ntpd