$NetBSD: patch-ab,v 1.8 2012/07/25 12:01:55 fhajny Exp $ --- configure.orig 2010-07-27 20:48:13.000000000 +0000 +++ configure @@ -14688,7 +14688,7 @@ _ACEOF fi -if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then +if false; then EXTRAS="$EXTRAS check_radius" RADIUSLIBS="-lradiusclient" @@ -14843,7 +14843,7 @@ _ACEOF fi -if test "$ac_cv_lib_ldap_main" = "yes"; then +if false; then LDAPLIBS="-lldap -llber"\ LDAPINCLUDE="-I/usr/include/ldap" @@ -18068,7 +18068,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th ac_cv_ps_cols=9 { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5 echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; } - if test `isainfo -b` = 64 ; then + if test "$MACHINE_ARCH" = "x86_64" ; then pst3_use_64bit=1 { echo "$as_me:$LINENO: using 64bit pst3" >&5 echo "$as_me: using 64bit pst3" >&6;} @@ -19037,7 +19037,7 @@ fi then { echo "$as_me:$LINENO: checking for nslookup syntax" >&5 echo $ECHO_N "checking for nslookup syntax... $ECHO_C" >&6; } - if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | grep "Invalid option: sil" >/dev/null + if $PATH_TO_NSLOOKUP -sil 127.0.0.1 2>&1 | fgrep "Invalid option: sil" >/dev/null then ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" { echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 @@ -19260,7 +19260,7 @@ echo "${ECHO_T}no" >&6; } fi -if test -x "$PATH_TO_LMSTAT" +if false then cat >>confdefs.h <<_ACEOF @@ -19431,7 +19431,7 @@ if test "${with_snmpget_command+set}" = withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval fi -if test -n "$PATH_TO_SNMPGET" +if test -n "$PATH_TO_SNMPGET" -a "$PATH_TO_SNMPGET" != "no" then cat >>confdefs.h <<_ACEOF @@ -19490,7 +19490,7 @@ if test "${with_snmpgetnext_command+set} withval=$with_snmpgetnext_command; PATH_TO_SNMPGETNEXT=$withval fi -if test -n "$PATH_TO_SNMPGETNEXT" +if test -n "$PATH_TO_SNMPGETNEXT" -a "$PATH_TO_SNMPGETNEXT" != "no" then cat >>confdefs.h <<_ACEOF @@ -19499,7 +19499,7 @@ _ACEOF fi -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) +if false then { echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 echo $ECHO_N "checking for Net::SNMP perl module... $ECHO_C" >&6; } @@ -19666,7 +19666,7 @@ if test "${with_fping_command+set}" = se withval=$with_fping_command; PATH_TO_FPING=$withval fi -if test -n "$PATH_TO_FPING" +if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no" then cat >>confdefs.h <<_ACEOF @@ -20200,6 +20200,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif + #ifdef HAVE_SYS_PARAM_H #include #endif @@ -20258,6 +20262,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif + #include #include #include @@ -20333,6 +20341,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif + #include #include #include @@ -20400,6 +20412,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif + #include #include #include @@ -20468,6 +20484,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif + #include #include #include @@ -20514,6 +20534,10 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif + #include #include #include @@ -20882,7 +20906,7 @@ if test -n "$PATH_TO_APTGET" ; then fi -if test -f $srcdir/plugins/check_nt.c ; then +if false ; then EXTRAS="$EXTRAS check_nt" fi