From c9a5b0349213c09f01108993eb0072627e6a890c Mon Sep 17 00:00:00 2001 From: octo Date: Fri, 10 Mar 2006 17:24:20 +0000 Subject: [PATCH] Improved configure.in: - Checks for - netinet/in_systm.h - netinet/in.h - netinet/ip.h - netinet/ip_icmp.h - netinet/ip_var.h - netinet/ip6.h - netinet/icmp6.h - Check for `getfsstat' (BSD and Mac OS X) - Defines for various `getmntent' variants: - HAVE_SUN_GETMNTENT - HAVE_SEQ_GETMNTENT - HAVE_GEN_GETMNTENT --- configure.in | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index ebb2cd07..d1adcab7 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.8.0) +AC_INIT(collectd, 3.8.1-alpha2) AC_CONFIG_SRCDIR(src/collectd.c) AC_CONFIG_HEADERS(src/config.h) AM_INIT_AUTOMAKE(dist-bzip2) @@ -42,10 +42,66 @@ AC_CHECK_HEADERS(sys/socket.h) AC_CHECK_HEADERS(sys/select.h) AC_CHECK_HEADERS(netdb.h) AC_CHECK_HEADERS(arpa/inet.h) -AC_CHECK_HEADERS(netinet/in.h) AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/param.h) +# For ping library +AC_CHECK_HEADERS(netinet/in_systm.h) +AC_CHECK_HEADERS(netinet/in.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip_icmp.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip_var.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/ip6.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +]) +AC_CHECK_HEADERS(netinet/icmp6.h, [], [], +[#if HAVE_NETINET_IN_SYSTM_H +# include +#endif +#if HAVE_NETINET_IN_H +# include +#endif +#if HAVE_NETINET_IP6_H +# include +#endif +]) + # For cpu modules AC_CHECK_HEADERS(sys/sysctl.h sys/dkstat.h) @@ -123,7 +179,26 @@ AC_CHECK_FUNCS(getgrgid getpwuid) # 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.]) +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.]) +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.]) +fi + if test "x$ac_cv_func_getmntent" = "xyes"; then saveCFLAGS="$CFLAGS" CFLAGS="-Wall -Werror $CFLAGS" -- 2.30.2