Update Makefile to know about PPP_FILTER and fix the PPP_BSDCOMP and

PPP_DEFLATE options... The code uses #if defined(PPP_DEFLATE) etc, so the
original method of "#define PPP_DEFLATE 0" did not actually disable
anything.  It was not possible to configure out bsdcomp or zlib
compression.  Also, join the settings for PPP_FILTER and NBPFILTER together
since they are related here (can't have PPP_FILTER without NBPFILTER).
This commit is contained in:
Peter Wemm 1997-10-18 01:37:52 +00:00
parent 43d887c508
commit de2c92bf40
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=30530
2 changed files with 26 additions and 12 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.6 1997/02/22 12:48:06 peter Exp $
# $Id: Makefile,v 1.7 1997/08/21 10:17:29 jmg Exp $
.PATH: ${.CURDIR}/../../sys/net
KMOD= if_ppp_mod
@ -7,23 +7,30 @@ NOMAN=
PSEUDO_LKM=
CFLAGS+= -I.
NBPFILTER?= 0
NPPP?= 2
PPP_BSDCOMP?= 1
PPP_DEFLATE?= 1
PROTOS?= -DINET
PPP_BSDCOMP?= 1 # 0/1
PPP_DEFLATE?= 1 # 0/1
PPP_FILTER?= 0 # 0/1 - requires bpf to be configured in kernel
PROTOS?= -DINET # add -DIPX if you have IPX in the kernel
CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h ppp.h opt_ppp.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
ppp.h:
echo "#define NPPP ${NPPP}" > ppp.h
opt_ppp.h:
.if ${PPP_BSDCOMP} > 0
echo "#define PPP_BSDCOMP ${PPP_BSDCOMP}" > opt_ppp.h
.endif
.if ${PPP_DEFLATE} > 0
echo "#define PPP_DEFLATE ${PPP_DEFLATE}" >> opt_ppp.h
.endif
.if ${PPP_FILTER} > 0
echo "#define PPP_FILTER ${PPP_FILTER}" >> opt_ppp.h
.endif
.include <bsd.kmod.mk>

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.6 1997/02/22 12:48:06 peter Exp $
# $Id: Makefile,v 1.7 1997/08/21 10:17:29 jmg Exp $
.PATH: ${.CURDIR}/../../sys/net
KMOD= if_ppp_mod
@ -7,23 +7,30 @@ NOMAN=
PSEUDO_LKM=
CFLAGS+= -I.
NBPFILTER?= 0
NPPP?= 2
PPP_BSDCOMP?= 1
PPP_DEFLATE?= 1
PROTOS?= -DINET
PPP_BSDCOMP?= 1 # 0/1
PPP_DEFLATE?= 1 # 0/1
PPP_FILTER?= 0 # 0/1 - requires bpf to be configured in kernel
PROTOS?= -DINET # add -DIPX if you have IPX in the kernel
CFLAGS+= ${PROTOS}
CLEANFILES+= bpfilter.h ppp.h opt_ppp.h
bpfilter.h:
echo "#define NBPFILTER ${NBPFILTER}" > bpfilter.h
echo "#define NBPFILTER ${PPP_FILTER}" > bpfilter.h
ppp.h:
echo "#define NPPP ${NPPP}" > ppp.h
opt_ppp.h:
.if ${PPP_BSDCOMP} > 0
echo "#define PPP_BSDCOMP ${PPP_BSDCOMP}" > opt_ppp.h
.endif
.if ${PPP_DEFLATE} > 0
echo "#define PPP_DEFLATE ${PPP_DEFLATE}" >> opt_ppp.h
.endif
.if ${PPP_FILTER} > 0
echo "#define PPP_FILTER ${PPP_FILTER}" >> opt_ppp.h
.endif
.include <bsd.kmod.mk>