Convert tabs to spaces from dig's answer section (Randy O'Meara - 1107651)

[nagiosplug.git] / configure.in

diff --git a/configure.in b/configure.in
index 30e42611664f5d776a7a237fac28e24943cf5552..0002d61b90ab8e821ffdbf7a4d857d0774d072af 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.58)
-AC_INIT(nagios-plugins,1.4-beta1)
+AC_INIT(nagios-plugins,1.4-beta2)
 AC_CONFIG_SRCDIR(Helper.pm)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
@@ -419,15 +419,17 @@ AC_HELP_STRING([--with-openssl=DIR], [sets path to openssl installation])
 AC_HELP_STRING([--without-openssl], [disable openssl]),
 OPENSSL=$withval)
 
+_SAVEDCPPFLAGS="$CPPFLAGS"
+_SAVEDLDFLAGS="$LDFLAGS"
 if test X"$OPENSSL" = "Xno"; then
   AC_MSG_WARN([openssl disabled, you will not be able to use ssl options in some plugins])
   FOUNDSSL="dontbother"
 else
   dnl Check for OpenSSL header files
   unset FOUNDINCLUDE
-  _SAVEDCPPFLAGS="$CPPFLAGS"
   if test "$OPENSSL" != "/usr"; then
     CPPFLAGS="$CPPFLAGS -I$OPENSSL/include"
+    LDFLAGS="$LDFLAGS -R$OPENSSL/lib"
   fi
   AC_CHECK_HEADERS(openssl/ssl.h openssl/x509.h openssl/rsa.h openssl/pem.h openssl/crypto.h openssl/err.h,
                  SSLINCLUDE="-I$OPENSSL/include"
@@ -470,13 +472,15 @@ if test "$FOUNDSSL" = "yes"; then
   AC_SUBST(SSLLIBS)
   AC_DEFINE(HAVE_SSL,1,[Define if SSL libraries are found])
   with_openssl="yes"
-elif test "$FOUNDSSL" = "no"; then
-  AC_MSG_WARN([OpenSSL libs could not be found])
-  with_openssl="no"
 else
+  if test "$FOUNDSSL" = "no"; then
+    AC_MSG_WARN([OpenSSL libs could not be found])
+  dnl else deliberately disabled
+  fi
   with_openssl="no"
+  CPPFLAGS="$_SAVEDCPPFLAGS"
+  LDFLAGS="$_SAVEDLDFLAGS"
 fi
-CPPFLAGS="$_SAVEDCPPFLAGS"
 
 dnl
 dnl Checks for header files.
@@ -594,6 +598,18 @@ then
        ac_cv_ps_cols=8
        AC_MSG_RESULT([$ac_cv_ps_command])
 
+dnl Some *BSDs have different format for ps. This is mainly to catch FreeBSD 4. 
+dnl Limitation: Only first 16 chars returned for ucomm field
+dnl Must come before ps -weo
+elif ps -axwo 'stat uid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
+       egrep -i ["^ *STAT +UID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
+then
+       ac_cv_ps_varlist="[procstat,&procuid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
+       ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid ppid vsz rss pcpu ucomm command'"
+       ac_cv_ps_format="%s %d %d %d %d %f %s %n"
+       ac_cv_ps_cols=8
+       AC_MSG_RESULT([$ac_cv_ps_command])
+
 dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
 elif ps -weo 'stat comm vsz rss user uid ppid etime args' 2>/dev/null | \
        egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
@@ -1245,13 +1261,13 @@ then
                egrep -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \
                >/dev/null]
        then
-               ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %d %d"]
+               ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %f %f"]
                ac_cv_swap_conv=2048
                AC_MSG_RESULT([using IRIX format swap])
 
        elif [$PATH_TO_SWAP -l 2>/dev/null | egrep -i "^path +dev +swaplo +blocks +free" >/dev/null]
        then
-               ac_cv_swap_format=["%*s %*[0-9,-] %*d %d %d"]
+               ac_cv_swap_format=["%*s %*[0-9,-] %*d %f %f"]
                ac_cv_swap_conv=2048
                AC_MSG_RESULT([using Unixware format swap])
        else
@@ -1275,7 +1291,7 @@ then
 
        if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
        then
-               ac_cv_swap_format=["%*s %d %*d %d"]
+               ac_cv_swap_format=["%*s %f %*d %f"]
                ac_cv_swap_conv=1024
                AC_MSG_RESULT([using FreeBSD format swapinfo])
        fi
@@ -1284,7 +1300,7 @@ elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >
 then
        ac_cv_have_swap=yes
        ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM",
-       ac_cv_swap_format=["%*s %d %*d %d"]
+       ac_cv_swap_format=["%*s %f %*d %f"]
        ac_cv_swap_conv=1024
        AC_MSG_RESULT([using HP-UX format swapinfo])
 fi
@@ -1299,7 +1315,7 @@ if [$PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null]
 then
        ac_cv_have_swap=yes
        ac_cv_swap_command="$PATH_TO_LSPS -a"
-       ac_cv_swap_format=["%*s %*s %*s %d%*s %d %*s"]
+       ac_cv_swap_format=["%*s %*s %*s %f%*s %f %*s"]
        ac_cv_swap_conv=1
        AC_MSG_RESULT([using AIX lsps])
 fi
@@ -1312,12 +1328,12 @@ dnl fwict, the 2-arg is an SVR4 standard, whereas the 3-arg is shared
 dnl in the various BSD's
 dnl
 
+AC_CHECK_HEADERS([sys/stat.h sys/param.h])
 AC_CHECK_HEADERS([sys/swap.h], [], [], [
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 ])
-AC_CHECK_HEADERS([sys/stat.h sys/param.h])
 AC_CHECK_DECLS([swapctl],,,[
                #include <unistd.h>
                #include <sys/types.h>
@@ -1449,6 +1465,21 @@ AC_TRY_COMPILE([#ifdef __STDC__
                [AC_MSG_RESULT(yes)],
                [NEED_VA_LIST=-DNEED_VA_LIST AC_SUBST(NEED_VA_LIST) AC_MSG_RESULT(no)])
 
+case $host in
+       *bsd*)
+               AC_DEFINE(__bsd__,1,[bsd specific code in check_dhcp.c])
+       ;;
+       *linux*)
+               AC_DEFINE(__linux__,1,[sun specific code in check_dhcp.c])
+       ;;
+       *sun* | solaris*)
+               AC_DEFINE(__sun__,1,[sun specific code in check_dhcp.c])
+       ;;
+       *hpux*)  
+               AC_DEFINE(__hpux__,1,[hpux specific code in check_dhcp.c])
+       ;;
+esac
+
 AC_SUBST(EXTRAS)
 AC_SUBST(EXTRA_NETOBJS)
 AC_SUBST(DEPLIBS)