$NetBSD: patch-configure,v 1.4 2017/11/08 03:20:48 taca Exp $ Disable all the plugins which are installed by the nagios-plugin-* packages. --- configure.orig 2017-04-19 16:03:27.000000000 +0000 +++ configure @@ -17422,7 +17422,7 @@ _ACEOF fi - if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then + if false; then EXTRAS="$EXTRAS check_radius\$(EXEEXT)" RADIUSLIBS="-lradiusclient" @@ -18947,6 +18947,9 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef HAVE_UNISTD_H +#if defined(__sun) && !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef _FILE_OFFSET_BITS +#endif #include #endif #include @@ -21721,7 +21724,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; th ac_cv_ps_cols=9 { $as_echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5 $as_echo "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 { $as_echo "$as_me:$LINENO: using 64bit pst3" >&5 $as_echo "$as_me: using 64bit pst3" >&6;} @@ -22748,7 +22751,7 @@ fi then { $as_echo "$as_me:$LINENO: checking for nslookup syntax" >&5 $as_echo_n "checking for nslookup syntax... " >&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 | grep -F "Invalid option: sil" >/dev/null then ac_cv_nslookup_command="$PATH_TO_NSLOOKUP" { $as_echo "$as_me:$LINENO: result: $ac_cv_nslookup_command" >&5 @@ -23137,7 +23140,7 @@ fi # Check whether --with-snmpget_command was given. -if test "${with_snmpget_command+set}" = set; then +if false; then withval=$with_snmpget_command; PATH_TO_SNMPGET=$withval fi @@ -23148,7 +23151,7 @@ cat >>confdefs.h <<_ACEOF #define PATH_TO_SNMPGET "$PATH_TO_SNMPGET" _ACEOF - EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)" + #EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)" else { $as_echo "$as_me:$LINENO: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&5 $as_echo "$as_me: WARNING: Get snmpget from http://net-snmp.sourceforge.net to make check_hpjd and check_snmp plugins" >&2;} @@ -23209,7 +23212,7 @@ _ACEOF fi -if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null ) +if false then { $as_echo "$as_me:$LINENO: checking for Net::SNMP perl module" >&5 $as_echo_n "checking for Net::SNMP perl module... " >&6; } @@ -23361,7 +23364,7 @@ IFS=$as_save_IFS esac fi PATH_TO_FPING=$ac_cv_path_PATH_TO_FPING -if test -n "$PATH_TO_FPING"; then +if test -n "$PATH_TO_FPING" -a "$PATH_TO_FPING" != "no"; then { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING" >&5 $as_echo "$PATH_TO_FPING" >&6; } else @@ -23401,7 +23404,7 @@ IFS=$as_save_IFS esac fi PATH_TO_FPING6=$ac_cv_path_PATH_TO_FPING6 -if test -n "$PATH_TO_FPING6"; then +if test -n "$PATH_TO_FPING6" -a "$PATH_TO_FPING6" != "no"; then { $as_echo "$as_me:$LINENO: result: $PATH_TO_FPING6" >&5 $as_echo "$PATH_TO_FPING6" >&6; } else @@ -24034,6 +24037,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 @@ -24096,6 +24103,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 @@ -24213,6 +24224,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