--- nagios-plugins-1.4.12/configure.in.p2 2008-05-28 09:01:05 +1100 +++ nagios-plugins-1.4.12/configure.in 2008-08-12 14:00:19 +1100 @@ -249,7 +249,7 @@ _SAVEDLIBS="$LIBS" AC_CHECK_LIB(ldap,main,,,-llber) if test "$ac_cv_lib_ldap_main" = "yes"; then LDAPLIBS="-lldap -llber"\ - LDAPINCLUDE="-I/usr/include/ldap" + LDAPINCLUDE="-I/usr/include" AC_SUBST(LDAPLIBS) AC_SUBST(LDAPINCLUDE) AC_CHECK_FUNCS(ldap_set_option) @@ -507,7 +507,7 @@ AC_DEFINE_UNQUOTED(SOCKET_SIZE_TYPE, $ac dnl #### Process table test -AC_PATH_PROG(PATH_TO_PS,ps) +AC_PATH_PROG(PATH_TO_PS,ps,[/bin/ps]) AC_MSG_CHECKING(for ps syntax) AC_ARG_WITH(ps_command, @@ -580,8 +580,7 @@ dnl 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 +elif test -n "$PATH_TO_PS" 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'" @@ -836,7 +835,7 @@ if test -n "$ac_cv_ps_varlist" ; then fi fi -AC_PATH_PROG(PATH_TO_PING,ping) +AC_PATH_PROG(PATH_TO_PING,ping,[/bin/ping]) AC_PATH_PROG(PATH_TO_PING6,ping6) AC_ARG_WITH(ping_command, @@ -1116,20 +1115,12 @@ AC_ARG_WITH(nslookup_command, if test -n "$ac_cv_nslookup_command"; then AC_MSG_NOTICE([Using specific nslookup at $ac_cv_nslookup_command]) else - AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup) + AC_PATH_PROG(PATH_TO_NSLOOKUP,nslookup,[/usr/bin/nslookup]) if test -n "$PATH_TO_NSLOOKUP" then AC_MSG_CHECKING(for nslookup syntax) - if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep ["Invalid option: sil"] >/dev/null - then - ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" - AC_MSG_RESULT([$ac_cv_nslookup_command]) - - else - ac_cv_nslookup_command="$PATH_TO_NSLOOKUP -sil" - AC_MSG_RESULT([$ac_cv_nslookup_command]) - - fi + ac_cv_nslookup_command="$PATH_TO_NSLOOKUP -sil" + AC_MSG_RESULT([$ac_cv_nslookup_command]) else AC_MSG_WARN([nslookup command not found]) fi @@ -1148,13 +1139,13 @@ AC_TRY_COMPILE([#include ], AC_MSG_RESULT([cannot calculate]) ) -AC_PATH_PROG(PATH_TO_UPTIME,uptime) +AC_PATH_PROG(PATH_TO_UPTIME,uptime,[/usr/bin/uptime]) AC_ARG_WITH(uptime_command, ACX_HELP_STRING([--with-uptime-command=PATH], [sets path to uptime]), PATH_TO_UPTIME=$withval) AC_DEFINE_UNQUOTED(PATH_TO_UPTIME,"$PATH_TO_UPTIME",[path to uptime binary]) -AC_PATH_PROG(PATH_TO_RPCINFO,rpcinfo) +AC_PATH_PROG(PATH_TO_RPCINFO,rpcinfo,[/usr/sbin/rpcinfo]) AC_ARG_WITH(rpcinfo_command, ACX_HELP_STRING([--with-rpcinfo-command=PATH], [sets path to rpcinfo]), PATH_TO_RPCINFO=$withval) @@ -1168,7 +1159,7 @@ else AC_MSG_WARN([Get lmstat from Globetrotter Software to monitor flexlm licenses]) fi -AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient) +AC_PATH_PROG(PATH_TO_SMBCLIENT,smbclient,[/usr/bin/smbclient]) AC_ARG_WITH(smbclient_command, ACX_HELP_STRING([--with-smbclient-command=PATH], [sets path to smbclient]), @@ -1181,19 +1172,13 @@ else fi -AC_PATH_PROG(PATH_TO_WHO,who) - -if [$PATH_TO_WHO -q 2>/dev/null | egrep -i "^# users=[0-9]+$" >/dev/null] -then - ac_cv_path_to_who="$PATH_TO_WHO -q" -else - ac_cv_path_to_who="$PATH_TO_WHO" -fi +AC_PATH_PROG(PATH_TO_WHO,who,[/usr/bin/who]) +ac_cv_path_to_who="$PATH_TO_WHO -q" AC_DEFINE_UNQUOTED(WHO_COMMAND,"$ac_cv_path_to_who", [path and arguments for invoking 'who']) -AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) +AC_PATH_PROG(PATH_TO_SNMPGET,snmpget,[/usr/bin/snmpget]) AC_ARG_WITH(snmpget_command, ACX_HELP_STRING([--with-snmpget-command=PATH], [Path to snmpget command]), @@ -1206,7 +1191,7 @@ else AC_MSG_WARN([Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins]) fi -AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext) +AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext,[/usr/bin/snmpgetnext]) AC_ARG_WITH(snmpgetnext_command, ACX_HELP_STRING([--with-snmpgetnext-command=PATH], [Path to snmpgetnext command]), @@ -1216,26 +1201,16 @@ then AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary]) fi -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) -then - AC_MSG_CHECKING(for Net::SNMP perl module) - AC_MSG_RESULT([found]) -else - AC_MSG_WARN([Tried $PERL - install Net::SNMP perl module if you want to use the perl snmp plugins]) -fi +AC_MSG_CHECKING(for Net::SNMP perl module) +AC_MSG_RESULT([found]) AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) -AC_PATH_PROG(PATH_TO_QSTAT,qstat) +AC_PATH_PROG(PATH_TO_QSTAT,qstat,[/usr/bin/qstat]) AC_ARG_WITH(qstat_command, ACX_HELP_STRING([--with-qstat-command=PATH], [Path to qstat command]), PATH_TO_QSTAT=$withval) -if test -x "$PATH_TO_QUAKESTAT" -then - ac_cv_path_to_qstat="$PATH_TO_QUAKESTAT" - EXTRAS="$EXTRAS check_game" - -elif test -n "$PATH_TO_QSTAT" +if test -n "$PATH_TO_QSTAT" then ac_cv_path_to_qstat="$PATH_TO_QSTAT" EXTRAS="$EXTRAS check_game" @@ -1249,7 +1224,7 @@ then [path to qstat/quakestat]) fi -AC_PATH_PROG(PATH_TO_FPING,fping) +AC_PATH_PROG(PATH_TO_FPING,fping,[/usr/sbin/fping]) AC_ARG_WITH(fping_command, ACX_HELP_STRING([--with-fping-command=PATH], [Path to fping command]), PATH_TO_FPING=$withval) @@ -1261,7 +1236,7 @@ else AC_MSG_WARN([Get fping from http://www.fping.com in order to make check_fping plugin]) fi -AC_PATH_PROG(PATH_TO_SSH,ssh) +AC_PATH_PROG(PATH_TO_SSH,ssh,[/usr/bin/ssh]) AC_ARG_WITH(ssh_command, ACX_HELP_STRING([--with-ssh-command=PATH], [sets path for ssh]), PATH_TO_SSH=$withval) @@ -1274,7 +1249,7 @@ else fi -AC_PATH_PROG(PATH_TO_MAILQ,mailq) +AC_PATH_PROG(PATH_TO_MAILQ,mailq,[/usr/bin/mailq]) AC_ARG_WITH(mailq_command, ACX_HELP_STRING([--with-mailq-command=PATH], [sets path to mailq]), PATH_TO_MAILQ=$withval) @@ -1495,7 +1470,7 @@ if test -n "$ac_cv_proc_meminfo"; then EXTRAS="$EXTRAS check_swap" fi -AC_PATH_PROG(PATH_TO_DIG,dig) +AC_PATH_PROG(PATH_TO_DIG,dig,[/usr/bin/dig]) AC_ARG_WITH(dig_command, ACX_HELP_STRING([--with-dig-command=PATH], [Path to dig command]), PATH_TO_DIG=$withval)