1 files changed, 18 insertions, 11 deletions

diff --git a/configure.ac b/configure.ac
index ef3d26e2..204fc6e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1460,23 +1460,30 @@ AC_ARG_WITH(snmpget_command,
             ACX_HELP_STRING([--with-snmpget-command=PATH],
                             [Path to snmpget command]),
             PATH_TO_SNMPGET=$withval)
-if test -n "$PATH_TO_SNMPGET"
-then
-        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
-        EXTRAS="$EXTRAS check_hpjd check_snmp\$(EXEEXT)"
-else
-        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_ARG_WITH(snmpgetnext_command,
             ACX_HELP_STRING([--with-snmpgetnext-command=PATH],
                             [Path to snmpgetnext command]),
             PATH_TO_SNMPGETNEXT=$withval)
-if test -n "$PATH_TO_SNMPGETNEXT"
-then
-        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
-fi
+
+AS_IF([test -n "$PATH_TO_SNMPGET"], [
+        AC_DEFINE_UNQUOTED(PATH_TO_SNMPGET,"$PATH_TO_SNMPGET",[path to snmpget binary])
+        EXTRAS="$EXTRAS check_hpjd"
+
+        dnl PATH_TO_SNMPGETNEXT is used unconditionally in check_snmp:
+        dnl
+        dnl   https://github.com/nagios-plugins/nagios-plugins/issues/788
+        dnl
+        AS_IF([test -n "$PATH_TO_SNMPGETNEXT"], [
+                AC_DEFINE_UNQUOTED(PATH_TO_SNMPGETNEXT,"$PATH_TO_SNMPGETNEXT",[path to snmpgetnext binary])
+                EXTRAS="$EXTRAS check_snmp\$(EXEEXT)"
+        ], [
+                AC_MSG_WARN([Get snmpgetnext from https://net-snmp.sourceforge.io/ to build the check_snmp plugin])
+        ])
+], [
+        AC_MSG_WARN([Get snmpget from https://net-snmp.sourceforge.io/ to build the check_hpjd and check_snmp plugins])
+])
 
 if ( $PERL -M"Net::SNMP 3.6" -e 'exit' 2>/dev/null  )
 then