[src/trunk]: src/usr.sbin/bind Only #define WANT_IPV6 if ${USE_INET6} != "no".

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c8a8baec7cad
branches:  trunk
changeset: 572675:c8a8baec7cad
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Jan 10 03:01:18 2005 +0000

description:
Only #define WANT_IPV6 if ${USE_INET6} != "no".

diffstat:

 usr.sbin/bind/Makefile.inc     |  6 +++++-
 usr.sbin/bind/include/config.h |  4 +++-
 usr.sbin/bind/libisc/Makefile  |  7 ++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diffs (59 lines):

diff -r 583e2baf1dc3 -r c8a8baec7cad usr.sbin/bind/Makefile.inc
--- a/usr.sbin/bind/Makefile.inc        Mon Jan 10 02:58:58 2005 +0000
+++ b/usr.sbin/bind/Makefile.inc        Mon Jan 10 03:01:18 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.18 2004/05/23 03:16:40 lukem Exp $
+#      $NetBSD: Makefile.inc,v 1.19 2005/01/10 03:01:18 lukem Exp $
 
 .if !defined(BIND9_MAKEFILE_INC)
 BIND9_MAKEFILE_INC=yes
@@ -29,6 +29,10 @@
        -DNS_SYSCONFDIR=\"${SYSCONFDIR}\" \
        -DVERSION=\"${VERSION}\"
 
+.if (${USE_INET6} != "no")
+CPPFLAGS+=     -DWANT_IPV6
+.endif
+
 .if !defined(LIB) || empty(LIB)                                                # {
 # NOTE: the order of these libraries is important...
 .for _LL in    bind9 dns lwres isccfg isccc isc
diff -r 583e2baf1dc3 -r c8a8baec7cad usr.sbin/bind/include/config.h
--- a/usr.sbin/bind/include/config.h    Mon Jan 10 02:58:58 2005 +0000
+++ b/usr.sbin/bind/include/config.h    Mon Jan 10 03:01:18 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: config.h,v 1.2 2004/11/07 01:12:56 christos Exp $      */
+/*     $NetBSD: config.h,v 1.3 2005/01/10 03:01:18 lukem Exp $ */
 
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Generated from configure.in by autoheader.  */
@@ -85,8 +85,10 @@
  */
 /* #undef CALL_PTHREAD_SETCONCURRENCY */
 
+#if 0  /* We'll define this in each Makefile as necessary */
 /* define if IPv6 is not disabled */
 #define WANT_IPV6 1
+#endif
 
 /* define if flockfile() is available */
 #define HAVE_FLOCKFILE 1
diff -r 583e2baf1dc3 -r c8a8baec7cad usr.sbin/bind/libisc/Makefile
--- a/usr.sbin/bind/libisc/Makefile     Mon Jan 10 02:58:58 2005 +0000
+++ b/usr.sbin/bind/libisc/Makefile     Mon Jan 10 03:01:18 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2004/05/18 00:06:58 christos Exp $
+#      $NetBSD: Makefile,v 1.2 2005/01/10 03:01:18 lukem Exp $
 
 LIB=isc
 
@@ -31,4 +31,9 @@
                task.c taskpool.c timer.c version.c ${UNIX_SRCS} \
                ${NLS_SRCS} ${PTHREAD_SRCS}
 
+.if (${USE_INET6} == "no")
+CPPFLAGS.net.c=        -Wno-error
+SRCS+=         ipv6.c
+.endif
+
 .include <bsd.lib.mk>