summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-07 22:07:19 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>2000-04-07 22:07:19 +0000
commit5421f03637dc1408dd267f350c40437d6aa15972 (patch)
treeafaa65445925a415495e9227b9fc08c3aed20631
parent81affe2bd1f1bf14dcae90dca4f02dcd7955cc3c (diff)
Merge with EOM 1.10
author: ho Revert to manual OS selection, and make sure USE_X509 is set as needed. author: ho Another way to do multiple OSes
-rw-r--r--sbin/isakmpd/regress/rsakeygen/Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/sbin/isakmpd/regress/rsakeygen/Makefile b/sbin/isakmpd/regress/rsakeygen/Makefile
index 9f2c1a45658..9a42fedbc20 100644
--- a/sbin/isakmpd/regress/rsakeygen/Makefile
+++ b/sbin/isakmpd/regress/rsakeygen/Makefile
@@ -1,5 +1,5 @@
-# $OpenBSD: Makefile,v 1.9 2000/02/25 17:23:36 niklas Exp $
-# $EOM: Makefile,v 1.8 2000/02/20 19:58:44 niklas Exp $
+# $OpenBSD: Makefile,v 1.10 2000/04/07 22:07:18 niklas Exp $
+# $EOM: Makefile,v 1.10 2000/03/28 21:23:24 ho Exp $
#
# Copyright (c) 1999 Niels Provos. All rights reserved.
@@ -66,6 +66,11 @@ DPADD+= ${LIBCRYPTO}
@echo RSA cannot be used in this environmet, skipping...
PROG=
+.else
+# USE_X509 is required for libcrypto.h to include the correct headers,
+# but it is not set by ${OS}/Makefile.sysdep - setting it manually here
+# should be safe enough.
+CFLAGS+= -DUSE_X509
.endif
LDADD+= ${DESLIB}