If USE_CONFIG_WRAPPER is defined (implied by USE_BUILDLINK_ONLY), then

set FOO_CONFIG=${BUILDLINK_CONFIG_WRAPPER.foo} in both CONFIGURE_ENV and
MAKE_ENV.  We remove the check for GNU_CONFIGURE because if a package
Makefile includes the buildlink.mk file, then it most likely wants to use
the config script wrappers as well.  Change suggested by Hubert Feyrer
(hubertf) and Tomasz Luchowski (zuntum).

6 files changed, 18 insertions, 12 deletions

diff --git a/graphics/avifile-devel/buildlink.mk b/graphics/avifile-devel/buildlink.mk
index 9a566fb91ce..ac1177e2557 100644
--- a/graphics/avifile-devel/buildlink.mk
+++ b/graphics/avifile-devel/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/08/10 18:29:35 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/08/17 21:14:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile-devel.
 #
@@ -34,9 +34,10 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.avifile-devel}
 BUILDLINK_CONFIG.avifile-devel=	${BUILDLINK_PREFIX.avifile-devel}/bin/avifile-config
 BUILDLINK_CONFIG_WRAPPER.avifile-devel=${BUILDLINK_DIR}/bin/avifile-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 AVIFILE-DEVEL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.avifile-devel}
 CONFIGURE_ENV+=			AVIFILE-DEVEL_CONFIG="${AVIFILE-DEVEL_CONFIG}"
+MAKE_ENV+=			AVIFILE-DEVEL_CONFIG="${AVIFILE-DEVEL_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.avifile-devel}
diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk
index 44a13a8e6fd..308cca66aef 100644
--- a/graphics/avifile/buildlink.mk
+++ b/graphics/avifile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:09 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile.
 #
@@ -33,9 +33,10 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.avifile}
 BUILDLINK_CONFIG.avifile=	${BUILDLINK_PREFIX.avifile}/bin/avifile-config
 BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 AVIFILE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.avifile}
 CONFIGURE_ENV+=			AVIFILE_CONFIG="${AVIFILE_CONFIG}"
+MAKE_ENV+=			AVIFILE_CONFIG="${AVIFILE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.avifile}
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index f16eab70b62..05530711a50 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:10 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
@@ -47,9 +47,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ClanLib}
 BUILDLINK_CONFIG.ClanLib=	${BUILDLINK_PREFIX.ClanLib}/bin/clanlib-config
 BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 CLANLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.ClanLib}
 CONFIGURE_ENV+=			CLANLIB_CONFIG="${CLANLIB_CONFIG}"
+MAKE_ENV+=			CLANLIB_CONFIG="${CLANLIB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.ClanLib}
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index 5f4bfe3f742..19f80e2c58f 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/07/27 13:33:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/08/17 21:14:11 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype2.
 #
@@ -82,9 +82,10 @@ freetype2-buildlink-config:
 	fi
 .endif	# _NEED_FREETYPE2
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 FREETYPE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.freetype2}
 CONFIGURE_ENV+=		FREETYPE_CONFIG="${FREETYPE_CONFIG}"
+MAKE_ENV+=		FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.freetype2}
diff --git a/graphics/gdk-pixbuf/buildlink.mk b/graphics/gdk-pixbuf/buildlink.mk
index 3e65443c11c..109993f0064 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:28 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:11 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf.
 #
@@ -39,9 +39,10 @@ BUILDLINK_CONFIG.gdk-pixbuf=	\
 BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf=	\
 			${BUILDLINK_DIR}/bin/gdk-pixbuf-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 GDK_PIXBUF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}
 CONFIGURE_ENV+=			GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
+MAKE_ENV+=			GDK_PIXBUF_CONFIG="${GDK_PIXBUF_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.gdk-pixbuf}
diff --git a/graphics/imlib/buildlink.mk b/graphics/imlib/buildlink.mk
index 55d7d13e415..caa9bd9db48 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:29 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:12 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imlib.
 #
@@ -45,9 +45,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.imlib}
 BUILDLINK_CONFIG.imlib=		${BUILDLINK_PREFIX.imlib}/bin/imlib-config
 BUILDLINK_CONFIG_WRAPPER.imlib=	${BUILDLINK_DIR}/bin/imlib-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 IMLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.imlib}
 CONFIGURE_ENV+=		IMLIB_CONFIG="${IMLIB_CONFIG}"
+MAKE_ENV+=		IMLIB_CONFIG="${IMLIB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.imlib}