[checkmk-commits] Fix SNMP linking

Module: check_mk Branch: master Commit: c16ab35ba3efdb5f6a22297f1056a62faed93284 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c16ab35ba3efdb… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Fri Mar 15 12:39:56 2019 +0100 Fix SNMP linking - Remove checks that use NET::SNMP - Remove test for NET::SNMP - link snmpget and snmpgetnext prperly to avoid additional dependency Change-Id: I5e597cfbe2f1a7f9ab9d170204e4dd2c23c6520d --- omd/packages/monitoring-plugins/monitoring-plugins.make | 5 ++++- tests/integration/omd/test_perl.py | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/omd/packages/monitoring-plugins/monitoring-plugins.make b/omd/packages/monitoring-plugins/monitoring-plugins.make index 56e191e..91475e8 100644 --- a/omd/packages/monitoring-plugins/monitoring-plugins.make +++ b/omd/packages/monitoring-plugins/monitoring-plugins.make @@ -14,11 +14,14 @@ $(MONITORING_PLUGINS)-install: $(MONITORING_PLUGINS_INSTALL) MONITORING_PLUGINS_CONFIGUREOPTS := \ --prefix=$(OMD_ROOT) \ - --libexecdir=$(OMD_ROOT)/lib/nagios/plugins + --libexecdir=$(OMD_ROOT)/lib/nagios/plugins \ + --with-snmpget-command=$(OMD_ROOT)/bin/snmpget \ + --with-snmpgetnext-command=$(OMD_ROOT)/bin/snmpgetnext $(MONITORING_PLUGINS_BUILD): $(MONITORING_PLUGINS_PATCHING) cd $(MONITORING_PLUGINS_DIR) ; ./configure $(MONITORING_PLUGINS_CONFIGUREOPTS) $(MAKE) -C $(MONITORING_PLUGINS_DIR) all + $(RM) plugins-scripts/check_ifoperstatus plugins-scripts/check_ifstatus $(TOUCH) $@ $(MONITORING_PLUGINS_INSTALL): $(MONITORING_PLUGINS_BUILD) diff --git a/tests/integration/omd/test_perl.py b/tests/integration/omd/test_perl.py index f15886e..686c8c0 100644 --- a/tests/integration/omd/test_perl.py +++ b/tests/integration/omd/test_perl.py @@ -5,7 +5,6 @@ def test_perl_modules(site): "File::stat", "File::Find", "File::Path", - "Net::SNMP", "SNMP", "Nagios::Plugin", "Test::Simple",