summaryrefslogtreecommitdiffstats
path: root/usr.sbin
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2003-07-24 18:30:25 +0000
committermarkm <markm@FreeBSD.org>2003-07-24 18:30:25 +0000
commit376c7c030b5cd0977a799d9e2405ad5e6562f478 (patch)
tree02f034a43f77b334e2a958993abac4da32ec093c /usr.sbin
parentd82798033a21b0cd6572c99a4aaf6f62c860ce87 (diff)
downloadFreeBSD-src-376c7c030b5cd0977a799d9e2405ad5e6562f478.zip
FreeBSD-src-376c7c030b5cd0977a799d9e2405ad5e6562f478.tar.gz
Don't check for the existance of src/crypto/ for building items that
may contain crypto. The days of ITAR paranoia are over, and the simple macro tests that remain are sufficient.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/Makefile2
-rw-r--r--usr.sbin/ppp/Makefile2
-rw-r--r--usr.sbin/pppd/Makefile2
-rw-r--r--usr.sbin/sendmail/Makefile3
-rw-r--r--usr.sbin/tcpdump/tcpdump/Makefile3
5 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index d84a1e5..5dda3ce 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -225,7 +225,7 @@ SUBDIR+=boot98cfg
SUBDIR+=ofwdump
.endif
-.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL)
SUBDIR+=keyserv
.endif
diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile
index 5e625b6..0cd4857 100644
--- a/usr.sbin/ppp/Makefile
+++ b/usr.sbin/ppp/Makefile
@@ -70,7 +70,7 @@ CFLAGS+=-DNOSUID
SRCS+= id.c
.endif
-.if !exists(${.CURDIR}/../../crypto) || defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NODES)
+.if defined(NOCRYPT) || defined(NO_OPENSSL)
CFLAGS+=-DNODES
.else
DISTRIBUTION=crypto
diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile
index 7c5f3029..c0719a9 100644
--- a/usr.sbin/pppd/Makefile
+++ b/usr.sbin/pppd/Makefile
@@ -30,7 +30,7 @@ DPADD+= ${LIBPCAP}
LDADD+= -lpcap
# MS-CHAP support. Requires the DES library.
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
CFLAGS+= -DCHAPMS
SRCS+= chap_ms.c
diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile
index d868d34..26b2082 100644
--- a/usr.sbin/sendmail/Makefile
+++ b/usr.sbin/sendmail/Makefile
@@ -57,8 +57,7 @@ LDADD+= ${LIBSMUTIL} ${LIBSM}
SRCS+= sm_os.h
CLEANFILES+=sm_os.h
-.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && \
- !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
# STARTTLS support
DISTRIBUTION= crypto
CFLAGS+= -DSTARTTLS -D_FFR_TLS_1
diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile
index 8b1063a..a5ce197 100644
--- a/usr.sbin/tcpdump/tcpdump/Makefile
+++ b/usr.sbin/tcpdump/tcpdump/Makefile
@@ -39,8 +39,7 @@ CFLAGS+= -DLBL_ALIGN
DPADD= ${LIBL} ${LIBPCAP}
LDADD= -ll -lpcap
-.if exists(../../../crypto) && !defined(NOCRYPT) && \
- !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
+.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DISTRIBUTION=crypto
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
OpenPOWER on IntegriCloud