Allow overriding of *_CONFIG variables in a package Makefile when using

USE_BUILDLINK_ONLY.

19 files changed, 67 insertions, 44 deletions

diff --git a/audio/esound/buildlink.mk b/audio/esound/buildlink.mk
index 2b92a4a15c8..263a6994d69 100644
--- a/audio/esound/buildlink.mk
+++ b/audio/esound/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:56 jlam Exp $
 #
 # This Makefile fragment is included by packages that use esound.
 #
@@ -34,7 +34,8 @@ BUILDLINK_CONFIG.esound=		${LOCALBASE}/bin/esd-config
 BUILDLINK_CONFIG_WRAPPER.esound=	${BUILDLINK_DIR}/bin/esd-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		ESD_CONFIG="${BUILDLINK_CONFIG_WRAPPER.esound}"
+ESD_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.esound}
+CONFIGURE_ENV+=		ESD_CONFIG="${ESD_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.esound}
diff --git a/audio/libaudiofile/buildlink.mk b/audio/libaudiofile/buildlink.mk
index 0dd29ce4251..771cdf90692 100644
--- a/audio/libaudiofile/buildlink.mk
+++ b/audio/libaudiofile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:09 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libaudiofile.
 #
@@ -35,7 +35,8 @@ BUILDLINK_CONFIG_WRAPPER.audiofile=	\
 				${BUILDLINK_DIR}/bin/audiofile-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		AUDIOFILE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.audiofile}"
+AUDIOFILE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.audiofile}
+CONFIGURE_ENV+=		AUDIOFILE_CONFIG="${AUDIOFILE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.audiofile}
diff --git a/audio/libmikmod/buildlink.mk b/audio/libmikmod/buildlink.mk
index b0a4d31a785..3ffa6933417 100644
--- a/audio/libmikmod/buildlink.mk
+++ b/audio/libmikmod/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:10 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libmikmod.
 #
@@ -32,7 +32,8 @@ BUILDLINK_CONFIG.libmikmod=		${LOCALBASE}/bin/libmikmod-config
 BUILDLINK_CONFIG_WRAPPER.libmikmod=	${BUILDLINK_DIR}/bin/libmikmod-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		LIBMIKMOD_CONFIG="${BUILDLINK_CONFIG_WRAPPER.libmikmod}"
+LIBMIKMOD_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.libmikmod}
+CONFIGURE_ENV+=		LIBMIKMOD_CONFIG="${LIBMIKMOD_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libmikmod}
diff --git a/devel/SDL/buildlink.mk b/devel/SDL/buildlink.mk
index 3ce0a91b2eb..168a2b4e986 100644
--- a/devel/SDL/buildlink.mk
+++ b/devel/SDL/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:14 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use SDL.
 #
@@ -27,6 +27,9 @@ BUILDLINK_FILES.SDL+=	lib/libSDLmain.*
 
 .include "../../mk/bsd.prefs.mk"
 
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
+
 .if defined(SDL_USE_NAS)
 .include "../../audio/nas/buildlink.mk
 .endif
@@ -42,11 +45,10 @@ BUILDLINK_CONFIG.SDL=		${LOCALBASE}/bin/sdl-config
 BUILDLINK_CONFIG_WRAPPER.SDL=	${BUILDLINK_DIR}/bin/sdl-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		SDL_CONFIG="${BUILDLINK_CONFIG_WRAPPER.SDL}"
+SDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.SDL}
+CONFIGURE_ENV+=		SDL_CONFIG="${SDL_CONFIG}"
 .endif
 
-REPLACE_BUILDLINK_SED+=		-e "s|${BUILDLINK_CONFIG_WRAPPER.SDL}|${BUILDLINK_CONFIG.SDL}|g"
-
 pre-configure: ${BUILDLINK_TARGETS.SDL}
 SDL-buildlink: _BUILDLINK_USE
 SDL-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
diff --git a/devel/glib/buildlink.mk b/devel/glib/buildlink.mk
index 1599e12b31d..3b9da15aca8 100644
--- a/devel/glib/buildlink.mk
+++ b/devel/glib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:15 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:57 jlam Exp $
 #
 # This Makefile fragment is included by packages that use glib.
 #
