Merge branch 'collectd-4.1'
[collectd.git] / configure.in
index 1c591c2..44d7cfc 100644 (file)
@@ -40,8 +40,8 @@ case $host_os in
        AC_DEFINE([KERNEL_SOLARIS], 1, [True if program is to be compiled for a Solaris kernel])
        ac_system="Solaris"
        ;;
-       *apple-darwin*)
-       ac_system="Mac OS X"
+       *darwin*)
+       ac_system="Darwin"
        ;;
        *)
        ac_system="unknown"
@@ -193,7 +193,7 @@ AC_CHECK_HEADERS(netinet/udp.h, [], [],
 
 # For cpu modules
 AC_CHECK_HEADERS(sys/dkstat.h)
-if test ac_system = "Mac OS X"
+if test "x$ac_system" = "xDarwin"
 then
        AC_CHECK_HEADERS(mach/mach_init.h mach/host_priv.h mach/mach_error.h mach/mach_host.h mach/mach_port.h mach/mach_types.h mach/message.h mach/processor_set.h mach/processor.h mach/processor_info.h mach/task.h mach/thread_act.h mach/vm_region.h mach/vm_map.h mach/vm_prot.h mach/vm_statistics.h mach/kern_return.h)
        AC_CHECK_HEADERS(CoreFoundation/CoreFoundation.h IOKit/IOKitLib.h IOKit/IOTypes.h IOKit/ps/IOPSKeys.h IOKit/IOBSD.h IOKit/storage/IOBlockStorageDriver.h)
@@ -365,6 +365,8 @@ AC_HEADER_TIME
 AC_PROG_GCC_TRADITIONAL
 AC_CHECK_FUNCS(gettimeofday select strdup strtol getaddrinfo getnameinfo strchr memcpy strstr strcmp strncmp strncpy strlen strncasecmp strcasecmp openlog closelog)
 
+AC_FUNC_STRERROR_R
+
 AC_CHECK_FUNCS(getpwnam_r)
 AC_CHECK_FUNCS(getgrnam_r)
 
@@ -729,7 +731,7 @@ 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"
+if test "x$ac_system" = "xSolaris"
 then
        with_kstat="yes"
        with_devinfo="yes"
@@ -787,7 +789,7 @@ then
 
        if test $curl_config_status -ne 0
        then
-               with_libcurl="no"
+               with_libcurl="no ($with_curl_config failed)"
        else
                SAVE_CFLAGS=$CFLAGS
                CFLAGS="$CFLAGS $with_curl_cflags"
@@ -804,15 +806,10 @@ then
 
        if test $curl_config_status -ne 0
        then
-               with_libcurl="no"
+               with_libcurl="no ($with_curl_config failed)"
        else
                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="yes"],
                 [with_libcurl="no (symbol 'curl_easy_init' not found)"],
                 [$with_curl_libs])
        fi
@@ -984,13 +981,8 @@ 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_libmysql="yes"],
+                [with_libmysql="no (symbol 'mysql_init' not found)"],
                 [$with_mysql_libs])
        fi
 fi
@@ -1267,9 +1259,14 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@],
                with_libupsclient="no"
        else
                with_libupsclient="yes"
-               if "x$withval" != "xyes"
+               if test "x$withval" != "xyes"
                then
-                       with_upsclient_config="$withval/bin/libupsclient-config"
+                       if test -x "$withval"
+                       then
+                               with_upsclient_config="$withval"
+                       else
+                               with_upsclient_config="$withval/bin/libupsclient-config"
+                       fi
                fi
        fi
 ],
@@ -1283,25 +1280,30 @@ then
 
        if test $upsclient_config_status -ne 0
        then
-               with_libupsclient="no"
+               with_libupsclient="no ($with_upsclient_config failed)"
        fi
 fi
 if test "x$with_libupsclient" = "xyes"
 then
+       SAVE_CFLAGS="$CFLAGS"
+       CFLAGS="$CFLAGS $with_upsclient_cflags"
+
+       AC_CHECK_HEADERS(upsclient.h, [], [with_libupsclient="no (upsclient.h not found)"])
+
+       CFLAGS="$SAVE_CFLAGS"
+fi
+if test "x$with_libupsclient" = "xyes"
+then
        with_upsclient_libs=`$with_upsclient_config --libs 2>/dev/null`
        upsclient_config_status=$?
 
        if test $upsclient_config_status -ne 0
        then
-               with_libupsclient="no"
+               with_libupsclient="no ($with_upsclient_config failed)"
        fi
 fi
 if test "x$with_libupsclient" = "xyes"
 then
-       CFLAGS_ORIG=$CFLAGS
-       CFLAGS="$CFLAGS $with_upsclient_cflags"
-       LDFLAGS_ORIG=$LDFLAGS
-       LDFLAGS="$LDFLAGS $with_upsclient_libs"
        AC_CHECK_LIB(upsclient, upscli_connect,
        [
                BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_upsclient_cflags"
@@ -1310,14 +1312,8 @@ then
                AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS)
        ],
        [
-               with_libupsclient="no"
-       ])
-       CFLAGS=$CFLAGS_ORIG
-       LDFLAGS=$LDFLAGS_ORIG
-fi
-if test "x$with_libupsclient" = "xyes"
-then
-       AC_DEFINE(HAVE_LIBUPSCLIENT, 1, [Define to 1 if you have the upsclient library (-lupsclient).])
+               with_libupsclient="no (symbol 'upscli_connect' not found)"
+       ], [$with_upsclient_libs])
 fi
 if test "x$with_libupsclient" = "xyes"
 then
@@ -1429,12 +1425,56 @@ then
        SAVE_CFLAGS=$CFLAGS
        CFLAGS="$CFLAGS $with_libnetlink_cflags"
 
-       AC_CHECK_HEADERS(iproute/libnetlink.h, [], [with_libnetlink="no (iproute/libnetlink.h not found)"],
+       with_libnetlink="no (libnetlink.h not found)"
+
+       AC_CHECK_HEADERS(libnetlink.h iproute/libnetlink.h linux/libnetlink.h,
+       [
+        with_libnetlink="yes"
+        break
+       ], [],
 [#include <stdio.h>
 #include <sys/types.h>
+#include <asm/types.h>
 #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
@@ -1447,8 +1487,8 @@ then
 fi
 if test "x$with_libnetlink" = "xyes"
 then
-       BUILD_WITH_LIBNETLINK_CFLAGS="$with_curl_cflags"
-       BUILD_WITH_LIBNETLINK_LIBS="$with_curl_libs"
+       BUILD_WITH_LIBNETLINK_CFLAGS="$with_libnetlink_cflags"
+       BUILD_WITH_LIBNETLINK_LIBS="$with_libnetlink_libs"
        AC_SUBST(BUILD_WITH_LIBNETLINK_CFLAGS)
        AC_SUBST(BUILD_WITH_LIBNETLINK_LIBS)
 fi