svn commit: r202440 - in head: share/mk usr.sbin/ppp

[Antoine Brodin]

Author: antoine
Date: Sat Jan 16 12:20:26 2010
New Revision: 202440
URL: http://svn.freebsd.org/changeset/base/202440

Log:
  Unbreak world WITHOUT_NETGRAPH.
  
  PR:		137487
  Submitted by:	bf (previous version)
  No objections:	net@
  MFC after:	2 weeks

Modified:
  head/share/mk/bsd.own.mk
  head/usr.sbin/ppp/Makefile

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Sat Jan 16 12:18:44 2010	(r202439)
+++ head/share/mk/bsd.own.mk	Sat Jan 16 12:20:26 2010	(r202440)
@@ -468,6 +468,11 @@ MK_MAILWRAPPER:= no
 MK_SENDMAIL:=	no
 .endif
 
+.if ${MK_NETGRAPH} == "no"
+MK_ATM:=	no
+MK_BLUETOOTH:=	no
+.endif
+
 .if ${MK_OPENSSL} == "no"
 MK_OPENSSH:=	no
 MK_KERBEROS:=	no

Modified: head/usr.sbin/ppp/Makefile
==============================================================================
--- head/usr.sbin/ppp/Makefile	Sat Jan 16 12:18:44 2010	(r202439)
+++ head/usr.sbin/ppp/Makefile	Sat Jan 16 12:20:26 2010	(r202440)
@@ -25,6 +25,9 @@ PPP_NO_SUID=
 .if ${MK_ATM} == "no"
 PPP_NO_ATM=
 .endif
+.if ${MK_NETGRAPH} == "no"
+PPP_NO_NETGRAPH=
+.endif
 .if ${MK_PAM_SUPPORT} == "no"
 PPP_NO_PAM=
 .endif