@@ -37,7 +37,8 @@ BUILDLINK_CONFIG.glib=		${LOCALBASE}/bin/glib-config
 BUILDLINK_CONFIG_WRAPPER.glib=	${BUILDLINK_DIR}/bin/glib-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		GLIB_CONFIG="${BUILDLINK_CONFIG_WRAPPER.glib}"
+GLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.glib}
+CONFIGURE_ENV+=		GLIB_CONFIG="${GLIB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.glib}
diff --git a/devel/pcre/buildlink.mk b/devel/pcre/buildlink.mk
index 9f660fcfd99..37f50253564 100644
--- a/devel/pcre/buildlink.mk
+++ b/devel/pcre/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:18 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:58 jlam Exp $
 #
 # This Makefile fragment is included by packages that use pcre.
 #
@@ -34,7 +34,8 @@ BUILDLINK_CONFIG.pcre=		${LOCALBASE}/bin/pcre-config
 BUILDLINK_CONFIG_WRAPPER.pcre=	${BUILDLINK_DIR}/bin/pcre-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		PCRE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.pcre}"
+PCRE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.pcre}
+CONFIGURE_ENV+=		PCRE_CONFIG="${PCRE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.pcre}
diff --git a/devel/smpeg/buildlink.mk b/devel/smpeg/buildlink.mk
index 307e10d60b4..b15db7b05eb 100644
--- a/devel/smpeg/buildlink.mk
+++ b/devel/smpeg/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:20 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:58 jlam Exp $
 #
 # This Makefile fragment is included by packages that use smpeg.
 #
@@ -35,7 +35,8 @@ BUILDLINK_CONFIG.smpeg=		${LOCALBASE}/bin/smpeg-config
 BUILDLINK_CONFIG_WRAPPER.smpeg=	${BUILDLINK_DIR}/bin/smpeg-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		SMPEG_CONFIG="${BUILDLINK_CONFIG_WRAPPER.smpeg}"
+SMPEG_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.smpeg}
+CONFIGURE_ENV+=		SMPEG_CONFIG="${SMPEG_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.smpeg}
diff --git a/graphics/avifile/buildlink.mk b/graphics/avifile/buildlink.mk
index d162342cb3f..4f350ef4e12 100644
--- a/graphics/avifile/buildlink.mk
+++ b/graphics/avifile/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:21 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:58 jlam Exp $
 #
 # This Makefile fragment is included by packages that use avifile.
 #
@@ -33,7 +33,8 @@ BUILDLINK_CONFIG.avifile=	${LOCALBASE}/bin/avifile-config
 BUILDLINK_CONFIG_WRAPPER.avifile=${BUILDLINK_DIR}/bin/avifile-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=			AVIFILE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.avifile}"
+AVIFILE_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.avifile}
+CONFIGURE_ENV+=			AVIFILE_CONFIG="${AVIFILE_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.avifile}
diff --git a/graphics/clanlib/buildlink.mk b/graphics/clanlib/buildlink.mk
index 97e13d8f26b..c853667a9d4 100644
--- a/graphics/clanlib/buildlink.mk
+++ b/graphics/clanlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:22 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:33:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ClanLib.
 #
