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).

7 files changed, 22 insertions, 14 deletions

diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index b06fd741612..ab7a215b889 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:22 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:03 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -45,9 +45,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.SDL}
 BUILDLINK_CONFIG.SDL=		${BUILDLINK_PREFIX.SDL}/bin/sdl-config
 BUILDLINK_CONFIG_WRAPPER.SDL=	${BUILDLINK_DIR}/bin/sdl-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 SDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.SDL}
 CONFIGURE_ENV+=		SDL_CONFIG="${SDL_CONFIG}"
+MAKE_ENV+=		SDL_CONFIG="${SDL_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.SDL}
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 2a678868380..78c074340a0 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.10 2001/07/27 13:33:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.11 2001/08/17 21:14:04 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -41,9 +41,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.glib}
 BUILDLINK_CONFIG.glib=		${BUILDLINK_PREFIX.glib}/bin/glib-config
 BUILDLINK_CONFIG_WRAPPER.glib=	${BUILDLINK_DIR}/bin/glib-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 GLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.glib}
 CONFIGURE_ENV+=		GLIB_CONFIG="${GLIB_CONFIG}"
+MAKE_ENV+=		GLIB_CONFIG="${GLIB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.glib}
diff --git a/devel/libnet/buildlink.mk b/devel/libnet/buildlink.mk
index 66e9bcdfa30..05f34791f76 100644
--- a/devel/libnet/buildlink.mk
+++ b/devel/libnet/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/27 13:33:24 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/08/17 21:14:05 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libnet.
 #
@@ -36,9 +36,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.libnet}
 BUILDLINK_CONFIG.libnet=	${BUILDLINK_PREFIX.libnet}/bin/libnet-config
 BUILDLINK_CONFIG_WRAPPER.libnet=${BUILDLINK_DIR}/bin/libnet-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 LIBNET_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libnet}
 CONFIGURE_ENV+=	LIBNET_CONFIG="${LIBNET_CONFIG}"
+MAKE_ENV+=	LIBNET_CONFIG="${LIBNET_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libnet}
diff --git a/devel/libusb/buildlink.mk b/devel/libusb/buildlink.mk
index a78dfcf77a4..93bec549453 100644
--- a/devel/libusb/buildlink.mk
+++ b/devel/libusb/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/07/24 11:17:46 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/08/17 21:14:06 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libusb.
 #
@@ -34,9 +34,10 @@ BUILDLINK_CONFIG.libusb=	\
 BUILDLINK_CONFIG_WRAPPER.libusb=	\
 			${BUILDLINK_DIR}/bin/libusb-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 LIBUSB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libusb}
 CONFIGURE_ENV+=		LIBUSB_CONFIG="${LIBUSB_CONFIG}"
+MAKE_ENV+=		LIBUSB_CONFIG="${LIBUSB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libusb}
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 78c45d138f0..5869a8a1954 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:25 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:06 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -34,9 +34,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.pcre}
 BUILDLINK_CONFIG.pcre=		${BUILDLINK_PREFIX.pcre}/bin/pcre-config
 BUILDLINK_CONFIG_WRAPPER.pcre=	${BUILDLINK_DIR}/bin/pcre-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 PCRE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pcre}
 CONFIGURE_ENV+=		PCRE_CONFIG="${PCRE_CONFIG}"
+MAKE_ENV+=		PCRE_CONFIG="${PCRE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.pcre}
diff --git a/devel/pth/buildlink.mk b/devel/pth/buildlink.mk
index 8cf1b728beb..23518822976 100644
--- a/devel/pth/buildlink.mk
+++ b/devel/pth/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:25 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:07 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pth.
 #
@@ -38,11 +38,13 @@ BUILDLINK_CONFIG_WRAPPER.pth=		${BUILDLINK_DIR}/bin/pth-config
 BUILDLINK_CONFIG.pth-pthread=		${BUILDLINK_PREFIX.pth}/bin/pthread-config
 BUILDLINK_CONFIG_WRAPPER.pth-pthread=	${BUILDLINK_DIR}/bin/pthread-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 PTH_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pth}
 PTHREAD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.pth-pthread}
 CONFIGURE_ENV+=		PTH_CONFIG="${PTH_CONFIG}"
 CONFIGURE_ENV+=		PTHREAD_CONFIG="${PTHREAD_CONFIG}"
+MAKE_ENV+=		PTH_CONFIG="${PTH_CONFIG}"
+MAKE_ENV+=		PTHREAD_CONFIG="${PTHREAD_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.pth}
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index 497266a5ada..cdf300fc3ca 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:26 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:08 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -35,9 +35,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.smpeg}
 BUILDLINK_CONFIG.smpeg=		${BUILDLINK_PREFIX.smpeg}/bin/smpeg-config
 BUILDLINK_CONFIG_WRAPPER.smpeg=	${BUILDLINK_DIR}/bin/smpeg-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 SMPEG_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.smpeg}
 CONFIGURE_ENV+=		SMPEG_CONFIG="${SMPEG_CONFIG}"
+MAKE_ENV+=		SMPEG_CONFIG="${SMPEG_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.smpeg}