misc/143830: Fix conditional inclusion for sbin/atm/atmconfig

[Garrett Cooper]

>Number:         143830
>Category:       misc
>Synopsis:       Fix conditional inclusion for sbin/atm/atmconfig
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 12 03:10:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Garrett Cooper
>Release:        RELENG_8
>Organization:
Cisco Systems, Inc
>Environment:
FreeBSD garrcoop-fbsd.cisco.com 8.0-STABLE FreeBSD 8.0-STABLE #2: Wed Feb  3 16:57:07 PST 2010     garrcoop at garrcoop-fbsd.cisco.com:/usr/obj/usr/src/sys/LAPPY_X86  i386
>Description:
bsnmp is a requirement for atmconfig even though it's not spelled out as such in bsd.own.mk, so make release (or make -C sbin/atm) fails if WITHOUT_BSNMP=yes is specified, like the following:

===> sbin/atm/atmconfig (depend)
cat /usr/src/sbin/atm/atmconfig/../../../contrib/ngatm/snmp_atm/atm_tree.def	 /usr/src/sbin/atm/atmconfig/../../../usr.sbin/bsnmpd/modules/snmp_atm/atm_freebsd.def | gensnmptree -e `tail -n +2 /usr/src/sbin/atm/atmconfig/atm_oid.list`  > /usr/obj/usr/src/sbin/atm/atmconfig/oid.h
gensnmptree: not found

I could not properly determine how to remove the subdirectory from the make operation as I'm just getting used to the Makefile infrastructure.
>How-To-Repeat:
(cd release; make release WITHOUT_BSNMP=yes)
>Fix:
Invoke with `WITHOUT_ATM=no WITHOUT_BSNMP=no' or `WITH_ATM=yes WITH_BSNMP=yes'.

Patch attached with submission follows:

Index: sbin/atm/atmconfig/Makefile
===================================================================
RCS file: /usr/local/cvsroot/freebsd/src/sbin/atm/atmconfig/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- sbin/atm/atmconfig/Makefile	19 Oct 2009 16:00:24 -0000	1.9
+++ sbin/atm/atmconfig/Makefile	12 Feb 2010 02:59:55 -0000
@@ -5,6 +5,10 @@
 #
 # $FreeBSD$
 
+.include <bsd.own.mk>
+
+.if ${MK_ATM} != "no"
+
 PROG=	atmconfig
 .ifndef RESCUE
 SRCS=	${.OBJDIR}/oid.h
@@ -40,5 +44,7 @@
 ${.OBJDIR}/oid.h: atm_oid.list ${SNMP_ATM_DEF}
 	cat ${SNMP_ATM_DEF} | gensnmptree -e `tail -n +2 ${.CURDIR}/atm_oid.list` \
 		> ${.OBJDIR}/oid.h
+
+.endif
 
 .include <bsd.prog.mk>


>Release-Note:
>Audit-Trail:
>Unformatted: