diff options
| author | ru <ru@FreeBSD.org> | 2004-12-21 12:44:20 +0000 |
|---|---|---|
| committer | ru <ru@FreeBSD.org> | 2004-12-21 12:44:20 +0000 |
| commit | 0f51b4223f8cbd52434f4a5bd7ce0a29984e28f9 (patch) | |
| tree | d1e14607bf54cb8072d16a6a73a1e387b93c7cbf | |
| parent | bb6ad7dcac6c5ab163234f968963c2990e8c4d35 (diff) | |
| download | FreeBSD-src-0f51b4223f8cbd52434f4a5bd7ce0a29984e28f9.zip FreeBSD-src-0f51b4223f8cbd52434f4a5bd7ce0a29984e28f9.tar.gz | |
NOIPSEC -> TRACEROUTE_NO_IPSEC
| -rw-r--r-- | release/picobsd/bridge/crunch.conf | 2 | ||||
| -rw-r--r-- | share/examples/etc/make.conf | 3 | ||||
| -rw-r--r-- | usr.sbin/traceroute/Makefile | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/release/picobsd/bridge/crunch.conf b/release/picobsd/bridge/crunch.conf index 911f738..02896ce 100644 --- a/release/picobsd/bridge/crunch.conf +++ b/release/picobsd/bridge/crunch.conf @@ -18,7 +18,7 @@ # Default build options. Basically tell the Makefiles which understand # that to use the most compact possible version of the code. # -buildopts -DNOPAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -DPPP_NO_PAM -DNOIPSEC -DNO_INET6 +buildopts -DNOPAM -DRELEASE_CRUNCH -DPPP_NO_NETGRAPH -DPPP_NO_PAM -DTRACEROUTE_NO_IPSEC -DNO_INET6 # directories where to look for sources of various binaries. # @__CWD__@ is a magic keyword in the picobsd's (Makefile.conf) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index dabb650..2cac717 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -121,7 +121,6 @@ #NO_INET6= # do not build IPv6 related programs and libraries #NO_INFO= # do not make or install info files #NO_IPFILTER= # do not build IP Filter package -#NOIPSEC= # do not build traceroute(8) with IPSEC support #NO_KERBEROS= # do not build and install Kerberos 5 (KTH Heimdal) #NO_LIBC_R= # do not build libc_r (re-entrant version of libc) #NO_LIBPTHREAD= # do not build libpthread (M:N threading library) @@ -150,6 +149,8 @@ #PPP_NO_RADUIS= # do not build with RADIUS support #PPP_NO_SUID= # build with normal permissions # +#TRACEROUTE_NO_IPSEC= # do not build traceroute(8) with IPSEC support +# # Variables to control whether parts of the base BIND are built. # Defining NO_BIND makes all of the following BIND variables obsolete. # Please see the more detailed descriptions in make.conf(5). diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 953c5d4..02c9b2d 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -16,7 +16,7 @@ CFLAGS+= -DHAVE_SYS_SELECT_H=1 -DHAVE_SYS_SOCKIO_H=1 \ -DHAVE_SYS_SYSCTL_H=1 \ -DHAVE_SETLINEBUF=1 -DHAVE_RAW_OPTIONS=1 \ -DHAVE_SOCKADDR_SA_LEN=1 -DHAVE_ICMP_NEXTMTU=1 -.ifndef (NOIPSEC) +.if !defined(TRACEROUTE_NO_IPSEC) CFLAGS+= -DIPSEC .endif # RTT Jitter on the internet these days means printing 3 decimal places on @@ -24,7 +24,7 @@ CFLAGS+= -DIPSEC # reporting, ie: print a variable precision from 0.001ms through 1000ms # CFLAGS+= -DSANE_PRECISION -.ifndef (NOIPSEC) +.if !defined(TRACEROUTE_NO_IPSEC) DPADD= ${LIBIPSEC} LDADD= -lipsec .endif |
