From 43f46418dece86b4cc94676238e16dab56b7b563 Mon Sep 17 00:00:00 2001
From: fredb <fredb>
Date: Wed, 13 Sep 2000 20:10:45 +0000
Subject: _Really_ make disable pgp by default, if IRRD_USE_PGP is not set;
 allow ipv6 to be disabled by setting USE_INET6 to something other than "YES".

---
 net/irrd/Makefile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'net')

diff --git a/net/irrd/Makefile b/net/irrd/Makefile
index 5d83f95e672..e10b5330830 100644
--- a/net/irrd/Makefile
+++ b/net/irrd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/09/13 15:14:40 fredb Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/13 20:10:45 fredb Exp $
 #
 
 DISTNAME=	irrd-1.5-beta-Sept-24-1999
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/irrd-1.5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --without-gdbm --with-db1
-CONFIGURE_ARGS+= --disable-thread --disable-wall
+CONFIGURE_ARGS+= --disable-thread
 CONFIGURE_ENV+=	YACC=bison
 
 pre-configure:
@@ -24,17 +24,17 @@ pre-configure:
 
 .include "../../mk/bsd.prefs.mk"
 
-.ifdef IRRD_USE_PGP
-.if ${IRRD_USE_PGP} == 5
+.if defined(IRRD_USE_PGP) && ${IRRD_USE_PGP} == 5
 DEPENDS+=	pgp-5.*:../../security/pgp5
-.elif ${IRRD_USE_PGP} == 2
+.elif defined(IRRD_USE_PGP) && ${IRRD_USE_PGP} == 2
 DEPENDS+=	pgp-2.*:../../security/pgp2
-#.else
+.else
 CONFIGURE_ARGS+= --without-pgp
 .endif
-.endif
 
-.ifndef USE_INET6
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
 CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
-- 
cgit v1.2.3