From f8078a78a9737d0da422cd83573039caaef5bf2a Mon Sep 17 00:00:00 2001 From: jlam Date: Fri, 17 Aug 2001 21:14:00 +0000 Subject: 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). --- audio/esound/buildlink.mk | 5 +++-- audio/libaudiofile/buildlink.mk | 5 +++-- audio/libmikmod/buildlink.mk | 5 +++-- audio/xmms/buildlink.mk | 5 +++-- devel/SDL/buildlink.mk | 5 +++-- devel/glib/buildlink.mk | 5 +++-- devel/libnet/buildlink.mk | 5 +++-- devel/libusb/buildlink.mk | 5 +++-- devel/pcre/buildlink.mk | 5 +++-- devel/pth/buildlink.mk | 6 ++++-- devel/smpeg/buildlink.mk | 5 +++-- graphics/avifile-devel/buildlink.mk | 5 +++-- graphics/avifile/buildlink.mk | 5 +++-- graphics/clanlib/buildlink.mk | 5 +++-- graphics/freetype2/buildlink.mk | 5 +++-- graphics/gdk-pixbuf/buildlink.mk | 5 +++-- graphics/imlib/buildlink.mk | 5 +++-- net/ORBit/buildlink.mk | 6 ++++-- print/pdflib/buildlink.mk | 5 +++-- textproc/libxml/buildlink.mk | 5 +++-- textproc/libxml2/buildlink.mk | 5 +++-- www/libwww/buildlink.mk | 5 +++-- x11/gnome-libs/buildlink.mk | 6 ++++-- x11/gtk/buildlink.mk | 5 +++-- x11/kdelibs2/buildlink.mk | 6 ++++-- x11/wxGTK/buildlink.mk | 6 ++++-- 26 files changed, 83 insertions(+), 52 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} 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} 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} diff --git a/net/ORBit/buildlink.mk b/net/ORBit/buildlink.mk index 49e312a6e0d..968a7cbce8c 100644 --- a/net/ORBit/buildlink.mk +++ b/net/ORBit/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:33 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:13 jlam Exp $ # # This Makefile fragment is included by packages that use ORBit. # @@ -52,11 +52,13 @@ BUILDLINK_CONFIG_WRAPPER.libIDL=${BUILDLINK_DIR}/bin/libIDL-config BUILDLINK_CONFIG.orbit= ${BUILDLINK_PREFIX.ORBit}/bin/orbit-config BUILDLINK_CONFIG_WRAPPER.orbit= ${BUILDLINK_DIR}/bin/orbit-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) LIBIDL_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libIDL} ORBIT_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.orbit} CONFIGURE_ENV+= LIBIDL_CONFIG="${LIBIDL_CONFIG}" CONFIGURE_ENV+= ORBIT_CONFIG="${ORBIT_CONFIG}" +MAKE_ENV+= LIBIDL_CONFIG="${LIBIDL_CONFIG}" +MAKE_ENV+= ORBIT_CONFIG="${ORBIT_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.ORBit} diff --git a/print/pdflib/buildlink.mk b/print/pdflib/buildlink.mk index 548237df068..055689c020b 100644 --- a/print/pdflib/buildlink.mk +++ b/print/pdflib/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.2 2001/07/29 05:45:57 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.3 2001/08/17 21:14:14 jlam Exp $ # # This Makefile fragment is included by packages that use pdflib. # @@ -35,9 +35,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.pdflib} BUILDLINK_CONFIG.pdflib= ${BUILDLINK_PREFIX.pdflib}/bin/pdflib-config BUILDLINK_CONFIG_WRAPPER.pdflib= ${BUILDLINK_DIR}/bin/pdflib-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) PDFLIB_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.pdflib} CONFIGURE_ENV+= PDFLIB_CONFIG="${PDFLIB_CONFIG}" +MAKE_ENV+= PDFLIB_CONFIG="${PDFLIB_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.pdflib} diff --git a/textproc/libxml/buildlink.mk b/textproc/libxml/buildlink.mk index d26fbe632f9..5c17755a3ad 100644 --- a/textproc/libxml/buildlink.mk +++ b/textproc/libxml/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:35 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:14 jlam Exp $ # # This Makefile fragment is included by packages that use libxml. # @@ -35,9 +35,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libxml} BUILDLINK_CONFIG.libxml= ${BUILDLINK_PREFIX.libxml}/bin/xml-config BUILDLINK_CONFIG_WRAPPER.libxml=${BUILDLINK_DIR}/bin/xml-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) XML_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libxml} CONFIGURE_ENV+= XML_CONFIG="${XML_CONFIG}" +MAKE_ENV+= XML_CONFIG="${XML_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.libxml} diff --git a/textproc/libxml2/buildlink.mk b/textproc/libxml2/buildlink.mk index 57e0dd50eaf..8dcb22b6ec8 100644 --- a/textproc/libxml2/buildlink.mk +++ b/textproc/libxml2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:35 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:15 jlam Exp $ # # This Makefile fragment is included by packages that use libxml2. # @@ -38,9 +38,10 @@ BUILDLINK_CONFIG.libxml2= \ BUILDLINK_CONFIG_WRAPPER.libxml2= \ ${BUILDLINK_DIR}/bin/xml2-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) XML2_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libxml2} CONFIGURE_ENV+= XML2_CONFIG="${XML2_CONFIG}" +MAKE_ENV+= XML2_CONFIG="${XML2_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.libxml2} diff --git a/www/libwww/buildlink.mk b/www/libwww/buildlink.mk index c41b14685ec..6f308a4acc5 100644 --- a/www/libwww/buildlink.mk +++ b/www/libwww/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.5 2001/07/27 13:33:36 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.6 2001/08/17 21:14:15 jlam Exp $ # # This Makefile fragment is included by packages that use libwww. # @@ -59,9 +59,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.libwww} BUILDLINK_CONFIG.libwww= ${BUILDLINK_PREFIX.libwww}/bin/libwww-config BUILDLINK_CONFIG_WRAPPER.libwww=${BUILDLINK_DIR}/bin/libwww-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) LIBWWW_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.libwww} CONFIGURE_ENV+= LIBWWW_CONFIG="${LIBWWW_CONFIG}" +MAKE_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 fd271875678..eceb13adfef 100644 --- a/x11/gnome-libs/buildlink.mk +++ b/x11/gnome-libs/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:37 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:16 jlam Exp $ # # This Makefile fragment is included by packages that use gnome-libs. # @@ -61,11 +61,13 @@ BUILDLINK_CONFIG.gnome-libs= ${BUILDLINK_PREFIX.gnome-libs}/bin/gnome-config 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) +.if defined(USE_CONFIG_WRAPPER) 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}" +MAKE_ENV+= GNOME_CONFIG="${GNOME_CONFIG}" +MAKE_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 3defafc412d..3ecdcd97243 100644 --- a/x11/gtk/buildlink.mk +++ b/x11/gtk/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.9 2001/07/27 13:33:37 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.10 2001/08/17 21:14:16 jlam Exp $ # # This Makefile fragment is included by packages that use gtk. # @@ -43,9 +43,10 @@ BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.gtk} BUILDLINK_CONFIG.gtk= ${BUILDLINK_PREFIX.gtk}/bin/gtk-config BUILDLINK_CONFIG_WRAPPER.gtk= ${BUILDLINK_DIR}/bin/gtk-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) GTK_CONFIG?= ${BUILDLINK_CONFIG_WRAPPER.gtk} CONFIGURE_ENV+= GTK_CONFIG="${GTK_CONFIG}" +MAKE_ENV+= GTK_CONFIG="${GTK_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.gtk} diff --git a/x11/kdelibs2/buildlink.mk b/x11/kdelibs2/buildlink.mk index 3801fb38c30..3f57df847cb 100644 --- a/x11/kdelibs2/buildlink.mk +++ b/x11/kdelibs2/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:38 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.7 2001/08/17 21:14:17 jlam Exp $ # # This Makefile fragment is included by packages that use kdelibs2. # @@ -49,11 +49,13 @@ BUILDLINK_CONFIG_WRAPPER.kdelibs2= ${BUILDLINK_DIR}/bin/kde-config BUILDLINK_CONFIG.kdelibs2-artsc= ${BUILDLINK_PREFIX.kdelibs2}/bin/artsc-config BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc= ${BUILDLINK_DIR}/bin/artsc-config -.if defined(USE_CONFIG_WRAPPER) && defined(GNU_CONFIGURE) +.if defined(USE_CONFIG_WRAPPER) ARTSCCONFIG?= ${BUILDLINK_CONFIG_WRAPPER.kdelibs2-artsc} KDECONFIG?= ${BUILDLINK_CONFIG_WRAPPER.kdelibs2} CONFIGURE_ENV+= ARTSCCONFIG="${ARTSCCONFIG}" CONFIGURE_ENV+= KDECONFIG="${KDECONFIG}" +MAKE_ENV+= ARTSCCONFIG="${ARTSCCONFIG}" +MAKE_ENV+= KDECONFIG="${KDECONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.kdelibs2} diff --git a/x11/wxGTK/buildlink.mk b/x11/wxGTK/buildlink.mk index 725ac83489b..c6a063451d2 100644 --- a/x11/wxGTK/buildlink.mk +++ b/x11/wxGTK/buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink.mk,v 1.7 2001/07/27 13:33:39 jlam Exp $ +# $NetBSD: buildlink.mk,v 1.8 2001/08/17 21:14:18 jlam Exp $ # # This Makefile fragment is included by packages that use wxGTK. # @@ -49,11 +49,13 @@ BUILDLINK_CONFIG.wxGTK-2= ${BUILDLINK_PREFIX.wxGTK}/bin/wxgtk-config 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) +.if defined(USE_CONFIG_WRAPPER) 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}" +MAKE_ENV+= WX_CONFIG="${WX_CONFIG}" +MAKE_ENV+= WXGTK_CONFIG="${WXGTK_CONFIG}" .endif pre-configure: ${BUILDLINK_TARGETS.wxGTK} -- cgit v1.2.3