Hide some debug output which was printed even without "-v" (under

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 9067978aa6a7a532d32154063d1bdb31e2b19ab3..78434437e94c4a2f2ff8b73a9ab0490a7922e378 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)
@@ -155,7 +155,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"
+       EXTRA_TEST="test_utils test_disk test_tcp test_cmd test_base64"
        AC_SUBST(EXTRA_TEST)
        )
 
@@ -218,8 +218,15 @@ if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
        RADIUSLIBS="-lradiusclient"
   AC_SUBST(RADIUSLIBS)
 else
-  AC_MSG_WARN([Skipping radius plugin])
-  AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+  AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+  if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
+    EXTRAS="$EXTRAS check_radius"
+         RADIUSLIBS="-lradiusclient-ng"
+    AC_SUBST(RADIUSLIBS)
+  else
+    AC_MSG_WARN([Skipping radius plugin])
+    AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+  fi
 fi
 LIBS="$_SAVEDLIBS"
 
@@ -268,9 +275,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>
@@ -281,12 +294,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