diff options
Diffstat (limited to 'net-mgmt/nagios-plugins/files/patch-configure.in')
| -rw-r--r-- | net-mgmt/nagios-plugins/files/patch-configure.in | 147 |
1 files changed, 0 insertions, 147 deletions
diff --git a/net-mgmt/nagios-plugins/files/patch-configure.in b/net-mgmt/nagios-plugins/files/patch-configure.in deleted file mode 100644 index 33cece3ebf56..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-configure.in +++ /dev/null @@ -1,147 +0,0 @@ ---- configure.in.orig Fri Nov 22 03:46:49 2002 -+++ configure.in Tue Nov 26 14:48:27 2002 -@@ -14,7 +14,7 @@ - AM_INIT_AUTOMAKE(nagios-plugins,${PACKAGE_VERSION}) - AM_CONFIG_HEADER(plugins/config.h plugins/common.h plugins/version.h plugins/netutils.h plugins/utils.h plugins/popen.h) - --AC_PREFIX_DEFAULT(/usr/local/nagios) -+dnl AC_PREFIX_DEFAULT(/usr/local/nagios) - - dnl Figure out how to invoke "install" and what install options to use. - -@@ -56,7 +56,6 @@ - AC_ARG_WITH(nagios_group,--with-nagios-group=<group> sets group name to run nagios,nagios_grp=$withval,nagios_grp=nagios) - AC_SUBST(nagios_usr) - AC_SUBST(nagios_grp) --INSTALL_OPTS="-o $nagios_usr -g $nagios_grp" - AC_SUBST(INSTALL_OPTS) - - AC_ARG_WITH(trusted_path,--with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin sets trusted path for executables called by scripts,trusted_path=$withval,trusted_path=/bin:/sbin:/usr/bin:/usr/sbin) -@@ -102,8 +101,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" -@@ -131,25 +130,37 @@ - LIBS="$_SAVEDLIBS" - CPPFLAGS="$_SAVEDCPPFLAGS" - -+AC_ARG_ENABLE(radius,--enable-radius compile check_radius) -+if test x$enable_radius = xyes; then -+dnl Check for radiusclient header file -+_SAVEDCPPFLAGS="$CPPFLAGS" -+CPPFLAGS="-I${LOCALBASE}/include" -+AC_CHECK_HEADERS(radiusclient.h,RADIUSINCLUDE="-I${LOCALBASE}/include") -+AC_SUBST(RADIUSINCLUDE) -+CPPFLAGS="$_SAVEDCPPFLAGS $RADIUSINCLUDE" -+ - dnl Check for radius libraries - _SAVEDLIBS="$LIBS" --AC_CHECK_LIB(radiusclient,rc_read_config) -+AC_CHECK_LIB(radiusclient,rc_read_config,,,-L${LOCALBASE}/lib) - if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then - EXTRAS="$EXTRAS check_radius" -- RADIUSLIBS="-lradiusclient" -+ RADIUSLIBS="-L${LOCALBASE}/lib -lradiusclient" - AC_SUBST(RADIUSLIBS) - else - AC_MSG_WARN([Skipping radius plugin]) - AC_MSG_WARN([install radius libs to compile this plugin (see Requirements).]) - fi - LIBS="$_SAVEDLIBS" -+fi - -+AC_ARG_ENABLE(ldap,--enable-ldap compile check_ldap) -+if test x$enable_ldap = xyes; then - dnl Check for LDAP libraries - _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" -+AC_CHECK_LIB(ldap,ldap_simple_bind,,,-L${LOCALBASE}/lib -llber) -+if test "$ac_cv_lib_ldap_ldap_simple_bind" = "yes"; then -+ LDAPLIBS="-L${LOCALBASE}/lib -lldap -llber"\ -+ LDAPINCLUDE="-I${LOCALBASE}/include" - AC_SUBST(LDAPLIBS) - AC_SUBST(LDAPINCLUDE) - EXTRAS="$EXTRAS check_ldap" -@@ -158,7 +169,7 @@ - AC_MSG_WARN([install LDAP libs to compile this plugin (see Requirements).]) - fi - LIBS="$_SAVEDLIBS" -- -+fi - - dnl Check for mysql libraries - _SAVEDLIBS="$LIBS" -@@ -351,24 +362,6 @@ - LIBS="$LIBS -lsnprintf" DEPLIBS="$DEPLIBS libsnprintf.a" - fi - --dnl We used to not do long options unless a compatible lib was found --dnl Now we provide code and make libgetopt if native is not suitable --AC_MSG_CHECKING(for getopt_long) --AC_TRY_COMPILE([#include <getopt.h> -- #include <stdlib.h>], -- [int option_index=0; -- 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 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>], - [struct timeval *tv; - struct timezone *tz;], -@@ -775,6 +768,8 @@ - AC_DEFINE_UNQUOTED(WHO_COMMAND,"$PATH_TO_WHO",[path and arguments for invoking 'who']) - fi - -+AC_ARG_ENABLE(snmp,--enable-snmp compile check_hpjd and check_snmp) -+if test x$enable_snmp = xyes; then - AC_PATH_PROG(PATH_TO_SNMPGET,snmpget) - if test -x "$PATH_TO_SNMPGET" - then -@@ -797,7 +792,10 @@ - echo "** Tried $PERL - install Net::SNMP perl module if you want to" - echo " use the perl snmp plugins" - fi -+fi - -+AC_ARG_ENABLE(qstat,--enable-qstat compile check_game) -+if test x$enable_qstat = xyes; then - AC_PATH_PROG(PATH_TO_QUAKESTAT,quakestat) - AC_PATH_PROG(PATH_TO_QSTAT,qstat) - if test -x "$PATH_TO_QUAKESTAT" -@@ -811,7 +809,10 @@ - else - echo "** Get qstat from http://www.activesw.com/people/steve/qstat.html in order to make check_game plugin" - fi -+fi - -+AC_ARG_ENABLE(fping,--enable-fping compile check_fping) -+if test x$enable_fping = xyes; then - AC_PATH_PROG(PATH_TO_FPING,fping) - if test -x "$PATH_TO_FPING" - then -@@ -819,6 +820,7 @@ - EXTRAS="$EXTRAS check_fping" - else - echo "** Get fping from http://www.fping.com in order to make check_fping plugin" -+fi - fi - - AC_PATH_PROG(PATH_TO_SSH,ssh) |