@@ -41,13 +41,14 @@ BUILDLINK_FILES.ClanLib+=	include/ClanLib/png/*
 
 BUILDLINK_TARGETS.ClanLib=	ClanLib-buildlink
 BUILDLINK_TARGETS.ClanLib+=	ClanLib-buildlink-config-wrapper
-BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.ClanLib}
+BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.ClanLib}
 
 BUILDLINK_CONFIG.ClanLib=	${LOCALBASE}/bin/clanlib-config
 BUILDLINK_CONFIG_WRAPPER.ClanLib=${BUILDLINK_DIR}/bin/clanlib-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=			CLANLIB_CONFIG="${BUILDLINK_CONFIG_WRAPPER.ClanLib}"
+CLANLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.ClanLib}
+CONFIGURE_ENV+=			CLANLIB_CONFIG="${CLANLIB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.ClanLib}
diff --git a/graphics/freetype2/buildlink.mk b/graphics/freetype2/buildlink.mk
index 43fd6775a2b..825cd728825 100644
--- a/graphics/freetype2/buildlink.mk
+++ b/graphics/freetype2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:22 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use freetype2.
 #
@@ -38,7 +38,8 @@ BUILDLINK_CONFIG.freetype2=	${LOCALBASE}/bin/freetype-config
 BUILDLINK_CONFIG_WRAPPER.freetype2=	${BUILDLINK_DIR}/bin/freetype-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		FREETYPE_CONFIG="${BUILDLINK_CONFIG_WRAPPER.freetype2}"
+FREETYPE_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.freetype2}
+CONFIGURE_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 14b93d668ed..6997520a173 100644
--- a/graphics/gdk-pixbuf/buildlink.mk
+++ b/graphics/gdk-pixbuf/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/01 22:59:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:33:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gdk-pixbuf.
 #
@@ -37,7 +37,8 @@ BUILDLINK_CONFIG.gdk-pixbuf=		${X11PREFIX}/bin/gdk-pixbuf-config
 BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf=	${BUILDLINK_DIR}/bin/gdk-pixbuf-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=	GDK_PIXBUF_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}"
+GDK_PIXBUF_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gdk-pixbuf}
+CONFIGURE_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 33d0ae7932a..57c23a53049 100644
--- a/graphics/imlib/buildlink.mk
+++ b/graphics/imlib/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:23 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:33:59 jlam Exp $
 #
 # This Makefile fragment is included by packages that use imlib.
 #
@@ -45,7 +45,8 @@ BUILDLINK_CONFIG.imlib=		${X11PREFIX}/bin/imlib-config
 BUILDLINK_CONFIG_WRAPPER.imlib=	${BUILDLINK_DIR}/bin/imlib-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		IMLIB_CONFIG="${BUILDLINK_CONFIG_WRAPPER.imlib}"
+IMLIB_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.imlib}
+CONFIGURE_ENV+=		IMLIB_CONFIG="${IMLIB_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.imlib}
diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk
index 41576d23aeb..563b03a767a 100644
--- a/net/ORBit/buildlink.mk
+++ b/net/ORBit/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:27 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:34:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use ORBit.
 #
@@ -52,8 +52,10 @@ BUILDLINK_CONFIG.orbit=			${LOCALBASE}/bin/orbit-config
 BUILDLINK_CONFIG_WRAPPER.orbit=		${BUILDLINK_DIR}/bin/orbit-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		LIBIDL_CONFIG="${BUILDLINK_CONFIG_WRAPPER.libIDL}"
-CONFIGURE_ENV+=		ORBIT_CONFIG="${BUILDLINK_CONFIG_WRAPPER.orbit}"
+LIBIDL_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libIDL}
+ORBIT_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.orbit}
+CONFIGURE_ENV+=		LIBIDL_CONFIG="${LIBIDL_CONFIG}"
+CONFIGURE_ENV+=		ORBIT_CONFIG="${ORBIT_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.ORBit}
diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk
index dcac136782e..327b9f7739a 100644
--- a/textproc/libxml/buildlink.mk
+++ b/textproc/libxml/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.3 2001/07/01 22:59:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.4 2001/07/02 05:34:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml.
 #
@@ -35,7 +35,8 @@ BUILDLINK_CONFIG.libxml=		${LOCALBASE}/bin/xml-config
 BUILDLINK_CONFIG_WRAPPER.libxml=	${BUILDLINK_DIR}/bin/xml-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		XML_CONFIG="${BUILDLINK_CONFIG_WRAPPER.libxml}"
+XML_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libxml}
+CONFIGURE_ENV+=		XML_CONFIG="${XML_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libxml}
diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk
index dbc2a531ba1..f1e89f11fcf 100644
--- a/textproc/libxml2/buildlink.mk
+++ b/textproc/libxml2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:34:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libxml2.
 #
@@ -36,7 +36,8 @@ BUILDLINK_CONFIG.libxml2=		${LOCALBASE}/bin/xml2-config
 BUILDLINK_CONFIG_WRAPPER.libxml2=	${BUILDLINK_DIR}/bin/xml2-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		XML2_CONFIG="${BUILDLINK_CONFIG_WRAPPER.libxml2}"
+XML2_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libxml2}
+CONFIGURE_ENV+=		XML2_CONFIG="${XML2_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libxml2}
diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk
index 41c776cf63f..7551fcb1d77 100644
--- a/www/libwww/buildlink.mk
+++ b/www/libwww/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.2 2001/07/01 22:59:31 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.3 2001/07/02 05:34:00 jlam Exp $
 #
 # This Makefile fragment is included by packages that use libwww.
 #
@@ -59,7 +59,8 @@ BUILDLINK_CONFIG.libwww=		${LOCALBASE}/bin/libwww-config
 BUILDLINK_CONFIG_WRAPPER.libwww=	${BUILDLINK_DIR}/bin/libwww-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		LIBWWW_CONFIG="${BUILDLINK_CONFIG_WRAPPER.libwww}"
+LIBWWW_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libwww}
+CONFIGURE_ENV+=		LIBWWW_CONFIG="${LIBWWW_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.libwww}
diff --git a/x11/gnome-libs/buildlink.mk b/x11/gnome-libs/buildlink.mk
index fb13f1b5d24..0d1cf28228b 100644
--- a/x11/gnome-libs/buildlink.mk
+++ b/x11/gnome-libs/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:16:30 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/02 05:34:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gnome-libs.
 #
@@ -61,8 +61,10 @@ BUILDLINK_CONFIG_WRAPPER.gnome-libs=	${BUILDLINK_DIR}/bin/gnome-config
 BUILDLINK_CONFIG_WRAPPER.libart=	${BUILDLINK_DIR}/bin/libart-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		GNOME_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gnome-libs}"
-CONFIGURE_ENV+=		LIBART_CONFIG="${BUILDLINK_CONFIG_WRAPPER.libart}"
+GNOME_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gnome-libs}
+LIBART_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.libart}
+CONFIGURE_ENV+=		GNOME_CONFIG="${GNOME_CONFIG}"
+CONFIGURE_ENV+=		LIBART_CONFIG="${LIBART_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.gnome-libs}
diff --git a/x11/gtk/buildlink.mk b/x11/gtk/buildlink.mk
index 5af7d6414b0..fdf558914c3 100644
--- a/x11/gtk/buildlink.mk
+++ b/x11/gtk/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:11:37 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.6 2001/07/02 05:34:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use gtk.
 #
@@ -41,7 +41,8 @@ BUILDLINK_CONFIG.gtk=		${X11PREFIX}/bin/gtk-config
 BUILDLINK_CONFIG_WRAPPER.gtk=	${BUILDLINK_DIR}/bin/gtk-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		GTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.gtk}"
+GTK_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.gtk}
+CONFIGURE_ENV+=		GTK_CONFIG="${GTK_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.gtk}
diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk
index 50005f82195..6508670d20a 100644
--- a/x11/wxGTK/buildlink.mk
+++ b/x11/wxGTK/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2001/07/02 04:41:57 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.5 2001/07/02 05:34:01 jlam Exp $
 #
 # This Makefile fragment is included by packages that use wxGTK.
 #
@@ -49,8 +49,10 @@ BUILDLINK_CONFIG_WRAPPER.wxGTK-1=	${BUILDLINK_DIR}/bin/wx-config
 BUILDLINK_CONFIG_WRAPPER.wxGTK-2=	${BUILDLINK_DIR}/bin/wxgtk-config
 
 .if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE)
-CONFIGURE_ENV+=		WX_CONFIG="${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}"
-CONFIGURE_ENV+=		WXGTK_CONFIG="${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}"
+WX_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.wxGTK-1}
+WXGTK_CONFIG?=		${BUILDLINK_CONFIG_WRAPPER.wxGTK-2}
+CONFIGURE_ENV+=		WX_CONFIG="${WX_CONFIG}"
+CONFIGURE_ENV+=		WXGTK_CONFIG="${WXGTK_CONFIG}"
 .endif
 
 pre-configure: ${BUILDLINK_TARGETS.wxGTK}