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

4 files changed, 12 insertions, 8 deletions

diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index 8bc3a083f4b..f2033372e0a 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use esound.
 #
@@ -34,9 +34,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.esound}
 BUILDLINK_CONFIG.esound=	${BUILDLINK_PREFIX.esound}/bin/esd-config
 BUILDLINK_CONFIG_WRAPPER.esound=	${BUILDLINK_DIR}/bin/esd-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 ESD_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.esound}
 CONFIGURE_ENV+=		ESD_CONFIG="${ESD_CONFIG}"
+MAKE_ENV+=		ESD_CONFIG="${ESD_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.esound}
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index 24f86a8ed1a..004d7c4cbee 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libaudiofile.
 #
@@ -36,9 +36,10 @@ BUILDLINK_CONFIG.audiofile=	\
 BUILDLINK_CONFIG_WRAPPER.audiofile=	\
 			${BUILDLINK_DIR}/bin/audiofile-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 AUDIOFILE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.audiofile}
 CONFIGURE_ENV+=		AUDIOFILE_CONFIG="${AUDIOFILE_CONFIG}"
+MAKE_ENV+=		AUDIOFILE_CONFIG="${AUDIOFILE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.audiofile}
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index a8863d502f5..88b472b70de 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:19 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:02 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmikmod.
 #
@@ -34,9 +34,10 @@ BUILDLINK_CONFIG.libmikmod=	\
 BUILDLINK_CONFIG_WRAPPER.libmikmod=	\
 			${BUILDLINK_DIR}/bin/libmikmod-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 LIBMIKMOD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libmikmod}
 CONFIGURE_ENV+=		LIBMIKMOD_CONFIG="${LIBMIKMOD_CONFIG}"
+MAKE_ENV+=		LIBMIKMOD_CONFIG="${LIBMIKMOD_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libmikmod}
diff --git a/audio/xmms/buildlink.mk b/audio/xmms/buildlink.mk
index 47dafa89a41..24d853eb89f 100644
--- a/audio/xmms/buildlink.mk
+++ b/audio/xmms/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/08/16 04:25:23 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/08/17 21:14:02 jlam Exp $
 #
 # This Makefile fragment is included by packages that use xmms.
 #
@@ -39,9 +39,10 @@ BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.xmms}
 BUILDLINK_CONFIG.xmms=		${BUILDLINK_PREFIX.xmms}/bin/xmms-config
 BUILDLINK_CONFIG_WRAPPER.xmms=	${BUILDLINK_DIR}/bin/xmms-config
 
-.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
+.if defined(USE_CONFIG_WRAPPER)
 XMMS_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.xmms}
 CONFIGURE_ENV+=		XMMS_CONFIG="${XMMS_CONFIG}"
+MAKE_ENV+=		XMMS_CONFIG="${XMMS_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.xmms}