Use two NetBSD-style options (PPP_DEFLATE and PPP_BSDCOMP) to control
whether or not to compile the two ppp compression methods.
This commit is contained in:
parent
02eab22ca1
commit
13c497114e
@ -167,7 +167,7 @@ msdosfs/msdosfs_vfsops.c optional msdosfs
|
||||
msdosfs/msdosfs_vnops.c optional msdosfs
|
||||
net/bpf.c optional bpfilter
|
||||
net/bpf_filter.c optional bpfilter
|
||||
net/bsd_comp.c optional ppp
|
||||
net/bsd_comp.c optional ppp_bsdcomp
|
||||
net/hostcache.c standard
|
||||
net/if.c standard
|
||||
net/if_atmsubr.c optional atm
|
||||
@ -181,7 +181,7 @@ net/if_ppp.c optional ppp
|
||||
net/if_sl.c optional sl
|
||||
net/if_spppsubr.c optional sppp
|
||||
net/if_tun.c optional tun
|
||||
net/ppp_deflate.c optional ppp
|
||||
net/ppp_deflate.c optional ppp_deflate
|
||||
net/ppp_tty.c optional ppp
|
||||
net/radix.c standard
|
||||
net/raw_cb.c standard
|
||||
@ -190,7 +190,7 @@ net/route.c standard
|
||||
net/rtsock.c standard
|
||||
net/slcompress.c optional ppp
|
||||
net/slcompress.c optional sl
|
||||
net/zlib.c optional ppp
|
||||
net/zlib.c optional ppp_deflate
|
||||
netatalk/aarp.c optional netatalk
|
||||
netatalk/at_control.c optional netatalk
|
||||
netatalk/at_proto.c optional netatalk
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $Id: options,v 1.30 1997/05/04 15:24:13 joerg Exp $
|
||||
# $Id: options,v 1.31 1997/06/04 16:44:22 pst Exp $
|
||||
|
||||
# Format:
|
||||
# Option name filename
|
||||
@ -98,3 +98,5 @@ MROUTING opt_mrouting.h
|
||||
IPFIREWALL opt_ipfw.h
|
||||
IPFIREWALL_VERBOSE opt_ipfw.h
|
||||
IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
|
||||
PPP_BSDCOMP opt_ppp.h
|
||||
PPP_DEFLATE opt_ppp.h
|
||||
|
@ -69,15 +69,17 @@
|
||||
* Paul Mackerras (paulus@cs.anu.edu.au).
|
||||
*/
|
||||
|
||||
/* $Id: if_ppp.c,v 1.41 1997/05/31 10:13:45 peter Exp $ */
|
||||
/* $Id: if_ppp.c,v 1.42 1997/08/19 14:10:45 peter Exp $ */
|
||||
/* from if_sl.c,v 1.11 84/10/04 12:54:47 rick Exp */
|
||||
/* from NetBSD: if_ppp.c,v 1.15.2.2 1994/07/28 05:17:58 cgd Exp */
|
||||
|
||||
#include "ppp.h"
|
||||
#if NPPP > 0
|
||||
|
||||
#include "opt_ppp.h"
|
||||
|
||||
#define VJC
|
||||
#define PPP_COMPRESS
|
||||
#define PPP_COMPRESS /* XXX option to cut size? */
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -180,10 +182,10 @@ extern struct compressor ppp_bsd_compress;
|
||||
extern struct compressor ppp_deflate;
|
||||
|
||||
static struct compressor *ppp_compressors[8] = {
|
||||
#if DO_BSD_COMPRESS
|
||||
#if DO_BSD_COMPRESS && defined(PPP_BSDCOMP)
|
||||
&ppp_bsd_compress,
|
||||
#endif
|
||||
#if DO_DEFLATE
|
||||
#if DO_DEFLATE && defined(PPP_DEFLATE)
|
||||
&ppp_deflate,
|
||||
#endif
|
||||
NULL
|
||||
|
Loading…
x
Reference in New Issue
Block a user