diff options
Diffstat (limited to 'net-mgmt/nagios-plugins/files/patch-ab')
| -rw-r--r-- | net-mgmt/nagios-plugins/files/patch-ab | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/net-mgmt/nagios-plugins/files/patch-ab b/net-mgmt/nagios-plugins/files/patch-ab index 4d27df5..126c8b0 100644 --- a/net-mgmt/nagios-plugins/files/patch-ab +++ b/net-mgmt/nagios-plugins/files/patch-ab @@ -1,5 +1,5 @@ ---- configure.in.orig Tue Mar 6 06:40:44 2001 -+++ configure.in Mon Apr 16 12:24:22 2001 +--- configure.in.orig Thu Apr 26 16:00:26 2001 ++++ configure.in Tue May 1 18:28:01 2001 @@ -7,7 +7,7 @@ dnl AM_INIT_AUTOMAKE(netsaint-plugins,$VERSION) AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h) @@ -9,7 +9,18 @@ dnl Figure out how to invoke "install" and what install options to use. -@@ -126,25 +126,37 @@ +@@ -99,8 +99,8 @@ + AC_CHECK_HEADERS(postgresql/libpq-fe.h) + AC_CHECK_HEADERS(libpq-fe.h) + if test "$ac_cv_header_pgsql_libpq_fe_h" = "yes"; then +- PGLIBS="-lpq -lcrypt" +- PGINCLUDE="-I/usr/include/pgsql" ++ PGLIBS="-L$PGSQL/lib -lpq -lcrypt" ++ PGINCLUDE="-I$PGSQL/include/pgsql" + elif test "$ac_cv_header_postgresql_libpq_fe_h" = "yes"; then + PGLIBS="-L$PGSQL/lib -lpq -lcrypt" + PGINCLUDE="-I/usr/include/postgresql" +@@ -128,25 +128,37 @@ LIBS="$_SAVEDLIBS" CPPFLAGS="$_SAVEDCPPFLAGS" @@ -53,7 +64,7 @@ AC_SUBST(LDAPLIBS) AC_SUBST(LDAPINCLUDE) EXTRAS="$EXTRAS check_ldap" -@@ -153,13 +165,14 @@ +@@ -155,13 +167,14 @@ AC_MSG_WARN([install LDAP libs to compile this plugin (see Requirements).]) fi LIBS="$_SAVEDLIBS" @@ -70,7 +81,7 @@ AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz" check_mysql_LDFLAGS="-L$MYSQLLIBDIR",,-L$MYSQLLIBDIR -lz) elif test -f /usr/lib/libmysqlclient.so; then AC_CHECK_LIB(mysqlclient,mysql_init,MYSQLLIBS="-lmysqlclient -lz",,-lz) -@@ -175,7 +188,8 @@ +@@ -177,7 +190,8 @@ AC_CHECK_LIB(mysqlclient,mysql_close,MYSQLLIBS="-lmysqlclient" check_mysql_LDFLAGS="-L/usr/lib/mysql",,-L/usr/lib/mysql) fi if test "$ac_cv_lib_mysqlclient_mysql_init" = "yes" -o "$ac_cv_lib_mysqlclient_mysql_close" = "yes"; then @@ -80,7 +91,7 @@ if test "$ac_cv_header_mysql_mysql_h" = "yes" -a "$ac_cv_header_mysql_errmsg_h" = "yes"; then EXTRAS="$EXTRAS check_mysql" AC_SUBST(MYSQLLIBS) -@@ -189,7 +203,7 @@ +@@ -191,7 +205,7 @@ AC_MSG_WARN([install mysql client libs to compile this plugin (see Requirements).]) fi LIBS="$_SAVEDLIBS" @@ -89,7 +100,7 @@ dnl Check for OpenSSL location AC_PATH_PROG(OPENSSL,openssl) -@@ -268,16 +282,16 @@ +@@ -270,16 +284,16 @@ dnl AC_SUBST(libgetopt_a_DEPENDENCIES) dnl AC_SUBST(libsnprintf_a_SOURCES) @@ -115,7 +126,7 @@ AC_CHECK_FUNC(vsnprintf,,LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a") -@@ -328,72 +342,72 @@ +@@ -330,72 +344,72 @@ AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS -eo 'rss comm'") AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") echo " ps syntax... $PATH_TO_PS -eo 's comm vsz rss user ppid args'" @@ -204,7 +215,7 @@ AC_DEFINE_UNQUOTED(PS_RAW_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'") EXTRAS="$EXTRAS check_netsaint" - AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxco 'state uid ppid command command'") -+ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command command'") ++ AC_DEFINE_UNQUOTED(PS_COMMAND,"$PATH_TO_PS waxo 'state uid ppid command'") AC_DEFINE_UNQUOTED(PS_FORMAT,"%s %d %d %s %n") - AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxco 'vsz command'") + AC_DEFINE_UNQUOTED(VSZ_COMMAND,"$PATH_TO_PS waxo 'vsz command'") @@ -217,7 +228,7 @@ dnl BSD-like mode in RH 6.1 elif [ps waxno 'state comm vsz rss uid user ppid args' 2>/dev/null | egrep -i "^S +COMMAND +VSZ +RSS +UID +USER +PPID +[RGSCOMDNA]+" >/dev/null] then -@@ -407,7 +421,7 @@ +@@ -409,7 +423,7 @@ AC_DEFINE_UNQUOTED(VSZ_FORMAT,"%d %s") AC_DEFINE_UNQUOTED(RSS_COMMAND,"$PATH_TO_PS waxno 'rss comm'") AC_DEFINE_UNQUOTED(RSS_FORMAT,"%d %s") @@ -226,7 +237,7 @@ 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] then -@@ -618,6 +632,8 @@ +@@ -620,6 +634,8 @@ AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO") fi @@ -235,7 +246,7 @@ AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) if test -f "$PATH_TO_SNMPGET" then -@@ -626,6 +642,7 @@ +@@ -628,6 +644,7 @@ else echo "** Get snmpget from http://ucd-snmp.ucdavis.edu to make check_hpjd and check_snmp plugins" fi @@ -243,7 +254,7 @@ AC_PATH_PROG(PATH_TO_SNMPGETNEXT,snmpgetnext) if test -f "$PATH_TO_SNMPGETNEXT" -@@ -633,6 +650,8 @@ +@@ -635,6 +652,8 @@ AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT") fi @@ -252,7 +263,7 @@ AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) AC_PATH_PROG(PATH_TO_QSTAT,qstat) if test -n "$PATH_TO_QUAKESTAT" -@@ -646,7 +665,10 @@ +@@ -648,7 +667,10 @@ else echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" fi @@ -263,7 +274,7 @@ AC_PATH_PROG(PATH_TO_FPING,fping) if test -n "$PATH_TO_FPING" then -@@ -654,6 +676,7 @@ +@@ -656,6 +678,7 @@ EXTRAS="$EXTRAS check_fping" else echo "** Get fping from http://www.stanford.edu/~schemers/docs/fping/fping.html in order to make check_fping plugin" |
