X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=23f0e59e8502fc48d5354e236a042ece8b1f44b2;hb=4dc48314be6a40b0d561d9dbf257c92f6197d15c;hp=f187cf38dd92e0d77c8df86a60897d47520fef80;hpb=8a94ccd77411761bc33dd5c163f36eb4c954237f;p=collectd.git

diff --git a/configure.in b/configure.in
index f187cf38..23f0e59e 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, 3.10.1)
+AC_INIT(collectd, 3.11.0)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -25,7 +25,7 @@ AC_SUBST(LIBLTDL)
 AC_LIBTOOL_DLOPEN
 AC_PROG_LIBTOOL
 #AC_PROG_RANLIB
-AC_CONFIG_SUBDIRS(libltdl src/libconfig)
+AC_CONFIG_SUBDIRS(libltdl)
 
 #
 # Checks for header files.
@@ -44,7 +44,7 @@ AC_CHECK_HEADERS(assert.h)
 AC_CHECK_HEADERS(sys/types.h)
 AC_CHECK_HEADERS(sys/socket.h)
 AC_CHECK_HEADERS(sys/select.h)
-AC_CHECK_HEADERS(sys/poll.h)
+AC_CHECK_HEADERS(poll.h)
 AC_CHECK_HEADERS(netdb.h)
 AC_CHECK_HEADERS(arpa/inet.h)
 AC_CHECK_HEADERS(sys/resource.h)
@@ -197,6 +197,9 @@ AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDriver.h)
 # For load module
 AC_CHECK_HEADERS(sys/loadavg.h)
 
+# For the processes plugin
+AC_CHECK_HEADERS(linux/config.h)
+
 # For the swap module
 AC_CHECK_HEADERS(sys/swap.h)
 
@@ -266,9 +269,30 @@ AC_CHECK_HEADERS(sys/vfstab.h)
 # For the swap plugin, FreeBSD
 AC_CHECK_HEADERS(kvm.h)
 
+# For the email plugin
+AC_CHECK_HEADERS(linux/un.h, [], [],
+[
+#if HAVE_SYS_SOCKET_H
+#	include <sys/socket.h>
+#endif
+])
+AC_CHECK_HEADERS(sys/un.h)
+AC_CHECK_HEADERS(grp.h)
+
 # For debugging interface (variable number of arguments)
 AC_CHECK_HEADERS(stdarg.h)
 
+# Regular expressions for the ignorelist.
+AC_CHECK_HEADERS(regex.h)
+
+# For the dns plugin
+AC_CHECK_HEADERS(arpa/nameser.h arpa/nameser_compat.h)
+
+AC_CHECK_HEADERS(net/if_arp.h)
+AC_CHECK_HEADERS(net/if_ppp.h)
+AC_CHECK_HEADERS(netinet/if_ether.h)
+AC_CHECK_HEADERS(netinet/udp.h)
+
 dnl Checking for libraries
 AC_CHECK_LIB(m, ext)
 
@@ -299,6 +323,9 @@ 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")
 
+# Regular expressions for the ignorelist.
+AC_CHECK_FUNCS(regcomp regerror regexec regfree)
+
 # For cpu module
 AC_CHECK_FUNCS(sysctlbyname, [have_sysctlbyname="yes"], [have_sysctlbyname="no"])
 
@@ -322,73 +349,88 @@ AC_CHECK_FUNCS(getgrgid getpwuid)
 AC_CHECK_FUNCS(getifaddrs)
 
 # For mount interface
