configure.in: Many fixes for Solaris. Especially check the `kstat_io_t'-type for...

[collectd.git] / configure.in

diff --git a/configure.in b/configure.in
index 20b5d1c..8f9e3be 100644 (file)
--- 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.11.2)
+AC_INIT(collectd, 4.0.0-rc2)
 AC_CONFIG_SRCDIR(src/collectd.c)
 AC_CONFIG_HEADERS(src/config.h)
 AM_INIT_AUTOMAKE(dist-bzip2)
@@ -50,6 +50,7 @@ AC_CHECK_HEADERS(netdb.h)
 AC_CHECK_HEADERS(arpa/inet.h)
 AC_CHECK_HEADERS(sys/resource.h)
 AC_CHECK_HEADERS(sys/param.h)
+AC_CHECK_HEADERS(kstat.h)
 
 # For ping library
 AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
@@ -323,9 +324,29 @@ 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_arp.h, [], [],
+[#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+])
 AC_CHECK_HEADERS(net/if_ppp.h)
-AC_CHECK_HEADERS(netinet/if_ether.h)
+AC_CHECK_HEADERS(netinet/if_ether.h, [], [],
+[#if HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#if HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif
+#if HAVE_NET_IF_H
+# include <net/if.h>
+#endif
+#if HAVE_NETINET_IN_H
+# include <netinet/in.h>
+#endif
+])
 
 # For the multimeter plugin
 AC_CHECK_HEADERS(termios.h)
@@ -453,6 +474,9 @@ if test "x$nan_type" = "xnone"; then
       [[
 #include <stdlib.h>
 #include <math.h>
+#ifdef NAN
+# undef NAN
+#endif
 #define NAN (0.0 / 0.0)
 #ifndef isnan
 # define isnan(f) ((f) != (f))
@@ -625,6 +649,15 @@ AC_CHECK_MEMBERS([struct udphdr.dest, struct udphdr.source], [], [],
 #endif
 ])
 
+AC_CHECK_MEMBERS([kstat_io_t.nwritten, kstat_io_t.writes, kstat_io_t.nwrites, kstat_io_t.wtime],
+       [],
+       [],
+       [
+#if HAVE_KSTAT_H
+# include <kstat.h>
+#endif
+       ])
+
 AC_MSG_CHECKING([for kernel type ($host_os)])
 case $host_os in
        *linux*)
@@ -734,12 +767,9 @@ then
 fi
 if test "x$with_kstat" = "xyes"
 then
-       collect_kstat=1
-else
-       collect_kstat=0
+       AC_DEFINE(HAVE_LIBKSTAT, 1,
+                 [Define to 1 if you have the 'kstat' library (-lkstat)])
 fi
-AC_DEFINE_UNQUOTED(COLLECT_KSTAT, [$collect_kstat],
-       [Wether or not to use kstat library (Solaris)])
 AM_CONDITIONAL(BUILD_WITH_LIBKSTAT, test "x$with_kstat" = "xyes")
 AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
 
@@ -1228,19 +1258,20 @@ Configuration:
   Libraries:
     libcurl . . . . . . $with_libcurl
     libiokit  . . . . . $with_libiokit
-    liboping  . . . . . $with_liboping
-    librrd  . . . . . . $with_rrdtool
-    lm_sensors  . . . . $with_lm_sensors
-    libstatgrab . . . . $with_libstatgrab
+    libiptc . . . . . . $with_libiptc
     libkstat  . . . . . $with_kstat
     libmysql  . . . . . $with_libmysql
+    liboping  . . . . . $with_liboping
     libpcap . . . . . . $with_libpcap
-    libiptc . . . . . . $with_libiptc
     libpthread  . . . . $with_libpthread
+    librrd  . . . . . . $with_rrdtool
+    libsensors  . . . . $with_lm_sensors
+    libstatgrab . . . . $with_libstatgrab
+    libupsclient  . . . $with_libupsclient
 
   Features:
-    debug . . . . . . . $enable_debug
     daemon mode . . . . $enable_daemon
+    debug . . . . . . . $enable_debug
 
   Modules:
     apache  . . . . . . $enable_apache