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

diff --git a/sbin/isakmpd/regress/rsakeygen/Makefile b/sbin/isakmpd/regress/rsakeygen/Makefile
index 9f2c1a4..9a42fed 100644 (file)
--- 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}