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>
This commit is contained in:
Ollivier Robert 2004-07-22 09:10:52 +00:00
parent 5c1361654f
commit 0883223a5f
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=132535
4 changed files with 20 additions and 5 deletions

View File

@ -8,6 +8,11 @@ NTPDEFS= -DSYS_FREEBSD
# -DMX4200 -DNMEA -DBOEDER # -DMX4200 -DNMEA -DBOEDER
CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS}
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
CFLAGS+= -DOPENSSL
DISTRIBUTION= crypto
.endif
.if exists(${.OBJDIR}/../libparse) .if exists(${.OBJDIR}/../libparse)
LIBPARSE= ${.OBJDIR}/../libparse/libparse.a LIBPARSE= ${.OBJDIR}/../libparse/libparse.a
.else .else

View File

@ -933,7 +933,7 @@
#define ONCORE_SHMEM_STATUS 1 #define ONCORE_SHMEM_STATUS 1
/* Use OpenSSL? */ /* Use OpenSSL? */
#define OPENSSL /* #undef OPENSSL */
/* Should we open the broadcast socket? */ /* Should we open the broadcast socket? */
#define OPEN_BCAST_SOCKET 1 #define OPEN_BCAST_SOCKET 1

View File

@ -9,7 +9,12 @@ SRCS= ntp-keygen.c
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
DPADD= ${LIBNTP} ${LIBMD} ${LIBCRYPTO} DPADD= ${LIBNTP}
LDADD= ${LIBNTP} -lmd -lcrypto LDADD= ${LIBNTP}
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DPADD+= ${LIBMD} ${LIBCRYPTO}
LDADD+= -lmd -lcrypto
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

View File

@ -28,8 +28,13 @@ SRCS= cmd_args.c map_vme.c ntp_config.c \
CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../
DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBCRYPTO} ${LIBMD} DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} ${LIBMD}
LDADD= ${LIBPARSE} ${LIBNTP} -lm -lcrypto -lmd LDADD= ${LIBPARSE} ${LIBNTP} -lm -lmd
.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH)
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
.endif
CLEANFILES+= .version version.c CLEANFILES+= .version version.c