Makefile: Merge with EOM 1.61

crypto.c: Merge with EOM 1.27
exchange.c: Merge with EOM 1.115
ike_quick_mode.c: Merge with EOM 1.115
x509.c: Merge with EOM 1.35
features/ec: Merge with EOM 1.1
features/aggressive: Merge with EOM 1.1
features/policy: Merge with EOM 1.1
features/x509: Merge with EOM 1.1

author: niklas
Allow isakmpd builders to remove optional parts and save bytes.

1 files changed, 24 insertions, 17 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index f3691fd5663..b208e86e4f6 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.23 2000/01/26 15:21:49 niklas Exp $
-#	$EOM: Makefile,v 1.60 1999/12/08 20:39:34 niklas Exp $
+#	$OpenBSD: Makefile,v 1.24 2000/02/19 19:31:32 niklas Exp $
+#	$EOM: Makefile,v 1.61 2000/02/19 07:46:30 niklas Exp $
 
 #
-# Copyright (c) 1998, 1999 Niklas Hallqvist.  All rights reserved.
+# Copyright (c) 1998, 1999, 2000 Niklas Hallqvist.  All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -48,20 +48,21 @@ OS=		openbsd
 #OS=		freebsd
 #OS=		linux
 
+# Compile-time configuration of otherwise optional features
+FEATURES=	tripledes blowfish cast policy x509 ec aggressive
+
 .PATH:		${.CURDIR}/sysdep/${OS}
 
 PROG=		isakmpd
 BINDIR?=	/sbin
 LDSTATIC?=	-static
-SRCS=		app.c attribute.c cert.c connection.c \
-		constants.c conf.c cookie.c crypto.c dh.c doi.c exchange.c \
-		exchange_num.c field.c gmp_util.c hash.c if.c ike_auth.c \
-		ike_aggressive.c ike_main_mode.c ike_phase_1.c \
-		ike_quick_mode.c init.c ipsec.c ipsec_fld.c ipsec_num.c \
-		isakmpd.c isakmp_doi.c isakmp_fld.c isakmp_num.c libcrypto.c \
-		log.c message.c math_2n.c math_ec2n.c math_group.c \
-		prf.c sa.c sysdep.c timer.c transport.c udp.c ui.c \
-		util.c
+SRCS=		app.c attribute.c cert.c connection.c constants.c conf.c \
+		cookie.c crypto.c dh.c doi.c exchange.c exchange_num.c \
+		field.c gmp_util.c hash.c if.c ike_auth.c ike_main_mode.c \
+		ike_phase_1.c ike_quick_mode.c init.c ipsec.c ipsec_fld.c \
+		ipsec_num.c isakmpd.c isakmp_doi.c isakmp_fld.c isakmp_num.c \
+		libcrypto.c log.c message.c math_2n.c math_group.c prf.c sa.c \
+		sysdep.c timer.c transport.c udp.c ui.c util.c
 
 GENERATED=	exchange_num.h ipsec_fld.h ipsec_num.h isakmp_fld.h \
 		isakmp_num.h
@@ -116,35 +117,41 @@ DEBUG=		-g
 
 SUBDIR=		apps
 
+.if ${FEATURES} != ""
+CFLAGS+=	${FEATURES:U:S/^/-DUSE_/}
+.endif
+
 .include "sysdep/${OS}/Makefile.sysdep"
 
 .if !make(install) && !defined(NO_REGRESS)
 SUBDIR+=	regress
 .endif
 
+.for FEATURE in ${FEATURES}
+.if exists(features/${FEATURE})
+.include "features/${FEATURE}"
+.endif
+.endfor
+
 .ifdef HAVE_DLOPEN
-X509=		x509.c
-POLICY=		policy.c
 CFLAGS+=	-DHAVE_DLOPEN
 SRCS+=		dyn.c
 .endif
 
 .ifdef USE_KEYNOTE
 USE_LIBCRYPTO=	yes
-POLICY=		policy.c
 LDADD+=		-lkeynote -lm
 DPADD+=		${LIBKEYNOTE} ${LIBM}
 CFLAGS+=	-DUSE_KEYNOTE
 .endif
 
 .ifdef USE_LIBCRYPTO
-X509=		x509.c
 CFLAGS+=	-DUSE_LIBCRYPTO
 LDADD+=		-lcrypto
 DPADD+=		${LIBCRYPTO}
 .endif
 
-SRCS+=		${IPSEC_SRCS} ${X509} ${POLICY}
+SRCS+=		${IPSEC_SRCS} ${X509} ${POLICY} ${EC} ${AGGRESSIVE}
 CFLAGS+=	${IPSEC_CFLAGS}
 
 LDADD+=		${DESLIB}