Better FEATURE handling for dnssec

2 files changed, 38 insertions, 14 deletions

diff --git a/sbin/isakmpd/Makefile b/sbin/isakmpd/Makefile
index 25ae8ccc39e..aa32de9d882 100644
--- a/sbin/isakmpd/Makefile
+++ b/sbin/isakmpd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.36 2001/05/07 22:55:37 espie Exp $
+#	$OpenBSD: Makefile,v 1.37 2001/05/21 11:19:22 ho Exp $
 #	$EOM: Makefile,v 1.78 2000/10/15 21:33:42 niklas Exp $
 
 #
@@ -55,7 +55,7 @@ OS=		openbsd
 #FEATURES=	tripledes des blowfish cast policy x509 ec aggressive debug gmp
 #FEATURES+=	dnssec
 FEATURES=	tripledes des blowfish cast policy x509 ec aggressive debug
-#FEATURES=
+#FEATURES+=
 
 .PATH:		${.CURDIR}/sysdep/${OS}
 
@@ -155,14 +155,6 @@ DPADD+=		${LIBGMP}
 CFLAGS+=	-DMP_FLAVOUR=MP_FLAVOUR_OPENSSL
 .endif
 
-.if ${FEATURES:Mdnssec} == "dnssec"
-LIBLWRES=	/usr/local/lib/liblwres.a
-CFLAGS+=	-I/usr/local/include
-LDADD+=		${LIBLWRES}
-DPADD+=		${LIBLWRES}
-SRCS+=		dnssec.c
-.endif
-
 .ifdef HAVE_DLOPEN
 CFLAGS+=	-DHAVE_DLOPEN
 SRCS+=		dyn.c
@@ -181,11 +173,11 @@ LDADD+=		-lcrypto
 DPADD+=		${LIBCRYPTO}
 .endif
 
-SRCS+=		${IPSEC_SRCS} ${X509} ${POLICY} ${EC} ${AGGRESSIVE}
-CFLAGS+=	${IPSEC_CFLAGS}
+SRCS+=		${IPSEC_SRCS} ${X509} ${POLICY} ${EC} ${AGGRESSIVE} ${DNSSEC}
+CFLAGS+=	${IPSEC_CFLAGS} ${DNSSEC_CFLAGS}
 
-LDADD+=		${DESLIB}
-DPADD+=		${DESLIBDEP}
+LDADD+=		${DESLIB} ${LWRESLIB}
+DPADD+=		${DESLIBDEP} ${LWRESLIB}
 
 exchange_num.c exchange_num.h: genconstants.sh exchange_num.cst
 	/bin/sh ${.CURDIR}/genconstants.sh ${.CURDIR}/exchange_num
diff --git a/sbin/isakmpd/features/dnssec b/sbin/isakmpd/features/dnssec
new file mode 100644
index 00000000000..8fc46e6912f
--- /dev/null
+++ b/sbin/isakmpd/features/dnssec
@@ -0,0 +1,32 @@
+#	$OpenBSD: dnssec,v 1.1 2001/05/21 11:19:22 ho Exp $
+
+#
+# Copyright (c) 2001 Håkan Olsson.  All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+DNSSEC=		dnssec.c
+
+LWRESLIB=	/usr/local/lib/liblwres.a
+DNSSEC_CFLAGS=	-I/usr/local/include