diff options
| author | roberto <roberto@FreeBSD.org> | 2004-07-22 09:10:52 +0000 |
|---|---|---|
| committer | roberto <roberto@FreeBSD.org> | 2004-07-22 09:10:52 +0000 |
| commit | e80d2e4a5eb4ac0ec5caaad9d858a9fd22f67a2e (patch) | |
| tree | fa62f1aa1cb06535b0ecbf1a002f34c32fb35ec5 /usr.sbin/ntp | |
| parent | 6b42bd1f49d5f20a3a8682a36de2625dd76e0aab (diff) | |
| download | FreeBSD-src-e80d2e4a5eb4ac0ec5caaad9d858a9fd22f67a2e.zip FreeBSD-src-e80d2e4a5eb4ac0ec5caaad9d858a9fd22f67a2e.tar.gz | |
Include support for NOCRYPT & NO_OPENSSL world.
It does survive « make release ».
Uses an upcoming patch from the vendor branch (ntp-stable) of ntp-keygen.
Submitted by: Marius Strobl <marius@alchemy.franken.de>
Diffstat (limited to 'usr.sbin/ntp')
| -rw-r--r-- | usr.sbin/ntp/Makefile.inc | 5 | ||||
| -rw-r--r-- | usr.sbin/ntp/config.h | 2 | ||||
| -rw-r--r-- | usr.sbin/ntp/ntp-keygen/Makefile | 9 | ||||
| -rw-r--r-- | usr.sbin/ntp/ntpd/Makefile | 9 |
4 files changed, 20 insertions, 5 deletions
diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index 1f548ee..bd9b34e 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -8,6 +8,11 @@ NTPDEFS= -DSYS_FREEBSD # -DMX4200 -DNMEA -DBOEDER CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +CFLAGS+= -DOPENSSL +DISTRIBUTION= crypto +.endif + .if exists(${.OBJDIR}/../libparse) LIBPARSE= ${.OBJDIR}/../libparse/libparse.a .else diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index e58cad5..51d0929 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -933,7 +933,7 @@ #define ONCORE_SHMEM_STATUS 1 /* Use OpenSSL? */ -#define OPENSSL +/* #undef OPENSSL */ /* Should we open the broadcast socket? */ #define OPEN_BCAST_SOCKET 1 diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index 891d6be..ebb3933 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -9,7 +9,12 @@ SRCS= ntp-keygen.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBNTP} ${LIBMD} ${LIBCRYPTO} -LDADD= ${LIBNTP} -lmd -lcrypto +DPADD= ${LIBNTP} +LDADD= ${LIBNTP} + +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +DPADD+= ${LIBMD} ${LIBCRYPTO} +LDADD+= -lmd -lcrypto +.endif .include <bsd.prog.mk> diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 027b9b9..d16dcc1 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -28,8 +28,13 @@ SRCS= cmd_args.c map_vme.c ntp_config.c \ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBCRYPTO} ${LIBMD} -LDADD= ${LIBPARSE} ${LIBNTP} -lm -lcrypto -lmd +DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD} +LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd + +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) +DPADD+= ${LIBCRYPTO} +LDADD+= -lcrypto +.endif CLEANFILES+= .version version.c |
