Relax need to put GNU_CONFIGURE before inclusion of bsd.prefs.mk:

Convert _OPSYS_MAX_CMDLEN to a plain _OPSYS_MAX_CMDLEN_CMD variable, which
is not evaluated by a shell until CONFIGURE_ENV is expanded (and only then
if USE_LIBTOOL+GNU_CONFIGURE are both set).

13 files changed, 27 insertions, 49 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index d3ad9cd1898..0cfe719e99c 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1573 2005/01/25 13:13:35 jmmv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1574 2005/01/25 18:15:58 tv Exp $
 #
 # This file is in the public domain.
 #
@@ -378,8 +378,8 @@ CONFIG_SHELL?=		${SH}
 CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
 CONFIGURE_ENV+=		LIBS=${LIBS:Q}
 CONFIGURE_ENV+=		install_sh=${INSTALL:Q}
-.  if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN)
-CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN}
+.  if defined(USE_LIBTOOL) && defined(_OPSYS_MAX_CMDLEN_CMD)
+CONFIGURE_ENV+=		lt_cv_sys_max_cmd_len=${_OPSYS_MAX_CMDLEN_CMD:sh}
 .  endif
 .endif
 
diff --git a/mk/platform/AIX.mk b/mk/platform/AIX.mk
index f4ff35403fe..5695de6b973 100644
--- a/mk/platform/AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: AIX.mk,v 1.5 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: AIX.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -174,9 +174,7 @@ SERIAL_DEVICES?=	/dev/tty0 \
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
-#.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-#_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/BSDOS.mk b/mk/platform/BSDOS.mk
index 9dbc0222170..4f03ea31373 100644
--- a/mk/platform/BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: BSDOS.mk,v 1.5 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: BSDOS.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -162,9 +162,7 @@ PKG_CREATE_USERGROUP=	NO # until it works
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
-#.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-#_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/Darwin.mk b/mk/platform/Darwin.mk
index 2bb9a32450b..8714595710f 100644
--- a/mk/platform/Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Darwin.mk,v 1.5 2004/12/20 13:09:04 grant Exp $
+# $NetBSD: Darwin.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -153,9 +153,7 @@ LOCALBASE?=		${DESTDIR}/usr/pkg
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-_OPSYS_MAX_CMDLEN!=	/usr/sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD=	/usr/sbin/sysctl -n kern.argmax
 
 # Darwin 7.7.x has poll() in libc, but no poll.h. Try to help GNU
 # configure packages that break because of this by pretending that
diff --git a/mk/platform/DragonFly.mk b/mk/platform/DragonFly.mk
index 4243eb93e72..d0b11faa24c 100644
--- a/mk/platform/DragonFly.mk
+++ b/mk/platform/DragonFly.mk
@@ -1,4 +1,4 @@
-# $NetBSD: DragonFly.mk,v 1.7 2005/01/12 21:11:41 recht Exp $
+# $NetBSD: DragonFly.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the DragonFly operating system.
 
@@ -158,9 +158,7 @@ PKG_HAVE_KQUEUE=	# defined
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/FreeBSD.mk b/mk/platform/FreeBSD.mk
index e1a3b3c5307..ab567b31d60 100644
--- a/mk/platform/FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: FreeBSD.mk,v 1.5 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -157,9 +157,7 @@ PKG_HAVE_KQUEUE=	# defined
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk
index d064b7c7238..d6f9c1c957e 100644
--- a/mk/platform/IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.mk,v 1.7 2004/12/27 06:41:50 jlam Exp $
+# $NetBSD: IRIX.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -167,9 +167,7 @@ LIBABISUFFIX=		${ABI}
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-_OPSYS_MAX_CMDLEN!=	/usr/sbin/sysconf ARG_MAX
-.endif
+_OPSYS_MAX_CMDLEN_CMD=	/usr/sbin/sysconf ARG_MAX
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/Interix.mk b/mk/platform/Interix.mk
index dbddeca5a2d..b89c5ae4d33 100644
--- a/mk/platform/Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Interix.mk,v 1.21 2005/01/24 21:47:00 tv Exp $
+# $NetBSD: Interix.mk,v 1.22 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -195,7 +195,7 @@ CONFIGURE_ENV+=		${GNU_CONFIGURE:Dac_cv_header_poll_h=no ac_cv_func_poll=no}
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-_OPSYS_MAX_CMDLEN=	262144
+_OPSYS_MAX_CMDLEN_CMD=	${ECHO} 262144
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/Linux.mk b/mk/platform/Linux.mk
index 383fe6bdc2c..4593f0949dd 100644
--- a/mk/platform/Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: Linux.mk,v 1.6 2004/12/29 23:19:43 minskim Exp $
+# $NetBSD: Linux.mk,v 1.7 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -195,9 +195,7 @@ LOCALBASE?=		${DESTDIR}/usr/pkg
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
-#.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-#_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/NetBSD.mk b/mk/platform/NetBSD.mk
index 50cd35d98c9..6879f692129 100644
--- a/mk/platform/NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.mk,v 1.5 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: NetBSD.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -201,9 +201,7 @@ PKG_HAVE_KQUEUE=	# defined
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/OpenBSD.mk b/mk/platform/OpenBSD.mk
index 0449a80adb9..0e406c959a8 100644
--- a/mk/platform/OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: OpenBSD.mk,v 1.9 2004/12/27 08:38:09 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.10 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -167,9 +167,7 @@ SERIAL_DEVICES?=	/dev/null
 
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
-.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-.endif
+_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/SunOS.mk b/mk/platform/SunOS.mk
index 24b0c08ba17..e681f077ca0 100644
--- a/mk/platform/SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: SunOS.mk,v 1.7 2004/11/16 18:04:00 tv Exp $
+# $NetBSD: SunOS.mk,v 1.8 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -191,9 +191,7 @@ PKG_TOOLS_BIN?=		${LOCALBASE}/bin
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
-#.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-#_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).
diff --git a/mk/platform/UnixWare.mk b/mk/platform/UnixWare.mk
index ded1efaf3ce..0b7b54733cd 100644
--- a/mk/platform/UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: UnixWare.mk,v 1.5 2004/12/01 09:53:01 wiz Exp $
+# $NetBSD: UnixWare.mk,v 1.6 2005/01/25 18:15:58 tv Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -160,9 +160,7 @@ PKG_TOOLS_BIN?=		${LOCALBASE}/sbin
 # check for maximum command line length and set it in configure's environment,
 # to avoid a test required by the libtool script that takes forever.
 # FIXME: Adjust to work on this system and enable the lines below.
-#.if defined(GNU_CONFIGURE) && defined(USE_LIBTOOL)
-#_OPSYS_MAX_CMDLEN!=	/sbin/sysctl -n kern.argmax
-#.endif
+#_OPSYS_MAX_CMDLEN_CMD=	/sbin/sysctl -n kern.argmax
 
 # If games are to be installed setgid, then SETGIDGAME is set to 'yes'
 # (it defaults to 'no' as per bsd.pkg.defaults.mk).