add HPUX swap, try to cleanup getopt processing

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@179 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 12 insertions, 5 deletions

diff --git a/configure.in b/configure.in
index bdd4013..4f2a4ac 100644
--- a/configure.in
+++ b/configure.in
@@ -358,14 +358,14 @@ AC_TRY_COMPILE([#include <getopt.h>
                 static struct option *long_options;
                 getopt_long(0,NULL,"+h",long_options,&option_index);],
                [AC_DEFINE(HAVE_GETOPT_H,1,[Define if getopt headers are found])
-                AC_DEFINE(HAVE_GETOPT_LONG,1,[Define if getopt_long_only() is found])
+                AC_DEFINE(HAVE_GETOPT_LONG,1,[Define if getopt_long is found])
                 AC_MSG_RESULT(yes)],
                [AC_DEFINE(HAVE_GETOPT_H,1,[Define if getopt headers are found])
-                AC_DEFINE(HAVE_GETOPT_LONG,1,[Define if getopt_long_only() is found])
+                AC_DEFINE(HAVE_GETOPT_LONG,1,[Define if getopt_long is found])
                 AC_MSG_RESULT(no)
-                import_sources=getopt])
-
-AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")
+                import_sources=getopt
+                LIBS="$LIBS -lgetopt"
+                DEPLIBS="$DEPLIBS libgetopt.a"])
 
 AC_TRY_COMPILE([#include <sys/time.h>],
                [struct timeval *foo;],
@@ -859,6 +859,13 @@ then
                 echo "      using FreeBSD format"
         fi
         EXTRAS="$EXTRAS check_swap"
+elif [swapinfo -d 2>/dev/null | egrep -i "^TYPE +AVAIL +USED +FREE" >/dev/null]
+then
+        AC_DEFINE(HAVE_SWAP,1,[Define if swap/swapinfo command is found])
+        AC_PATH_PROG(PATH_TO_SWAP,swapinfo)
+        AC_DEFINE_UNQUOTED(SWAP_COMMAND,"/bin/sh '$PATH_TO_SWAP -d | /bin/tail -l +2'",[Path to swap/swapinfo binary, with any args])
+        AC_DEFINE_UNQUOTED(SWAP_FORMAT,["%*s %d %*d %d"],[Format string for parsing swap output ])
+        echo "        using HP-UX format HP-UX"
 fi
 
 AC_PATH_PROG(PATH_TO_DIG,dig)