--- nagios-plugins-1.4.3/configure.in.orig	2006-04-19 14:42:33 +1100

+++ nagios-plugins-1.4.3/configure.in	2006-07-02 15:58:15 +1100

@@ -635,7 +635,7 @@

 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,

@@ -691,8 +691,7 @@

 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'"

@@ -947,7 +946,7 @@

 	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,

@@ -1227,20 +1226,12 @@

 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

@@ -1251,24 +1242,24 @@

 	AC_DEFINE_UNQUOTED(NSLOOKUP_COMMAND,"$ac_cv_nslookup_command", [path and args for nslookup])

 fi

-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)

 AC_DEFINE_UNQUOTED(PATH_TO_RPCINFO,"$PATH_TO_RPCINFO",[path to rpcinfo binary])

-AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate)

+AC_PATH_PROG(PATH_TO_NTPDATE,ntpdate,[/usr/sbin/ntpdate])

 AC_ARG_WITH(ntpdate_command,

             ACX_HELP_STRING([--with-ntpdate-command=PATH],

                             [sets path to ntpdate]), PATH_TO_NTPDATE=$withval)

-AC_PATH_PROGS(PATH_TO_NTPDC,ntpdc xntpdc)

-AC_PATH_PROGS(PATH_TO_NTPQ,ntpq)

+AC_PATH_PROGS(PATH_TO_NTPDC,ntpdc xntpdc,[/usr/sbin/ntpdc])

+AC_PATH_PROGS(PATH_TO_NTPQ,ntpq,[/usr/sbin/ntpq])

 if (test -n "$PATH_TO_NTPDATE" || test -n "$PATH_TO_NTPQ")

 then

 	AC_DEFINE_UNQUOTED(PATH_TO_NTPQ,"$PATH_TO_NTPQ",[path to ntpq binary])

@@ -1285,7 +1276,7 @@

 	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]), 

@@ -1298,19 +1289,13 @@

 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]),

@@ -1323,7 +1308,7 @@

 	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]),

@@ -1333,26 +1318,16 @@

 	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"

@@ -1366,7 +1341,7 @@

 		[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)

@@ -1378,7 +1353,7 @@

 	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)

@@ -1391,7 +1366,7 @@

 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)

@@ -1612,7 +1587,7 @@

 	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)