[Nagiosplug-checkins] CVS: nagiosplug configure.in,1.22,1.23

[Karl DeBisschop]

Update of /cvsroot/nagiosplug/nagiosplug
In directory usw-pr-cvs1:/tmp/cvs-serv1633

Modified Files:
	configure.in 
Log Message:
add HPUX swap, try to cleanup getopt processing

Index: configure.in
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** configure.in	8 Nov 2002 07:20:05 -0000	1.22
--- configure.in	9 Nov 2002 03:43:12 -0000	1.23
***************
*** 359,370 ****
                  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_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_MSG_RESULT(no)
!                 import_sources=getopt])
! 
! AC_CHECK_FUNCS(getopt_long_only,,LIBS="$LIBS -lgetopt" DEPLIBS="$DEPLIBS libgetopt.a")
  
  AC_TRY_COMPILE([#include <sys/time.h>],
--- 359,370 ----
                  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 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 is found])
                  AC_MSG_RESULT(no)
!                 import_sources=getopt
!                 LIBS="$LIBS -lgetopt"
!                 DEPLIBS="$DEPLIBS libgetopt.a"])
  
  AC_TRY_COMPILE([#include <sys/time.h>],
***************
*** 860,863 ****
--- 860,870 ----
  	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