From c18a3704f2c8de62c4d8ec5a174ba88edba10e19 Mon Sep 17 00:00:00 2001 From: ngie Date: Wed, 4 Jan 2017 00:40:06 +0000 Subject: [PATCH] MFstable/11 r311209: MFC r310664: Only build/install usr.sbin/bsnmpd/modules/snmp_wlan if MK_WIRELESS != no git-svn-id: svn://svn.freebsd.org/base/stable/10@311211 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tools/build/mk/OptionalObsoleteFiles.inc | 6 ++++++ usr.sbin/bsnmpd/modules/Makefile | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index b02cfa568..5d3917ee0 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -5695,6 +5695,12 @@ OLD_FILES+=usr/share/man/man8/wlandebug.8.gz OLD_FILES+=usr/share/man/man8/wpa_cli.8.gz OLD_FILES+=usr/share/man/man8/wpa_passphrase.8.gz OLD_FILES+=usr/share/man/man8/wpa_supplicant.8.gz +OLD_FILES+=usr/lib/snmp_wlan.so +OLD_LIBS+=usr/lib/snmp_wlan.so.6 +# bsnmp module +OLD_FILES+=usr/share/man/man3/snmp_wlan.3.gz +OLD_FILES+=usr/share/snmp/defs/wlan_tree.def +OLD_FILES+=usr/share/snmp/mibs/BEGEMOT-WIRELESS-MIB.txt .endif .if ${MK_SVNLITE} == no || ${MK_SVN} == yes diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile index 45558b7ab..6b07be2a6 100644 --- a/usr.sbin/bsnmpd/modules/Makefile +++ b/usr.sbin/bsnmpd/modules/Makefile @@ -16,7 +16,6 @@ SUBDIR= ${_snmp_atm} \ snmp_target \ snmp_usm \ snmp_vacm \ - snmp_wlan .if ${MK_PF} != "no" SUBDIR+=snmp_pf @@ -26,6 +25,10 @@ SUBDIR+=snmp_pf SUBDIR+=snmp_netgraph .endif +.if ${MK_WIRELESS} != "no" +SUBDIR+=snmp_wlan +.endif + INCS= snmpmod.h INCSDIR= ${INCLUDEDIR}/bsnmp -- 2.45.0