Fix Debian bug #545940: Failure when run via ePN

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 107cfd954abbf9fd7f18e57389ea37aad6678986..d02d7f85beafe3c993eea023a5473fae09c69a08 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.59)
-AC_INIT(nagios-plugins,1.4.13)
+AC_INIT(nagios-plugins,1.4.14)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -99,7 +99,15 @@ AC_SUBST(REV_DATESTAMP)
 AC_SUBST(REV_TIMESTAMP)
 
 dnl Check if version file is present
-AM_CONDITIONAL([RELEASE_PRESENT], [test -f release])
+AM_CONDITIONAL([RELEASE_PRESENT], [test -f $srcdir/release])
+
+# Also read in the version from it
+if test -f $srcdir/release; then
+       NP_RELEASE="$(<release)"
+else
+       NP_RELEASE="$PACKAGE_VERSION"
+fi
+AC_SUBST(NP_RELEASE)
 
 dnl Checks for programs.
 AC_PATH_PROG(PYTHON,python)
@@ -188,7 +196,7 @@ AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
 if test "$enable_extra_opts" = "yes" ; then
        AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
        if test "$enable_libtap" = "yes"; then
-               EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2"
+               EXTRA_TEST="$EXTRA_TEST test_ini1 test_ini3 test_opts1 test_opts2 test_opts3"
                AC_SUBST(EXTRA_TEST)
        fi
 fi
@@ -869,24 +877,31 @@ ac_cv_ping_has_timeout=no
 if test -n "$with_ping_command"
 then
        AC_MSG_RESULT([(command-line) $with_ping_command])
-       if test -n "$ac_cv_ping_packets_first"
+       if echo "$with_ping_command" | grep '%d.*%d.*%s' >/dev/null
        then
                ac_cv_ping_packets_first=yes
                ac_cv_ping_has_timeout=yes
+       elif echo "$with_ping_command" | grep '%d.*%s.*%d' >/dev/null || \
+            echo "$with_ping_command" | grep '%s.*%d.*%d' >/dev/null
+       then
+               ac_cv_ping_has_timeout=yes
+       elif echo "$with_ping_command" | grep '%d.*%s' >/dev/null
+       then
+               ac_cv_ping_packets_first=yes
        fi
 
 elif [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
        $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
        egrep -i "^round-trip|^rtt" >/dev/null
 then
-        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+       with_ping_command="$PATH_TO_PING -n -U -c %d %s"
        ac_cv_ping_packets_first=yes
        AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
        egrep -i "^round-trip|^rtt" >/dev/null
 then
-        with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
+       with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
        ac_cv_ping_packets_first=yes
   ac_cv_ping_has_timeout=yes
        AC_MSG_RESULT([$with_ping_command])
@@ -894,7 +909,7 @@ then
 elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
        egrep -i "^round-trip|^rtt" >/dev/null
 then
-        with_ping_command="$PATH_TO_PING -n -U -c %d %s"
+       with_ping_command="$PATH_TO_PING -n -U -c %d %s"
        ac_cv_ping_packets_first=yes
        AC_MSG_RESULT([$with_ping_command])
 
@@ -973,7 +988,15 @@ ac_cv_ping6_packets_first=no
 if test -n "$with_ping6_command"
 then
        AC_MSG_RESULT([(command-line) $with_ping6_command])
-       if test -n "$ac_cv_ping6_packets_first"
+       if echo "$with_ping6_command" | grep '%d.*%d.*%s' >/dev/null
+       then
+               ac_cv_ping6_packets_first=yes
+       elif echo "$with_ping6_command" | grep '%d.*%s.*%d' >/dev/null || \
+            echo "$with_ping6_command" | grep '%s.*%d.*%d' >/dev/null
+       then
+               # Just keep same logic as ping (IPv4) if we ever need ac_cv_ping6_has_timeout
+               true
+       elif echo "$with_ping6_command" | grep '%d.*%s' >/dev/null
        then
                ac_cv_ping6_packets_first=yes
        fi
@@ -983,7 +1006,7 @@ elif test "x$PATH_TO_PING6" != "x"; then
                $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
                egrep -i "^round-trip|^rtt" >/dev/null
        then
-               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
                ac_cv_ping6_packets_first=yes
                AC_MSG_RESULT([$with_ping6_command])
 
@@ -998,7 +1021,7 @@ elif test "x$PATH_TO_PING6" != "x"; then
        elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
                egrep -i "^round-trip|^rtt" >/dev/null
        then
-               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
+               with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
                ac_cv_ping6_packets_first=yes
                AC_MSG_RESULT([$with_ping6_command])
 
@@ -1054,14 +1077,14 @@ elif test "x$PATH_TO_PING" != "x"; then
                $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
                egrep -i "^round-trip|^rtt" >/dev/null
        then
-               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
                ac_cv_ping6_packets_first=yes
                AC_MSG_RESULT([$with_ping6_command])
 
        elif $PATH_TO_PING -A inet6 -n -U -c 1 ::1 2>/dev/null | \
                egrep -i "^round-trip|^rtt" >/dev/null
        then
-               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
+               with_ping6_command="$PATH_TO_PING -A inet6 -n -U -c %d %s"
                ac_cv_ping6_packets_first=yes
                AC_MSG_RESULT([$with_ping6_command])
 
@@ -1403,23 +1426,23 @@ AC_CHECK_HEADERS([sys/swap.h], [], [], [
 AC_CHECK_DECLS([swapctl],,,[
                #include <unistd.h>
                #include <sys/types.h>
-              #include <sys/param.h>
+               #include <sys/param.h>
                #include <sys/stat.h>
                #include <sys/swap.h>
                ])
 AC_CHECK_TYPES([swaptbl_t, swapent_t],,,[
                #include <sys/types.h>
-              #include <sys/param.h>
+               #include <sys/param.h>
                #include <sys/stat.h>
                #include <sys/swap.h>
                ])
 AC_CHECK_MEMBERS([struct swapent.se_nblks],,,[
-               #include <unistd.h>
-               #include <sys/types.h>
-              #include <sys/param.h>
-               #include <sys/stat.h>
-               #include <sys/swap.h>
-               ])
+                 #include <unistd.h>
+                 #include <sys/types.h>
+                 #include <sys/param.h>
+                 #include <sys/stat.h>
+                 #include <sys/swap.h>
+                 ])
 
 if test "$ac_cv_have_decl_swapctl" = "yes";
 then
@@ -1535,9 +1558,7 @@ if test -n "$PATH_TO_APTGET" ; then
 fi
 
 
-if test -f plugins/check_nt.c ; then
-  EXTRAS="$EXTRAS check_nt"
-elif test -f ../plugins/check_nt.c ; then
+if test -f $srcdir/plugins/check_nt.c ; then
   EXTRAS="$EXTRAS check_nt"
 fi