X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=configure.in;h=54d38d5882d3bc1c666c7f0e1d134b2fbb4f7ae4;hb=747f853a2ce3f8a55438aff274df5ea25a3e9cce;hp=68299545764d47e5065d2819a1d481588d0ef0fa;hpb=90ac9957e95378d729bce1c00bb0ef2efadab33e;p=collectd.git

diff --git a/configure.in b/configure.in
index 68299545..54d38d58 100644
--- a/configure.in
+++ b/configure.in
@@ -770,13 +770,16 @@ 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"
 		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
 ],
 [
@@ -942,13 +945,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
 ],
 [
@@ -1223,29 +1227,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 "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")
 
@@ -1258,16 +1300,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
-			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
 ],
 [
@@ -1332,17 +1374,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"
@@ -1438,6 +1483,43 @@ then
 #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