-AC_CHECK_FUNCS(getfsent getvfsent listmntent)
-AC_CHECK_FUNCS(getfsstat)
-
-# Check for different versions of `getmntent' here..
-AC_FUNC_GETMNTENT
-if test "x$ac_cv_lib_sun_getmntent" = "xyes"
-then
-	AC_DEFINE(HAVE_SUN_GETMNTENT, 1,
-		  [Define if the function getmntent exists. It's the version from libsun.])
+#AC_CHECK_FUNCS(getfsent getvfsent)
+
+have_getfsstat="no"
+AC_CHECK_FUNCS(getfsstat, [have_getfsstat="yes"])
+have_getvfsstat="no"
+AC_CHECK_FUNCS(getvfsstat, [have_getvfsstat="yes"])
+have_listmntent="no"
+AC_CHECK_FUNCS(listmntent, [have_listmntent="yes"])
+
+have_getmntent="no"
+AC_CHECK_FUNCS(getmntent, [have_getmntent="c"])
+if test "x$have_getmntent" = "xno"; then
+	AC_CHECK_LIB(sun, getmntent, [have_getmntent="sun"])
 fi
-if test "x$ac_cv_lib_seq_getmntent" = "xyes"
-then
-	AC_DEFINE(HAVE_SEQ_GETMNTENT, 1,
-		  [Define if the function getmntent exists. It's the version from libseq.])
+if test "x$have_getmntent" = "xno"; then
+	AC_CHECK_LIB(seq, getmntent, [have_getmntent="seq"])
 fi
-if test "x$ac_cv_lib_gen_getmntent" = "xyes"
-then
-	AC_DEFINE(HAVE_GEN_GETMNTENT, 1,
-		  [Define if the function getmntent exists. It's the version from libgen.])
+if test "x$have_getmntent" = "xno"; then
+	AC_CHECK_LIB(gen, getmntent, [have_getmntent="gen"])
 fi
 
-if test "x$ac_cv_func_getmntent" = "xyes"; then
-	saveCFLAGS="$CFLAGS"
-	CFLAGS="-Wall -Werror $CFLAGS"
+if test "x$have_getmntent" = "xc"; then
 	AC_CACHE_CHECK([whether getmntent takes one argument],
-		[fu_cv_getmntent1],
+		[have_one_getmntent],
 		AC_COMPILE_IFELSE(
 			AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
+#include <mntent.h>
 #include "$srcdir/src/utils_mount.h"]],
-				[[(void)getmntent((FILE *)NULL);]]
+				[[
+				 FILE *fh;
+				 struct mntent *me;
+				 fh = setmntent ("/etc/mtab", "r");
+				 me = getmntent (fh);
+				]]
 			),
-			[fu_cv_getmntent1=yes],
-			[fu_cv_getmntent1=no]
+			[have_one_getmntent="yes"],
+			[have_one_getmntent="no"]
 		)
 	)
-	if test "x$fu_cv_getmntent1" = "xno"; then
-		AC_CACHE_CHECK([whether getmntent takes two arguments],
-			[fu_cv_getmntent2],
-			AC_COMPILE_IFELSE(
-				AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
+	AC_CACHE_CHECK([whether getmntent takes two arguments],
+		[have_two_getmntent],
+		AC_COMPILE_IFELSE(
+			AC_LANG_PROGRAM([[AC_INCLUDES_DEFAULT
+#include <sys/mnttab.h>
 #include "$srcdir/src/utils_mount.h"]],
-					[[(void)getmntent((FILE *)NULL,
-						(struct mnttab *)NULL);]]
-				),
-				[fu_cv_getmntent2=yes],
-				[fu_cv_getmntent2=no]
-			)
+				[[
+				 FILE *fh;
+				 struct mnttab mt;
+				 int status;
+				 fh = fopen ("/etc/mnttab", "r");
+				 status = getmntent (fh, &mt);
+				]]
+			),
+			[have_two_getmntent="yes"],
+			[have_two_getmntent="no"]
 		)
+	)
+fi
+
+# Check for different versions of `getmntent' here..
+
+if test "x$have_getmntent" = "xc"; then
+	if test "x$have_one_getmntent" = "xyes"; then
+		AC_DEFINE(HAVE_ONE_GETMNTENT, 1,
+			  [Define if the function getmntent exists and takes one argument.])
+	fi
+	if test "x$have_two_getmntent" = "xyes"; then
+		AC_DEFINE(HAVE_TWO_GETMNTENT, 1,
+			  [Define if the function getmntent exists and takes two arguments.])
 	fi
-	CFLAGS="$saveCFLAGS"
-fi
-if test "x$fu_cv_getmntent1" = "xyes"; then
-	AC_DEFINE(HAVE_GETMNTENT1,
-		1,
-		[Define if there is a function named getmntent
-			for reading the list of mounted filesystems, and
-			that function takes a single argument. (4.3BSD,
-			SunOS, HP-UX, Dynix, Irix, Linux)]
-		)
 fi
-if test "x$fu_cv_getmntent2" = "xyes"; then
-	AC_DEFINE(HAVE_GETMNTENT2,
-		1,
-		[Define if there is a function named getmntent
-			for reading the list of mounted filesystems, and
-			that function takes two arguments. (SVR4)]
-		)
+if test "x$have_getmntent" = "xsun"; then
+	AC_DEFINE(HAVE_SUN_GETMNTENT, 1,
+		  [Define if the function getmntent exists. It's the version from libsun.])
+fi
+if test "x$have_getmntent" = "xseq"; then
+	AC_DEFINE(HAVE_SEQ_GETMNTENT, 1,
+		  [Define if the function getmntent exists. It's the version from libseq.])
+fi
+if test "x$have_getmntent" = "xgen"; then
+	AC_DEFINE(HAVE_GEN_GETMNTENT, 1,
+		  [Define if the function getmntent exists. It's the version from libgen.])
 fi
 
 # Check for structures
@@ -468,31 +510,36 @@ 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(pth, [AS_HELP_STRING([--with-pth=@<:@=PREFIX@:>@], [Path to pth (experimental).]),
-#[	if test "x$withval" != "xno" && test "x$withval" != "xyes"
-#	then
-#		LDFLAGS="$LDFLAGS -L$withval/lib"
-#		CPPFLAGS="$CPPFLAGS -I$withval/include"
-#		with_pth="yes"
-#	fi
-#], [with_pth="no"])
-#if test "x$with_pth" = "xyes"
-#then
-#	AC_CHECK_LIB(pth, pth_init,, [with_pth="no (libpth not found)"], [])
-#fi
-#if test "x$with_pth" = "xyes"
-#then
-#	AC_CHECK_HEADERS(pth.h,, [with_pth="no (pth.h not found)"])
-#fi
-#if test "x$with_pth" = "xyes"
-#then
-#	collect_pth=1
-#else
-#	collect_pth=0
-#fi
-#AC_DEFINE_UNQUOTED(COLLECT_PTH, [$collect_pth],
-#	[Wether or not to use pth (portable threads) library])
-#AM_CONDITIONAL(BUILD_WITH_PTH, test "x$with_pth" = "xyes")
+AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
+[	if test "x$withval" != "xno" -a "x$withval" != "xyes"
+	then
+		LDFLAGS="$LDFLAGS -L$withval/lib"
+		CPPFLAGS="$CPPFLAGS -I$withval/include"
+		with_libpthread="yes"
+	else
+		if test "x$withval" = "xno"
+		then
+			with_libpthread="no (disabled)"
+		fi
+	fi
+], [with_libpthread="yes"])
+if test "x$with_libpthread" = "xyes"
+then
+	AC_CHECK_LIB(pthread, pthread_create, [with_libpthread="yes"], [with_libpthread="no (libpthread not found)"], [])
+fi
+if test "x$with_libpthread" = "xyes"
+then
+	AC_CHECK_HEADERS(pthread.h,, [with_libpthread="no (pthread.h not found)"])
+fi
+if test "x$with_libpthread" = "xyes"
+then
+	collect_pthread=1
+else
+	collect_pthread=0
+fi
+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"
 then
@@ -787,6 +834,42 @@ then
 	with_liboping="yes (shipped version)"
 fi
 
+AC_ARG_WITH(libpcap, [AS_HELP_STRING([--with-libpcap@<:@=PREFIX@:>@], [Path to libpcap.])],
+[
+	if test "x$withval" != "xno" && test "x$withval" != "xyes"
+	then
+		LDFLAGS="$LDFLAGS -L$withval/lib"
+		CPPFLAGS="$CPPFLAGS -I$withval/include"
+		with_libpcap="yes"
+	fi
+],
+[
+	with_libpcap="yes"
+])
+if test "x$with_libpcap" = "xyes"
+then
+	AC_CHECK_LIB(pcap, pcap_open_live,
+	[
+		AC_DEFINE(HAVE_LIBPCAP, 1, [Define to 1 if you have the pcap library (-lpcap).])
+	], [with_libpcap="no (libpcap not found)"])
+fi
+if test "x$with_libpcap" = "xyes"
+then
+	AC_CHECK_HEADERS(pcap.h,
+	[
+		AC_DEFINE(HAVE_PCAP_H, 1, [Define to 1 if you have the <pcap.h> header file.])
+	], [with_libpcap="no (pcap.h not found)"])
+fi
+if test "x$with_libpcap" = "xyes"
+then
+	collect_libpcap=1
+else
+	collect_libpcap=0
+fi
+AC_DEFINE_UNQUOTED(COLLECT_LIBPCAP, [$collect_libpcap],
+	[Wether or not to use the pcap library])
+AM_CONDITIONAL(BUILD_WITH_LIBPCAP, test "x$with_libpcap" = "xyes")
+
 # Define `step' and `hearbeat' values..
 declare -i collectd_step=10
 declare -i collectd_heartbeat=25
@@ -823,7 +906,6 @@ then
 	AC_DEFINE_UNQUOTED(COLLECTD_HEARTBEAT, "$collectd_heartbeat", [Interval in which plugins are queried.])
 fi
 
-#
 # Check for enabled/disabled features
 #
 
@@ -902,12 +984,18 @@ AC_COLLECTD([battery],   [disable], [module], [battery statistics])
 AC_COLLECTD([cpu],       [disable], [module], [cpu usage statistics])
 AC_COLLECTD([cpufreq],   [disable], [module], [system cpu frequency statistics])
 AC_COLLECTD([disk],      [disable], [module], [disk/partition statistics])
+AC_COLLECTD([csv],       [disable], [module], [csv output plugin])
 AC_COLLECTD([df],        [disable], [module], [df statistics])
-AC_COLLECTD([quota],     [enable],  [module], [quota statistics (experimental)])
+AC_COLLECTD([dns],       [disable], [module], [dns statistics])
+AC_COLLECTD([email],     [disable], [module], [email statistics])
+AC_COLLECTD([entropy],   [disable], [module], [entropy statistics])
 AC_COLLECTD([hddtemp],   [disable], [module], [hdd temperature statistics])
 AC_COLLECTD([load],      [disable], [module], [system load statistics])
+AC_COLLECTD([mbmon],     [disable], [module], [motherboard monitor statistics])
 AC_COLLECTD([memory],    [disable], [module], [memory statistics])
+AC_COLLECTD([multimeter],[disable], [module], [multimeter statistics])
 AC_COLLECTD([mysql],     [disable], [module], [mysql statistics])
+AC_COLLECTD([network],   [disable], [module], [network functionality])
 AC_COLLECTD([nfs],       [disable], [module], [nfs statistics])
 AC_COLLECTD([ntpd],      [disable], [module], [nfs statistics])
 AC_COLLECTD([ping],      [disable], [module], [ping statistics])
@@ -917,6 +1005,7 @@ AC_COLLECTD([serial],    [disable], [module], [serial statistics])
 AC_COLLECTD([swap],      [disable], [module], [swap statistics])
 AC_COLLECTD([tape],      [disable], [module], [tape statistics])
 AC_COLLECTD([traffic],   [disable], [module], [system traffic statistics])
+AC_COLLECTD([unixsock],  [disable], [module], [UNIX socket plugin])
 AC_COLLECTD([users],     [disable], [module], [user count statistics])
 AC_COLLECTD([vserver],   [disable], [module], [vserver statistics])
 AC_COLLECTD([wireless],  [disable], [module], [wireless link statistics])
@@ -935,6 +1024,8 @@ Configuration:
     libstatgrab . . . . $with_libstatgrab
     libkstat  . . . . . $with_kstat
     libmysql  . . . . . $with_libmysql
+    libpcap . . . . . . $with_libpcap
+    libpthread  . . . . $with_libpthread
 
   Features:
     debug . . . . . . . $enable_debug
@@ -949,12 +1040,19 @@ Configuration:
     battery . . . . . . $enable_battery
     cpu . . . . . . . . $enable_cpu
     cpufreq . . . . . . $enable_cpufreq
+    csv . . . . . . . . $enable_csv
     df  . . . . . . . . $enable_df
     disk  . . . . . . . $enable_disk
+    dns . . . . . . . . $enable_dns
+    email . . . . . . . $enable_email
+    entropy . . . . . . $enable_entropy
     hddtemp . . . . . . $enable_hddtemp
     load  . . . . . . . $enable_load
+    mbmon . . . . . . . $enable_mbmon
     memory  . . . . . . $enable_memory
+    multimeter  . . . . $enable_multimeter
     mysql . . . . . . . $enable_mysql
+    network . . . . . . $enable_network
     nfs . . . . . . . . $enable_nfs
     ntpd  . . . . . . . $enable_ntpd
     ping  . . . . . . . $enable_ping
@@ -964,6 +1062,7 @@ Configuration:
     swap  . . . . . . . $enable_swap
     tape  . . . . . . . $enable_tape
     traffic . . . . . . $enable_traffic
+    unixsock  . . . . . $enable_unixsock
     users . . . . . . . $enable_users
     vserver . . . . . . $enable_vserver
     wireless  . . . . . $enable_wireless