1 files changed, 174 insertions, 89 deletions

diff --git a/configure.ac b/configure.ac
index 0a554af..e6a40d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.59)
-AC_INIT(monitoring-plugins,2.1.2)
+AC_PREREQ(2.64)
+AC_INIT(monitoring-plugins,2.3git)
 AC_CONFIG_SRCDIR(NPTest.pm)
 AC_CONFIG_FILES([gl/Makefile])
 AC_CONFIG_AUX_DIR(build-aux)
 AM_INIT_AUTOMAKE([1.8.3])
+AM_SILENT_RULES([yes])
 AM_MAINTAINER_MODE([enable])
 AC_CONFIG_HEADERS([config.h])
 AC_CANONICAL_HOST
@@ -273,26 +274,33 @@ AC_ARG_WITH([radius], [AS_HELP_STRING([--without-radius], [Skips the radius plug
 dnl Check for radius libraries
 AS_IF([test "x$with_radius" != "xno"], [
   _SAVEDLIBS="$LIBS"
-  AC_CHECK_LIB(freeradius-client,rc_read_config)
-  if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then
+  AC_CHECK_LIB(radcli,rc_read_config)
+  if test "$ac_cv_lib_radcli_rc_read_config" = "yes"; then
     EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
-    RADIUSLIBS="-lfreeradius-client"
+    RADIUSLIBS="-lradcli"
     AC_SUBST(RADIUSLIBS)
   else
-    AC_CHECK_LIB(radiusclient-ng,rc_read_config)
-    if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
+    AC_CHECK_LIB(freeradius-client,rc_read_config)
+    if test "$ac_cv_lib_freeradius_client_rc_read_config" = "yes"; then
       EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
-      RADIUSLIBS="-lradiusclient-ng"
+      RADIUSLIBS="-lfreeradius-client"
       AC_SUBST(RADIUSLIBS)
     else
-      AC_CHECK_LIB(radiusclient,rc_read_config)
-      if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+      AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+      if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
         EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
-        RADIUSLIBS="-lradiusclient"
+        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).])
+        AC_CHECK_LIB(radiusclient,rc_read_config)
+        if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
+          EXTRAS="$EXTRAS check_radius\$(EXEEXT)"
+          RADIUSLIBS="-lradiusclient"
+          AC_SUBST(RADIUSLIBS)
+        else
+          AC_MSG_WARN([Skipping radius plugin])
+          AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+        fi
       fi
     fi
   fi
@@ -320,6 +328,25 @@ AS_IF([test "x$with_ldap" != "xno"], [
   LIBS="$_SAVEDLIBS"
 ])
 
+
+AC_ARG_WITH([systemd], [AS_HELP_STRING([--without-systemd], [Skips systemd support])])
+
+dnl Check for libsystemd
+AS_IF([test "x$with_systemd" != "xno"], [
+  _SAVEDLIBS="$LIBS"
+  AC_CHECK_LIB(systemd,sd_get_sessions,,,-lsystemd)
+  if test "$ac_cv_lib_systemd_sd_get_sessions" = "yes"; then
+    SYSTEMDLIBS="-lsystemd"
+    SYSTEMDINCLUDE=""
+    AC_SUBST(SYSTEMDLIBS)
+    AC_SUBST(SYSTEMDINCLUDE)
+  else
+    AC_MSG_WARN([Skipping systemd support])
+  fi
+  LIBS="$_SAVEDLIBS"
+])
+
+
 dnl Check for headers used by check_ide_smart
 case $host in
   *linux*)
@@ -378,12 +405,48 @@ if test "$ac_cv_header_wtsapi32_h" = "yes"; then
   AC_SUBST(WTSAPI32LIBS)
 fi
 
+_can_enable_check_curl=no
+dnl Check for cURL library
+LIBCURL_CHECK_CONFIG(yes, 7.15.2, [
+    _can_enable_check_curl=yes
+    LIBCURLINCLUDE="$LIBCURL_CPPFLAGS"
+    LIBCURLLIBS="$LIBCURL"
+    LIBCURLCFLAGS="$LIBCURL_CPPFLAGS"
+    AC_SUBST(LIBCURLINCLUDE)
+    AC_SUBST(LIBCURLLIBS)
+    AC_SUBST(LIBCURLCFLAGS)
+  ], [
+    _can_enable_check_curl=no
+    AC_MSG_WARN([Skipping curl plugin])
+    AC_MSG_WARN([install libcurl libs to compile this plugin (see REQUIREMENTS).])
+])
+
+dnl Check for uriparser library
+URIPARSER_CHECK(yes, 0.7.5, [
+    URIPARSERINCLUDE="$URIPARSER_CPPFLAGS"
+    URIPARSERLIBS="$URIPARSER"
+    URIPARSERCFLAGS="$URIPARSER_CPPFLAGS"
+    AC_SUBST(URIPARSERINCLUDE)
+    AC_SUBST(URIPARSERLIBS)
+    AC_SUBST(URIPARSERCFLAGS)
+  ], [
+    _can_enable_check_curl=no
+    AC_MSG_WARN([Skipping curl plugin])
+    AC_MSG_WARN([install the uriparser library to compile this plugin (see REQUIREMENTS).])
+])
+
+dnl prerequisites met, enable the plugin
+if test x$_can_enable_check_curl = xyes; then
+  EXTRAS="$EXTRAS check_curl\$(EXEEXT)"
+fi
+AC_CONFIG_FILES([plugins/picohttpparser/Makefile])
+
 dnl Fallback to who(1) if the system doesn't provide an utmpx(5) interface
 if test "$ac_cv_header_utmpx_h" = "no" -a "$ac_cv_header_wtsapi32_h" = "no"
 then
         AC_PATH_PROG(PATH_TO_WHO,who)
 
-        if [$PATH_TO_WHO -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null]
+        if [$PATH_TO_WHO -q 2>/dev/null | grep -E -i "^# users=[0-9]+$" >/dev/null]
         then
                 ac_cv_path_to_who="$PATH_TO_WHO -q"
         else
@@ -493,15 +556,15 @@ if ! test x"$with_openssl" = x"no"; then
         dnl Check for crypto lib
         _SAVEDLIBS="$LIBS"
         LIBS="-L${with_openssl}/lib"
-        AC_CHECK_LIB(crypto,CRYPTO_lock)
-        if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
+        AC_CHECK_LIB(crypto,CRYPTO_new_ex_data)
+        if test "$ac_cv_lib_crypto_CRYPTO_new_ex_data" = "yes"; then
                 dnl Check for SSL lib
                 AC_CHECK_LIB(ssl,main, SSLLIBS="-lssl -lcrypto",,-lcrypto)
         fi
         LIBS="$_SAVEDLIBS"
 
         dnl test headers and libs to decide whether check_http should use SSL
-        if test "$ac_cv_lib_crypto_CRYPTO_lock" = "yes"; then
+        if test "$ac_cv_lib_crypto_CRYPTO_new_ex_data" = "yes"; then
                 if test "$ac_cv_lib_ssl_main" = "yes"; then
                         if test "$FOUNDINCLUDE" = "yes"; then
                                 FOUNDOPENSSL="yes"
@@ -558,7 +621,6 @@ AC_C_CONST
 AC_STRUCT_TM
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-AC_TYPE_SIGNAL
 
 AC_CACHE_CHECK([for va_copy],ac_cv_HAVE_VA_COPY,[
 AC_TRY_LINK([#include <stdarg.h>
@@ -732,7 +794,7 @@ 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
 dnl elif test "$ac_cv_uname_s" = "SunOS" && /usr/ucb/ps -alxwwn 2>/dev/null | \
-dnl     egrep -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null
+dnl     grep -E -i ["^ *F +UID +PID +PPID +%C +PRI +NI +SZ +RSS +WCHAN +S +TT +TIME +COMMAND"] > /dev/null
 dnl then
 dnl     ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procpcpu,&procvsz,&procrss,procstat,&pos]"
 dnl     ac_cv_ps_command="/usr/ucb/ps -alxwwn"
@@ -740,10 +802,20 @@ dnl 	ac_cv_ps_format=["%*s %d %d %d %d %*d %*d %d %d%*[ 0123456789abcdef]%[OSRZT
 dnl     ac_cv_ps_cols=8
 dnl     AC_MSG_RESULT([$ac_cv_ps_command])
 
+dnl This one is the exact same test as the next one but includes etime
+elif ps axwo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
+        grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +ELAPSED +COMMAND"] > /dev/null
+then
+        ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
+        ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu etime comm args'"
+        ac_cv_ps_format="%s %d %d %d %d %d %f %s %s %n"
+        ac_cv_ps_cols=10
+        AC_MSG_RESULT([$ac_cv_ps_command])
+
 dnl Some gnu/linux systems (debian for one) don't like -axwo and need axwo.
 dnl so test for this first...
 elif ps axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-        egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
+        grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS axwo 'stat uid pid ppid vsz rss pcpu comm args'"
@@ -755,7 +827,7 @@ dnl For OpenBSD 3.2 & 3.3. Must come before ps -weo
 dnl Should also work for FreeBSD 5.2.1 and 5.3
 dnl  STAT UCOMM              VSZ   RSS USER      PPID COMMAND
 elif ps -axwo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-        egrep -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
+        grep -E -i ["^ *STAT +[UCOMAND]+ +VSZ +RSS +USER +UID +PID +PPID +COMMAND"] > /dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu comm args'"
@@ -767,7 +839,7 @@ 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 pid ppid vsz rss pcpu ucomm command' 2>/dev/null | \
-        egrep -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
+        grep -E -i ["^ *STAT +UID +PID +PPID +VSZ +RSS +%CPU +UCOMM +COMMAND"] > /dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -axwo 'stat uid pid ppid vsz rss pcpu ucomm command'"
@@ -777,7 +849,7 @@ then
 
 dnl  STAT UCOMM              VSZ   RSS USER       UID  PPID COMMAND
 elif ps -weo 'stat comm vsz rss user uid pid ppid etime args' 2>/dev/null | \
-        egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[ID]+ +P[PID]+ +[ELAPSD]+ +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procetime,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -weo 'stat uid pid ppid vsz rss pcpu etime comm args'"
@@ -787,7 +859,7 @@ then
 
 dnl FreeBSD
 elif ps waxco 'state command vsz rss uid user pid ppid' 2>/dev/null | \
-        egrep -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
+        grep -E -i ["^STAT +COMMAND +VSZ +RSS +UID +USER +PID +PPID"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS waxco 'state uid pid ppid vsz rss pcpu command command'"
@@ -797,7 +869,7 @@ then
 
 dnl BSD-like mode in RH 6.1
 elif ps waxno 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
-        egrep -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^S +COMMAND +VSZ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS waxno 'state uid pid ppid vsz rss pcpu comm args'"
@@ -809,7 +881,7 @@ dnl SunOS 4.1.3:
 dnl  F  UID  PID  PPID  CP  PRI  NI  SZ  RSS  WCHAN  STAT  TT  TIME  COMMAND
 dnl Need the head -1 otherwise test will work because arguments are found
 elif ps -laxnwww 2>/dev/null | head -1 | \
-        egrep -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
+        grep -E -i ["^ *F(LAGS)? +UID +PID +PPID +CP +PRI +NI +(SZ)|(VSZ)|(SIZE) +RSS +WCHAN +STAT? +TTY? +TIME +COMMAND"] >/dev/null
 then
         ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS -laxnwww"
@@ -822,7 +894,7 @@ dnl  FLAGS   UID   PID  PPID PRI  NI   SIZE   RSS WCHAN       STA TTY TIME COMMA
 dnl    100     0     1     0   0   0    776    76  c0131c8c   S  ffff  0:11 init [2]
 dnl
 elif ps laxnwww 2>/dev/null | \
-        egrep -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
+        grep -E -i ["^ *F(LAGS)? +UID +PID +PPID +PRI +NI +(VSZ)|(SIZE) +RSS +WCHAN +STAT? TTY +TIME +COMMAND"] >/dev/null
 then
         ac_cv_ps_varlist="[&procuid,&procpid,&procppid,procstat,&procvsz,&procrss,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS laxnwww"
@@ -832,7 +904,7 @@ then
 
 dnl OpenBSD (needs to come early because -exo appears to work, but does not give all procs)
 elif ps -axo 'stat comm vsz rss user uid pid ppid args' 2>/dev/null | \
-        egrep -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^ *S[TAUES]* +[UCOMDNA]+ +[VSIZE]+ +R[S]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -axo 'stat uid pid ppid vsz rss pcpu comm args'"
@@ -845,7 +917,7 @@ dnl Has /usr/bin/ps and /sbin/ps - force sbin version
 dnl Can't use vsize and rssize because comes back with text (eg, 1.5M instead
 dnl of 1500). Will need big changes to check_procs to support
 elif /sbin/ps -eo 'stat uid pid ppid pcpu etime comm args' 2>/dev/null | \
-        egrep -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
+        grep -E -i ["^ *S +[UID]+ +[PID]+ +[PID]+ +[%CPU]+ +[ELAPSD]+ +[COMMAND]+ +[COMMAND]+"] > /dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procpcpu,procetime,procprog,&pos]"
         ac_cv_ps_command="/sbin/ps -eo 'stat uid pid ppid pcpu etime comm args'"
@@ -854,7 +926,7 @@ then
         AC_MSG_RESULT([$ac_cv_ps_command])
 
 elif ps -eo 's comm vsz rss user uid pid ppid args' 2>/dev/null | \
-        egrep -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^S[TAUES]* +C[OMDNA]+ +[VSIZE]+ +U[SER]+ +U[ID]+ +P[PID]+ +P[PID]+ +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -eo 's uid pid ppid vsz rss pcpu comm args'"
@@ -864,7 +936,7 @@ then
 
 dnl AIX 4.3.3 and 5.1 do not have an rss field
 elif ps -eo 'stat uid pid ppid vsz pcpu comm args' 2>/dev/null | \
-        egrep -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
+        grep -E -i ["^ *S[TAUES]* +UID +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -eo 'stat uid pid ppid vsz pcpu comm args'"
@@ -874,18 +946,18 @@ then
 
 dnl Solaris 2.6
 elif ps -Ao 's comm vsz rss uid user pid ppid args' 2>/dev/null | \
-        egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -Ao 's uid pid ppid vsz rss pcpu comm args'"
-        # There must be no space between the %s and %n due to a wierd problem in sscanf where
+        # There must be no space between the %s and %n due to a weird problem in sscanf where
         # it will return %n as longer than the line length
         ac_cv_ps_format="%s %d %d %d %d %d %f %s%n"
         ac_cv_ps_cols=9
         AC_MSG_RESULT([$ac_cv_ps_command])
 
 elif ps -Ao 'status comm vsz rss uid user pid ppid args' 2>/dev/null | \
-        egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -Ao 'status uid pid ppid vsz rss pcpu comm args'"
@@ -894,7 +966,7 @@ then
         AC_MSG_RESULT([$ac_cv_ps_command])
 
 elif ps -Ao 'state comm vsz rss uid user pid ppid args' 2>/dev/null | \
-        egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -Ao 'state uid pid ppid vsz rss pcpu comm args'"
@@ -904,7 +976,7 @@ then
 
 dnl wonder who takes state instead of stat
 elif ps -ao 'state command vsz rss user pid ppid args' 2>/dev/null | \
-        egrep -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^S[TAUES]* +C[OMDNA]+ +V[SIZE]+ +RSS +UID +USER +PID +PPID +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&procpcpu,procprog,&pos]"
         ac_cv_ps_command="$PATH_TO_PS -ao 'state uid pid ppid vsz rss pcpu command args'"
@@ -914,7 +986,7 @@ then
 
 dnl IRIX 53
 elif ps -el 2>/dev/null | \
-        egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procrss,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS -el (IRIX 53)"
@@ -924,7 +996,7 @@ then
 
 dnl IRIX 63
 elif ps -el 2>/dev/null | \
-        egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +P +ADDR +SZ +RSS +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS -el (IRIX 63)"
@@ -937,7 +1009,7 @@ dnl S        UID       RUID USER     RUSER      PID  PPID     VSZ  %CPU COMMAND
 dnl S          0        400 root     oracle    2805     1   12904  0.00 ora_dism_SEA1X  ora_dism_SEA1X
 dnl S        400        400 oracle   oracle   19261     1  126488  0.00 tnslsnr         /u01/app/oracle/product/db/11.2.0.3/bin/tnslsnr LISTENER -inherit
 elif env UNIX95=1 ps -eo 'state uid ruid user ruser pid ppid vsz pcpu comm args' 2>/dev/null | head -n 1 | \
-    egrep -i ["^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
+    grep -E -i ["^ *S +UID +RUID +USER +RUSER +PID +PPID +VSZ +%CPU +COMMAND +COMMAND"] >/dev/null
 then
     ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&procvsz,&procpcpu,procprog,&pos]"
     ac_cv_ps_command="$PATH_TO_ENV UNIX95=1 $PATH_TO_PS -eo 'state uid pid ppid vsz pcpu comm args'"
@@ -949,7 +1021,7 @@ dnl AIX 4.1:
 dnl     F S      UID   PID  PPID   C PRI NI ADDR  SZ  RSS   WCHAN    TTY  TIME CMD
 dnl    303 A        0     0     0 120  16 -- 1c07  20   24              -  0:45 swapper
 elif ps -el 2>/dev/null | \
-        egrep -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
+        grep -E -i ["^ *F +S +UID +PID +PPID +C +PRI +NI +ADDR +SZ +WCHAN +TTY +TIME +[RGSCOMDNA]+"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS -el (AIX 4.1 and HP-UX)"
@@ -959,7 +1031,7 @@ then
 
 dnl AIX?
 elif ps glaxen 2>/dev/null | \
-        egrep -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
+        grep -E -i ["^ *F +UID +PID +PPID +PRI +NI +VSZ +RSS +WCHAN +STAT +TTY +TIME +COMMAND"] >/dev/null
 then
         ac_cv_ps_varlist="[&procuid,&procpid,&procppid,&procvsz,&procrss,procstat,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS glaxen"
@@ -973,7 +1045,7 @@ dnl Some truncation will happen in UCOMM column
 dnl STAT      VSZ    RSS   UID  PPID %CPU UCOMM            COMMAND
 dnl Ss      52756  22496   501     1   6.9 Window Manager   /System/Library/CoreServices/WindowServer -daemon
 elif ps wwaxo 'state vsz rss uid pid ppid pcpu ucomm command' 2>/dev/null | \
-        egrep -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
+        grep -E -i ["^STAT +VSZ +RSS +UID +PPID +%CPU +UCOMM +COMMAND"] >/dev/null
 then
         ac_cv_ps_command="$PATH_TO_PS wwaxo 'state vsz rss uid pid ppid pcpu ucomm command'"
         ac_cv_ps_varlist="[procstat,&procvsz,&procrss,&procuid,&procpid,&procppid,&procpcpu,procprog,&pos]"
@@ -983,7 +1055,7 @@ then
 
 dnl UnixWare
 elif ps -Al 2>/dev/null | \
-        egrep -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
+        grep -E -i ["^ *F +S +UID +PID +PPID +CLS +PRI +NI +C +ADDR +SZ +WCHAN +TTY +TIME +COMD"] >/dev/null
 then
         ac_cv_ps_varlist="[procstat,&procuid,&procpid,&procppid,&pos,procprog]"
         ac_cv_ps_command="$PATH_TO_PS -Al"
@@ -1009,6 +1081,10 @@ if test -n "$ac_cv_ps_varlist" ; then
                 AC_DEFINE(PS_USES_PROCETIME,"yes",
                           [Whether the ps utility uses the "procetime" field])
         fi
+        if echo "$ac_cv_ps_varlist" | grep "procpcpu" >/dev/null; then
+                AC_DEFINE(PS_USES_PROCPCPU,"yes",
+                          [Whether the ps utility uses the "procpcpu" field])
+        fi
 fi
 
 AC_PATH_PROG(PATH_TO_PING,ping)
@@ -1047,14 +1123,22 @@ then
 
 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
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         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 -4 -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
+        grep -E -i "^round-trip|^rtt" >/dev/null
+then
+        # check if -4 is supported - issue #1550
+        with_ping_command="$PATH_TO_PING -4 -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])
 elif $PATH_TO_PING -n -U -w 10 -c 1 127.0.0.1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -U -w %d -c %d %s"
         ac_cv_ping_packets_first=yes
@@ -1062,52 +1146,52 @@ then
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n -U -c 1 127.0.0.1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         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 -c 1 127.0.0.1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -c %d %s"
         ac_cv_ping_packets_first=yes
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n 127.0.0.1 -c 1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n %s -c %d"
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING 127.0.0.1 -n 1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING %s -n %d"
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n -s 127.0.0.1 56 1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -s %s 56 %d"
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n -h 127.0.0.1 -s 56 -c 1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -h %s -s 56 -c %d"
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n -s 56 -c 1 127.0.0.1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -s 56 -c %d %s"
         ac_cv_ping_packets_first=yes
         AC_MSG_RESULT([$with_ping_command])
 
 elif $PATH_TO_PING -n -c 1 127.0.0.1 2>/dev/null | \
-        egrep -i "^round-trip|^rtt" >/dev/null
+        grep -E -i "^round-trip|^rtt" >/dev/null
 then
         with_ping_command="$PATH_TO_PING -n -c %d %s"
         ac_cv_ping_packets_first=yes
@@ -1163,14 +1247,14 @@ elif [[ "z$ac_cv_uname_o" = "zCygwin" -a "x$PATH_TO_PING" != "x" ]]; then
 elif test "x$PATH_TO_PING6" != "x"; then
         if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
                 $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
                 ac_cv_ping6_packets_first=yes
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n -U -w 10 -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -U -w %d -c %d %s"
                 ac_cv_ping6_packets_first=yes
@@ -1178,52 +1262,52 @@ elif test "x$PATH_TO_PING6" != "x"; then
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n -U -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -U -c %d %s"
                 ac_cv_ping6_packets_first=yes
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -c %d %s"
                 ac_cv_ping6_packets_first=yes
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n ::1 -c 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n %s -c %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 ::1 -n 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 %s -n %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n -s ::1 56 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -s %s 56 %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -h %s -s 56 -c %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING6 -n -s 56 -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -s 56 -c %d %s"
                 ac_cv_ping6_packets_first=yes
                 AC_MSG_RESULT([$with_ping_command])
 
         elif $PATH_TO_PING6 -n -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING6 -n -c %d %s"
                 ac_cv_ping6_packets_first=yes
@@ -1234,59 +1318,59 @@ elif test "x$PATH_TO_PING6" != "x"; then
 elif test "x$PATH_TO_PING" != "x"; then
         if [[ "z$ac_cv_uname_s" = "zUnixWare" ]] && \
                 $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 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
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 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 -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
                 ac_cv_ping6_packets_first=yes
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING -A inet6 -n ::1 -c 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 -n %s -c %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING -A inet6 ::1 -n 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 %s -n %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING -A inet6 -n -s ::1 56 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 -n -s %s 56 %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING -A inet6 -n -h ::1 -s 56 -c 1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 -n -h %s -s 56 -c %d"
                 AC_MSG_RESULT([$with_ping6_command])
 
         elif $PATH_TO_PING -A inet6 -n -s 56 -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 -n -s 56 -c %d %s"
                 ac_cv_ping6_packets_first=yes
                 AC_MSG_RESULT([$with_ping_command])
 
         elif $PATH_TO_PING -A inet6 -n -c 1 ::1 2>/dev/null | \
-                egrep -i "^round-trip|^rtt" >/dev/null
+                grep -E -i "^round-trip|^rtt" >/dev/null
         then
                 with_ping6_command="$PATH_TO_PING -A inet6 -n -c %d %s"
                 ac_cv_ping6_packets_first=yes
@@ -1486,7 +1570,7 @@ if test -n "$PATH_TO_SUDO"
 then
         AC_DEFINE_UNQUOTED(PATH_TO_SUDO,"$PATH_TO_SUDO",[path to sudo])
 else
-        AC_MSG_WARN([Could not find sudo or eqivalent])
+        AC_MSG_WARN([Could not find sudo or equivalent])
 fi
 
 AC_PATH_PROG(PATH_TO_MAILQ,mailq)
@@ -1497,7 +1581,7 @@ if test -n "$PATH_TO_MAILQ"
 then
         AC_DEFINE_UNQUOTED(PATH_TO_MAILQ,"$PATH_TO_MAILQ",[path to mailq])
 else
-        AC_MSG_WARN([Could not find mailq or eqivalent])
+        AC_MSG_WARN([Could not find mailq or equivalent])
 fi
 
 AC_PATH_PROG(PATH_TO_QMAIL_QSTAT,qmail-qstat)
@@ -1508,7 +1592,7 @@ if test -n "$PATH_TO_QMAIL_QSTAT"
 then
         AC_DEFINE_UNQUOTED(PATH_TO_QMAIL_QSTAT,"$PATH_TO_QMAIL_QSTAT",[path to qmail-qstat])
 else
-        AC_MSG_WARN([Could not find qmail-qstat or eqivalent])
+        AC_MSG_WARN([Could not find qmail-qstat or equivalent])
 fi
 
 dnl SWAP info required is amount allocated/available and amount free
@@ -1523,16 +1607,16 @@ then
         ac_cv_have_swap=yes
         ac_cv_swap_command="$PATH_TO_SWAP -l"
         if [$PATH_TO_SWAP -l 2>/dev/null | \
-                egrep -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \
+                grep -E -i "^lswap +path +pri +swaplo +blocks +free +maxswap" \
                 >/dev/null]
         then
-                ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %f %f"]
+                ac_cv_swap_format=[" %*d %*s %*d,%*d %*d %*d %lu %lu"]
                 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]
+        elif [$PATH_TO_SWAP -l 2>/dev/null | grep -E -i "^path +dev +swaplo +blocks +free" >/dev/null]
         then
-                ac_cv_swap_format=["%*s %*[0-9,-] %*d %f %f"]
+                ac_cv_swap_format=["%*s %*[0-9,-] %*d %lu %lu"]
                 ac_cv_swap_conv=2048
                 AC_MSG_RESULT([using Unixware format swap])
         else
@@ -1549,23 +1633,23 @@ AC_PATH_PROG(PATH_TO_SWAPINFO,swapinfo)
 if (test -n "$PATH_TO_SWAPINFO")
 then
 AC_MSG_CHECKING([for $PATH_TO_SWAPINFO format])
-if [$PATH_TO_SWAPINFO -k 2>&1 | egrep -i "^Device" >/dev/null]
+if [$PATH_TO_SWAPINFO -k 2>&1 | grep -E -i "^Device" >/dev/null]
 then
         ac_cv_have_swap=yes
         ac_cv_swap_command="$PATH_TO_SWAPINFO -k"
 
-        if [$PATH_TO_SWAPINFO -k 2>/dev/null | egrep -i "^Device +1K-blocks +Used +Avail" >/dev/null]
+        if [$PATH_TO_SWAPINFO -k 2>/dev/null | grep -E -i "^Device +1K-blocks +Used +Avail" >/dev/null]
         then
-                ac_cv_swap_format=["%*s %f %*d %f"]
+                ac_cv_swap_format=["%*s %lu %*d %lu"]
                 ac_cv_swap_conv=1024
                 AC_MSG_RESULT([using FreeBSD format swapinfo])
         fi
 
-elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
+elif [$PATH_TO_SWAPINFO -dfM 2>/dev/null | grep -E -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
 then
         ac_cv_have_swap=yes
         ac_cv_swap_command="$PATH_TO_SWAPINFO -dfM"
-        ac_cv_swap_format=["%*s %f %*d %f"]
+        ac_cv_swap_format=["%*s %lu %*d %lu"]
         ac_cv_swap_conv=1024
         AC_MSG_RESULT([using HP-UX format swapinfo])
 fi
@@ -1576,11 +1660,11 @@ AC_PATH_PROG(PATH_TO_LSPS,lsps)
 if (test -n "$PATH_TO_LSPS")
 then
 AC_MSG_CHECKING([for $PATH_TO_LSPS format])
-if [$PATH_TO_LSPS -a 2>/dev/null | egrep -i "^Page Space" > /dev/null]
+if [$PATH_TO_LSPS -a 2>/dev/null | grep -E -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 %f%*s %f %*s"]
+        ac_cv_swap_format=["%*s %*s %*s %lu%*s %lu %*s"]
         ac_cv_swap_conv=1
         AC_MSG_RESULT([using AIX lsps])
 fi
@@ -1766,7 +1850,7 @@ AM_GNU_GETTEXT([external], [need-ngettext])
 AM_GNU_GETTEXT_VERSION(0.15)
 
 dnl Check for Redhat spopen problem
-dnl Wierd problem where ECHILD is returned from a wait call in error
+dnl Weird problem where ECHILD is returned from a wait call in error
 dnl Only appears to affect nslookup and dig calls. Only affects redhat around
 dnl 2.6.9-11 (okay in 2.6.9-5). Redhat investigating root cause
 dnl We patch plugins/popen.c
@@ -1778,7 +1862,7 @@ AC_ARG_ENABLE(redhat-pthread-workaround,
         [ac_cv_enable_redhat_pthread_workaround=$enableval],
         [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
+        if echo $ac_cv_uname_r | grep -E "\.EL(smp)?$" >/dev/null 2>&1 ; then
                 AC_MSG_NOTICE([See https://www.monitoring-plugins.org/doc/faq/configure-hangs.html 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
@@ -1875,4 +1959,5 @@ ACX_FEATURE([enable],[perl-modules])
 ACX_FEATURE([with],[cgiurl])
 ACX_FEATURE([with],[trusted-path])
 ACX_FEATURE([enable],[libtap])
-
+ACX_FEATURE([with],[libcurl])
+ACX_FEATURE([with],[uriparser])