Introduce _OPSYS_HAS_INET6, and use it to determine the default

value of USE_INET6.

8 files changed, 50 insertions, 25 deletions

diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 49fd9b3d271..2cb550d7898 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.96 2002/12/15 01:15:24 taca Exp $
+# $NetBSD: bsd.prefs.mk,v 1.97 2002/12/18 06:18:14 schmonz Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -193,23 +193,6 @@ SHAREMODE?=		${DOCMODE}
 	@${FALSE}
 .endif
 
-# if the system is IPv6-ready, compile with IPv6 support turned on.
-.if (${OPSYS} == "NetBSD") && !defined(USE_SOCKS) && \
-    exists(/usr/include/netinet6)
-USE_INET6?=		YES
-.elif ${OPSYS} == "SunOS" && exists(/usr/include/netinet/ip6.h)
-USE_INET6?=		YES
-.elif ${OPSYS} == "Darwin"
-.  if ${OS_VERSION} < 6.0
-USE_INET6?=		NO
-.  endif
-# other KAME
-.elif exists(/usr/include/netinet6)
-USE_INET6?=		YES
-.else
-USE_INET6?=		NO
-.endif
-
 # Preload all default values for CFLAGS, LDFLAGS, etc. before bsd.pkg.mk
 # or a pkg Makefile modifies them.
 .include <sys.mk>
@@ -230,6 +213,13 @@ USE_INET6?=		NO
 .include "${.CURDIR}/mk/defs.NetBSD.mk"
 .endif
 
+# if the system is IPv6-ready, compile with IPv6 support turned on.
+.if empty(_OPSYS_HAS_INET6:M[nN][oO]) && !defined(USE_SOCKS)
+USE_INET6?=		YES
+.else
+USE_INET6?=		NO
+.endif
+
 LOCALBASE?=		${DESTDIR}/usr/pkg
 .if ${OPSYS} == "SunOS"
 # On Solaris, we default to using OpenWindows for X11.
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index b96729d53c7..480580c858d 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.40 2002/12/16 09:18:56 salo Exp $
+# $NetBSD: defs.Darwin.mk,v 1.41 2002/12/18 06:18:14 schmonz Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -85,6 +85,11 @@ PKG_CREATE_USERGROUP?=	NO				# XXX - Until then
 _DO_SHLIB_CHECKS=	yes	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
+.if ${OS_VERSION} >= 6.0
+_OPSYS_HAS_INET6=	yes	# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	yes	# Java is standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 56f3042a7a3..6191c8afb5d 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.12 2002/12/16 09:18:56 salo Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.13 2002/12/18 06:18:14 schmonz Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -97,6 +97,11 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
+.if exists(/usr/include/netinet6)
+_OPSYS_HAS_INET6=	yes	# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 5e9173e2b55..c0ce7c02823 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.12 2002/12/16 09:18:57 salo Exp $
+# $NetBSD: defs.IRIX.mk,v 1.13 2002/12/18 06:18:14 schmonz Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -97,6 +97,11 @@ USERADD?=		${FALSE}
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}		# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make is not standard
+.if exists(/usr/include/netinet6)
+_OPSYS_HAS_INET6=	yes		# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no		# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	no		# Java is not standard
 _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 30db838cb1d..c62bc4f63ff 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.41 2002/12/16 09:18:57 salo Exp $
+# $NetBSD: defs.Linux.mk,v 1.42 2002/12/18 06:18:14 schmonz Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -87,6 +87,11 @@ ZOULARISBASE?=		/usr/pkg
 _DO_SHLIB_CHECKS=	no	# on installation, fixup PLIST for shared libs
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	yes	# GNU make is standard
+.if exists(/usr/include/netinet6)
+_OPSYS_HAS_INET6=	yes	# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 3bb59a18a10..fd2090e897d 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.41 2002/12/16 09:18:57 salo Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.42 2002/12/18 06:18:15 schmonz Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -97,6 +97,11 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
+.if exists(/usr/include/netinet6)
+_OPSYS_HAS_INET6=	yes	# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index a14bdeb2e71..a6c853c1d32 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.10 2002/12/16 09:18:57 salo Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.11 2002/12/18 06:18:15 schmonz Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -97,6 +97,11 @@ ULIMIT_CMD_memorysize?=	ulimit -m `ulimit -H -m`
 _DO_SHLIB_CHECKS=	yes	# fixup PLIST for shared libs/run ldconfig
 _IMAKE_MAKE=		${MAKE}	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no	# GNU make is not standard
+.if exists(/usr/include/netinet6)
+_OPSYS_HAS_INET6=	yes	# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no	# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	no	# Java is not standard
 _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index 695f5d787b8..029ad7abf87 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.46 2002/12/16 09:18:57 salo Exp $
+# $NetBSD: defs.SunOS.mk,v 1.47 2002/12/18 06:18:15 schmonz Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -101,6 +101,11 @@ USERADD?=		/usr/sbin/useradd
 _DO_SHLIB_CHECKS=	yes		# fixup PLIST for shared libs
 _IMAKE_MAKE=	/usr/ccs/bin/make	# program which gets invoked by imake
 _OPSYS_HAS_GMAKE=	no		# GNU make is not standard
+.if exists(/usr/include/netinet/ip6.h)
+_OPSYS_HAS_INET6=	yes		# IPv6 is standard
+.else
+_OPSYS_HAS_INET6=	no		# IPv6 is not standard
+.endif
 _OPSYS_HAS_JAVA=	no		# Java is not standard
 _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available