Merge the NETGRAPH branch into HEAD. tty devices now use netgraph's line

discipline to do the async escaping, but no other benefits are available yet.

Change ``ifdef HAVE_DES'' to ``ifndef NODES'' for consistency.

Make the Makefile a little more sane WRT RELEASE_CRUNCH.

1 files changed, 18 insertions, 15 deletions

diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 55c605d..edd2d2c 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -8,6 +8,17 @@ SRCS=	acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \
 	mbuf.c mp.c ncp.c ncpaddr.c pap.c physical.c pred.c probe.c prompt.c \
 	proto.c route.c server.c sig.c slcompress.c sync.c systems.c tcp.c \
 	tcpmss.c throughput.c timer.c tty.c tun.c udp.c vjcomp.c
+.if defined(RELEASE_CRUNCH)
+CFLAGS+=-DRELEASE_CRUNCH
+NOATM=		true
+NOI4B=		true
+NONAT=		true
+NOKLDLOAD=	true
+NORADIUS=	true
+NOSECURE=	true
+NOSUID=		true
+.endif
+
 .if defined(NOSUID) || defined(PPP_NOSUID)
 BINMODE=554
 .else
@@ -25,9 +36,6 @@ DPADD=	${LIBCRYPT} ${LIBMD} ${LIBUTIL} ${LIBZ}
 .8.m4.8:
 	m4 ${M4FLAGS} ${.IMPSRC} >${.TARGET}
 
-.if defined(RELEASE_CRUNCH)
-CFLAGS+=-DRELEASE_CRUNCH
-.endif
 
 .if defined(PPP_CONFDIR) && !empty(PPP_CONFDIR)
 CFLAGS+=-DPPP_CONFDIR=\"${PPP_CONFDIR}\"
@@ -44,14 +52,12 @@ CFLAGS+=-DNOINET6
 .if defined(NOALIAS) || defined(NONAT)
 CFLAGS+=-DNONAT
 .else
-.if !defined(RELEASE_CRUNCH)
 SRCS+=	nat_cmd.c
 LDADD+=	-lalias
 DPADD+= ${LIBALIAS}
 .endif
-.endif
 
-.if defined(NOATM) || defined(RELEASE_CRUNCH)
+.if defined(NOATM)
 CFLAGS+=-DNOATM
 .else
 SRCS+=	atm.c
@@ -60,14 +66,13 @@ SRCS+=	atm.c
 .if defined(NOSUID) || defined(PPP_NOSUID)
 CFLAGS+=-DNOSUID
 .else
-.if !defined(RELEASE_CRUNCH)
 SRCS+=	id.c
 .endif
-.endif
 
-.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !exists(${.CURDIR}/../../secure) || defined(NOCRYPT) || defined(NOSECURE) || defined(NO_OPENSSL) || defined(NODES)
+CFLAGS+=-DNODES
+.else
 DISTRIBUTION=crypto
-CFLAGS+=-DHAVE_DES
 SRCS+=	chap_ms.c mppe.c
 LDADD+= -lcrypto
 DPADD+= ${LIBCRYPTO}
@@ -76,12 +81,10 @@ DPADD+= ${LIBCRYPTO}
 .if defined(NORADIUS)
 CFLAGS+=-DNORADIUS
 .else
-.if !defined(RELEASE_CRUNCH)
 SRCS+=	radius.c
 LDADD+=	-lradius
 DPADD+= ${LIBRADIUS}
 .endif
-.endif
 
 .if defined(NOI4B) || ${MACHINE_ARCH} != "i386"
 CFLAGS+=-DNOI4B
@@ -95,10 +98,10 @@ CFLAGS+=-DNONETGRAPH
 SRCS+=	ether.c
 LDADD+=	-lnetgraph
 DPADD+= ${LIBNETGRAPH}
+.if defined(EXPERIMENTAL_NETGRAPH)
+CFLAGS+=-DEXPERIMENTAL_NETGRAPH
+SRCS+=	netgraph.c
 .endif
-
-.if defined(RELEASE_CRUNCH)
-CFLAGS+=-DNONAT -DNORADIUS -DNOI4B -DNOSUID
 .endif
 
 .include <bsd.prog.mk>