diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 07:00:54 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-07 07:00:54 +0000 |
| commit | 98df3c5ef50b729fd85720d8c9d7f4c29e5b2673 (patch) | |
| tree | a94715135eb08f29700ab0398de216b7c385591d | |
| parent | c0e10e3bfcec8b661ae86e39e9972ba439fc1517 (diff) | |
Merge with EOM 1.16
author: niklas
Multiple subject name matching, makes certificate interop with PGPnet at least
partly working. Added some error checking.
author: ho
Read in FEATURES for proper operation
author: angelos
No need for NODEBUG.
author: angelos
Use NODEBUG compile flag, so policy.c doesn't barf.
| -rw-r--r-- | sbin/isakmpd/regress/x509/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sbin/isakmpd/regress/x509/Makefile b/sbin/isakmpd/regress/x509/Makefile index cf42294a675..ea9feffab78 100644 --- a/sbin/isakmpd/regress/x509/Makefile +++ b/sbin/isakmpd/regress/x509/Makefile @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile,v 1.9 2000/04/07 22:06:11 niklas Exp $ -# $EOM: Makefile,v 1.12 2000/03/28 21:22:07 ho Exp $ +# $OpenBSD: Makefile,v 1.10 2000/10/07 07:00:53 niklas Exp $ +# $EOM: Makefile,v 1.16 2000/09/28 12:53:27 niklas Exp $ # # Copyright (c) 1999 Niels Provos. All rights reserved. @@ -39,10 +39,12 @@ PROG= x509test SRCS= x509test.c conf.c log.c libcrypto.c sysdep.c field.c util.c \ - isakmp_fld.c ipsec_fld.c ipsec_num.c isakmp_num.c constants.c + isakmp_fld.c ipsec_fld.c ipsec_num.c isakmp_num.c constants.c \ + cert.c TOPSRC= ${.CURDIR}/../.. TOPOBJ!= cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f- OS!= awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile +FEATURES!= awk '/^FEATURES=/ { print $$0 }' ${.CURDIR}/../../Makefile | sed 's/FEATURES=.//' .PATH: ${TOPSRC} ${TOPSRC}/sysdep/${OS} ${TOPOBJ} CFLAGS+= -I${TOPSRC} -I${TOPSRC}/sysdep/${OS} -I${TOPOBJ} -Wall \ -DUSE_X509 @@ -73,9 +75,8 @@ LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} .endif -.if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO) +.if !defined (HAVE_DLOPEN) && !defined (USE_LIBCRYPTO) || !defined (USE_KEYNOTE) .BEGIN: - @echo X.509 cannot be used in this environmet, skipping... PROG= .endif |