Fix for regex input of '|', being output causing problems with Nagios' parsing of

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index f3547349b06361f152679ddc41cdc299586d90fd..bdd443141e89719a3b5cbfb5754cdde52e860193 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.14)
+AC_INIT(nagios-plugins,1.4.15)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES(gl/Makefile)
 AC_CONFIG_AUX_DIR(build-aux)
@@ -585,14 +585,73 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
         ac_cv_ps_cols=9
         AC_MSG_RESULT([using nagios-plugins internal ps command (pst3) for solaris])
        if test `isainfo -b` = 64 ; then
-               PST3CFLAGS="-m64"
-               AC_SUBST(PST3CFLAGS)
-               AC_MSG_NOTICE([using 64bit pst3])       
+               pst3_use_64bit=1
+               AC_MSG_NOTICE([using 64bit pst3])
        else
                AC_MSG_NOTICE([using 32bit pst3])
        fi
         EXTRAS_ROOT="$EXTRAS_ROOT pst3"
 
+       if test "$pst3_use_64bit" = 1; then
+               dnl Test if we can actually compile code in 64bit
+               old_cflags=$CFLAGS
+               CFLAGS="$CFLAGS -m64"
+               pst3_64bit_working=0
+               AC_RUN_IFELSE(
+                       [AC_LANG_PROGRAM([], [
+return sizeof(void*) == 8 ? 0 : 1;
+                       ])
+               ],[
+                       PST3CFLAGS="-m64"
+                       AC_SUBST(PST3CFLAGS)
+                       pst3_64bit_working=1
+                       AC_MSG_NOTICE([using -m64 for 64bit code])
+               ],[
+                       pst3_64bit_working=0
+                       AC_MSG_NOTICE([compiler do not like -m64])
+               ])
+               CFLAGS=$old_cflags
+               if test "$pst3_64bit_working" = 0; then
+                       old_cflags=$CFLAGS
+                       CFLAGS="$CFLAGS -xarch=v9"
+                       AC_RUN_IFELSE(
+                               [AC_LANG_PROGRAM([], [
+return sizeof(void*) == 8 ? 0 : 1;
+                               ])
+                       ],[
+                               PST3CFLAGS="-xarch=v9"
+                               AC_SUBST(PST3CFLAGS)
+                               pst3_64bit_working=1
+                               AC_MSG_NOTICE([using -xarch=v9 for 64bit code])
+                       ],[
+                               pst3_64bit_working=0
+                               AC_MSG_NOTICE([compiler do not like -xarch=v9])
+                       ])
+                       CFLAGS=$old_cflags
+               fi
+               if test "$pst3_64bit_working" = 0; then
+                       old_cflags=$CFLAGS
+                       CFLAGS="$CFLAGS -xarch=amd64"
+                       AC_RUN_IFELSE(
+                               [AC_LANG_PROGRAM([], [
+return sizeof(void*) == 8 ? 0 : 1;
+                               ])
+                       ],[
+                               PST3CFLAGS="-xarch=amd64"
+                               AC_SUBST(PST3CFLAGS)
+                               pst3_64bit_working=1
+                               AC_MSG_NOTICE([using -xarch=amd64 for 64bit code])
+                       ],[
+                               pst3_64bit_working=0
+                               AC_MSG_NOTICE([compiler do not like -xarch=amd64])
+                       ])
+                       CFLAGS=$old_cflags
+               fi
+               if test "$pst3_64bit_working" = 0; then
+                       AC_MSG_ERROR([I don't know how to build a 64-bit object!])
+               fi
+       fi
+
 dnl Removing this for the moment - Ton
 dnl Using /usr/ucb/ps on Solaris systems, to avoid truncation
 dnl Limitation that command name is not available
@@ -877,10 +936,17 @@ 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" ]] && \
@@ -981,7 +1047,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