check_pgsql now builds with postgres lib v8.3 (Jan Wagner #1878972)

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index ee928d44facc2710dd5a86c3998cb84a778e9642..341add80f8e8c00cd57ded1736040d9c1c250535 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_REVISION ($Revision$)
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.9)
+AC_INIT(nagios-plugins,1.4.11)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -48,6 +48,7 @@ AC_PROG_LIBTOOL
 AM_PROG_CC_C_O
 
 AC_FUNC_ERROR_AT_LINE
+AC_SYS_LARGEFILE
 
 ifdef([AC_FUNC_STRTOD],[AC_FUNC_STRTOD],[AM_FUNC_STRTOD])
 
@@ -155,7 +156,7 @@ AC_SUBST(MATHLIBS)
 
 dnl Check for libtap, to run perl-like tests
 AC_CHECK_LIB(tap, plan_tests, 
-       EXTRA_TEST="test_utils test_disk test_tcp test_cmd"
+       EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
        AC_SUBST(EXTRA_TEST)
        )
 
@@ -275,9 +276,15 @@ else
   AC_SUBST(MYSQLCFLAGS)
 fi
 
+AC_ARG_WITH([ipv6],
+       [AS_HELP_STRING([--with-ipv6], [support IPv6 @<:@default=check@:>@])],
+       [], [with_ipv6=check])
+
 dnl Check for AF_INET6 support - unistd.h required for Darwin
-AC_CACHE_CHECK([for IPv6 support], with_ipv6, [
-       AC_TRY_COMPILE([#ifdef HAVE_UNISTD_H
+if test "$with_ipv6" != "no"; then
+       AC_CACHE_CHECK([for IPv6 support], np_cv_sys_ipv6, [
+               AC_TRY_COMPILE(
+                       [#ifdef HAVE_UNISTD_H
                        #include <unistd.h>
                        #endif
                        #include <netinet/in.h>
@@ -288,12 +295,16 @@ AC_CACHE_CHECK([for IPv6 support], with_ipv6, [
                        sin6.sin6_family = AF_INET6;
                        sin6.sin6_port = 587;
                        p = &sin6.sin6_addr;],
-                       [with_ipv6=yes], 
-                       [with_ipv6=no])
-       ])
-
-if test x"$with_ipv6" != xno ; then
-       AC_DEFINE(USE_IPV6,1,[Enable IPv6 support])
+                       [np_cv_sys_ipv6=yes],
+                       [np_cv_sys_ipv6=no])
+               ])
+       if test "$np_cv_sys_ipv6" = "no" -a "$with_ipv6" != "check"; then
+               AC_MSG_FAILURE([--with-ipv6 was given, but test for IPv6 support failed])
+       fi
+       if test "$np_cv_sys_ipv6" = "yes"; then
+               AC_DEFINE(USE_IPV6,1,[Enable IPv6 support])
+       fi
+       with_ipv6="$np_cv_sys_ipv6"
 fi
 
 
@@ -1497,6 +1508,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround,
        [ac_cv_enable_redhat_pthread_workaround=test])
 if test "$ac_cv_enable_redhat_pthread_workaround" = "test" ; then
        if echo $ac_cv_uname_r | egrep "\.EL(smp)?$" >/dev/null 2>&1 ; then
+               AC_MSG_NOTICE([See http://nagiosplugins.org/faq/compile/configure_appears_to_hang if this next part takes a long time])
                AC_MSG_CHECKING(for redhat spopen problem)
                ( cd config_test && make && make test ) > /dev/null 2>&1
                if test $? -eq 0 ; then