buildlink1 -> buildlink2

5 files changed, 27 insertions, 344 deletions

diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 604b07db24c..124a0f60b25 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/09/10 16:06:51 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2002/09/21 22:56:28 jlam Exp $
 
 DISTNAME=		gtkhtml-1.0.1
 PKGREVISION=		2
@@ -10,31 +10,19 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Lightweight HTML rendering/printing/editing engine
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
-USE_LIBTOOL=		YES
 USE_GMAKE=		YES
 GNU_CONFIGURE=		YES
 
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-post-patch:
-	cd ${WRKSRC};							\
-	for file in							\
-		src/Makefile.in						\
-		capplet/Makefile.in					\
-		components/http-storage-module/Makefile.in;		\
-	do								\
-		${SED}	-e "s|[	 ]*-I\$$(includedir)||g"		\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
+.include "../../devel/bonobo/buildlink2.mk"
+.include "../../devel/gal/buildlink2.mk"
+.include "../../print/gnome-print/buildlink2.mk"
+.include "../../www/glibwww/buildlink2.mk"
+.include "../../www/libghttp/buildlink2.mk"
+.include "../../x11/controlcenter/buildlink2.mk"
 
-.include "../../devel/bonobo/buildlink.mk"
-.include "../../devel/gal/buildlink.mk"
-.include "../../print/gnome-print/buildlink.mk"
-.include "../../www/glibwww/buildlink.mk"
-.include "../../www/libghttp/buildlink.mk"
-.include "../../x11/controlcenter/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/gtkhtml/patches/patch-aa b/www/gtkhtml/patches/patch-aa
deleted file mode 100644
index 5a1b957e26b..00000000000
--- a/www/gtkhtml/patches/patch-aa
+++ /dev/null
@@ -1,205 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2002/04/10 16:56:13 jlam Exp $
-
---- configure.orig	Mon Dec 17 13:04:07 2001
-+++ configure
-@@ -1650,8 +1650,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 
--		ORBIT_CFLAGS=`orbit-config --cflags client server`
--		ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
-+		ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server`
-+		ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server`
- 
- 	else
-     		if test xfail = xfailure; then
-@@ -1669,8 +1669,8 @@
- 
- 		gnome_cv_gnorba_found=no
- 		if test x$gnome_cv_orbit_found = xyes; then
--			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 			if test -n "$GNORBA_LIBS"; then
- 				gnome_cv_gnorba_found=yes
- 			fi
-@@ -1689,8 +1689,8 @@
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 
--		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 
- 	else
- 	    	if test xfail = xfailure; then
-@@ -8775,7 +8775,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		INSTOBJEXT=.mo
-@@ -9176,8 +9176,8 @@
-   echo "$as_me:9176: checking for $dispname >= $dispvers" >&5
- echo $ECHO_N "checking for $dispname >= $dispvers... $ECHO_C" >&6
-   cmpvers=`echo $dispvers | awk -F. '{ print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
--  if gnome-config --libs $pkgname > /dev/null 2>&1; then
--    pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-+  if $GNOME_CONFIG --libs $pkgname > /dev/null 2>&1; then
-+    pkgvers=`$GNOME_CONFIG --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-   else
-     pkgvers=not
-   fi
-@@ -9204,8 +9204,8 @@
-   echo "$as_me:9204: checking for $dispname >= $dispvers" >&5
- echo $ECHO_N "checking for $dispname >= $dispvers... $ECHO_C" >&6
-   cmpvers=`echo $dispvers | awk -F. '{ print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
--  if gnome-config --libs $pkgname > /dev/null 2>&1; then
--    pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-+  if $GNOME_CONFIG --libs $pkgname > /dev/null 2>&1; then
-+    pkgvers=`$GNOME_CONFIG --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-   else
-     pkgvers=not
-   fi
-@@ -9232,8 +9232,8 @@
-   echo "$as_me:9232: checking for $dispname >= $dispvers" >&5
- echo $ECHO_N "checking for $dispname >= $dispvers... $ECHO_C" >&6
-   cmpvers=`echo $dispvers | awk -F. '{ print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
--  if gnome-config --libs $pkgname > /dev/null 2>&1; then
--    pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-+  if $GNOME_CONFIG --libs $pkgname > /dev/null 2>&1; then
-+    pkgvers=`$GNOME_CONFIG --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-   else
-     pkgvers=not
-   fi
-@@ -9260,8 +9260,8 @@
-   echo "$as_me:9260: checking for $dispname >= $dispvers" >&5
- echo $ECHO_N "checking for $dispname >= $dispvers... $ECHO_C" >&6
-   cmpvers=`echo $dispvers | awk -F. '{ print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
--  if gnome-config --libs $pkgname > /dev/null 2>&1; then
--    pkgvers=`gnome-config --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-+  if $GNOME_CONFIG --libs $pkgname > /dev/null 2>&1; then
-+    pkgvers=`$GNOME_CONFIG --modversion $pkgname | sed -e 's/^[^0-9]*//'`
-   else
-     pkgvers=not
-   fi
-@@ -9291,7 +9291,10 @@
- 
- if test "x$enable_xim" = "xyes"; then
- 	BACKUP_LDFLAGS=$LDFLAGS
--	LDFLAGS="$LDFLAGS `gtk-config --libs`"
-+	if test "x$GTK_CONFIG" = "x"; then
-+		GTK_CONFIG=gtk-config
-+	fi
-+	LDFLAGS="$LDFLAGS `$GTK_CONFIG --libs`"
- 	echo "$as_me:9295: checking for gdk_im_begin" >&5
- echo $ECHO_N "checking for gdk_im_begin... $ECHO_C" >&6
- if test "${ac_cv_func_gdk_im_begin+set}" = set; then
-@@ -9431,16 +9434,16 @@
- have_glibwww=false
- echo "$as_me:9432: checking for glibwww >= 0.2" >&5
- echo $ECHO_N "checking for glibwww >= 0.2... $ECHO_C" >&6
--if gnome-config --libs glibwww > /dev/null 2>&1; then
--	vers=`gnome-config --modversion glibwww | sed -e "s/glibwww-//" | \
-+if $GNOME_CONFIG --libs glibwww > /dev/null 2>&1; then
-+	vers=`$GNOME_CONFIG --modversion glibwww | sed -e "s/glibwww-//" | \
- 		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
- 
- 	if test "$vers" -ge 2; then
- 		echo "$as_me:9439: result: found" >&5
- echo "${ECHO_T}found" >&6
- 
--		GLIBWWW_CFLAGS="`gnome-config --cflags glibwww`"
--		GLIBWWW_LIBS="`gnome-config --libs glibwww` -lwwwhtml -lmd5"
-+		GLIBWWW_CFLAGS="`$GNOME_CONFIG --cflags glibwww`"
-+		GLIBWWW_LIBS="`$GNOME_CONFIG --libs glibwww` -lwwwhtml -lmd5"
- 
- 		have_glibwww=true
- 	else
-@@ -9473,16 +9476,16 @@
- have_ghttp=false
- echo "$as_me:9474: checking for libghttp >= 1.0" >&5
- echo $ECHO_N "checking for libghttp >= 1.0... $ECHO_C" >&6
--if gnome-config --libs ghttp > /dev/null 2>&1; then
--	vers=`gnome-config --modversion ghttp | sed -e "s/ghttp-//" | \
-+if $GNOME_CONFIG --libs ghttp > /dev/null 2>&1; then
-+	vers=`$GNOME_CONFIG --modversion ghttp | sed -e "s/ghttp-//" | \
- 		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
- 
- 	if test "$vers" -ge 1000; then
- 		echo "$as_me:9481: result: found" >&5
- echo "${ECHO_T}found" >&6
- 
--		GHTTP_CFLAGS="`gnome-config --cflags ghttp`"
--		GHTTP_LIBS="`gnome-config --libs ghttp`"
-+		GHTTP_CFLAGS="`$GNOME_CONFIG --cflags ghttp`"
-+		GHTTP_LIBS="`$GNOME_CONFIG --libs ghttp`"
- 
- 		have_ghttp=true
- 	else
-@@ -9533,8 +9536,8 @@
- 	echo "$as_me:9533: checking for Bonobo >= 0.32" >&5
- echo $ECHO_N "checking for Bonobo >= 0.32... $ECHO_C" >&6
- 
--	if gnome-config --libs bonobox > /dev/null 2>&1; then
--		vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \
-+	if $GNOME_CONFIG --libs bonobox > /dev/null 2>&1; then
-+		vers=`$GNOME_CONFIG --modversion bonobo | sed -e "s/bonobo-//" | \
- 			awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`
- 		if test "$vers" -ge 32; then
- 			bonobo_ok=true
-@@ -9553,7 +9556,7 @@
- EOF
- 
- 		have_bonobo=true
--		if gnome-config --libs bonobox > /dev/null 2>&1; then
-+		if $GNOME_CONFIG --libs bonobox > /dev/null 2>&1; then
- 			bonobo=bonobox
- 		else
- 			bonobo=bonobo
-@@ -9581,7 +9584,7 @@
- 
- echo "$as_me:9582: checking if Bonobo uses OAF" >&5
- echo $ECHO_N "checking if Bonobo uses OAF... $ECHO_C" >&6
--if ( gnome-config --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then
-+if ( $GNOME_CONFIG --libs bonobo | grep oaf ) > /dev/null 2>&1 ; then
- 	using_oaf="yes"
- 	cat >>confdefs.h <<\EOF
- #define USING_OAF 1
-@@ -9622,13 +9625,16 @@
- if $try_gconf; then
- 	echo "$as_me:9623: checking for gconf" >&5
- echo $ECHO_N "checking for gconf... $ECHO_C" >&6
--	if gconf-config --version > /dev/null 2>&1; then
--		gconf_ver=`gconf-config --version`
-+	if test "x$GCONF_CONFIG" = "x"; then
-+		GCONF_CONFIG=gconf-config
-+	fi
-+	if $GCONF_CONFIG --version > /dev/null 2>&1; then
-+		gconf_ver=`$GCONF_CONFIG --version`
- 		vers=`echo ${gconf_ver} | awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 1000 + $3;}'`
- 		if test "$vers" -ge 1000007; then
- 			have_gconf=true
--			GCONF_CFLAGS="`gconf-config --cflags gconf-gtk` -DGTKHTML_HAVE_GCONF"
--			GCONF_LIBS="`gconf-config --libs gconf-gtk`"
-+			GCONF_CFLAGS="`$GCONF_CONFIG --cflags gconf-gtk` -DGTKHTML_HAVE_GCONF"
-+			GCONF_LIBS="`$GCONF_CONFIG --libs gconf-gtk`"
- 			echo "$as_me:9632: result: found ($gconf_ver)" >&5
- echo "${ECHO_T}found ($gconf_ver)" >&6
- 		else
-@@ -9643,8 +9649,8 @@
- 	fi
- fi
- 
--EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui gdk_pixbuf print gal $bonobo libglade oaf`
--EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui gdk_pixbuf print gal $bonobo libglade oaf`
-+EXTRA_GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui gdk_pixbuf print gal $bonobo libglade oaf`
-+EXTRA_GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui gdk_pixbuf print gal $bonobo libglade oaf`
- 
- GTKHTML_LIBDIR="-L${libdir}"
- GTKHTML_INCLUDEDIR="-I${includedir}"
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index e02b429abdb..39ffca0716d 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2002/09/15 05:58:56 rh Exp $
+# $NetBSD: Makefile,v 1.80 2002/09/21 23:11:19 jlam Exp $
 #
 
 DISTNAME=		gnome-core-1.4.2
@@ -19,7 +19,7 @@ BUILD_USES_MSGFMT=	YES
 BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2
 .endif
 
-USE_BUILDLINK_ONLY=	YES
+USE_BUILDLINK2=		YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_LIBTOOL=		YES
@@ -30,38 +30,24 @@ LOCALSTATEDIR=		${X11PREFIX}/var/gnome
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
 
-PERL_SCRIPTS=		help-browser/gnome-convert help-browser/gnome-download
-
-post-patch:
-	cd ${WRKSRC}; \
-	for FILE in ${PERL_SCRIPTS}; do \
-		${CP} $$FILE $${FILE}.orig; \
-		${SED} -e 's#/usr/bin/perl#${PERL5}#g' \
-			<$${FILE}.orig >$$FILE; \
-	done
-	cd ${WRKSRC};							\
-	for file in `${FIND} . -name "Makefile.in"`; do			\
-		${SED}	-e "s|[	 ]*-I\$$(includedir)||g"		\
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
+REPLACE_PERL=		help-browser/gnome-convert help-browser/gnome-download
 
 post-install:
 .for prg in gnome-feedback gnome-terminal gpl lgpl fdl
-.for lng in C da de es it no
+.  for lng in C da de es it no
 	[ ! -d ${PREFIX}/share/gnome/help/${prg}/${lng}/figures ] || \
 	${RMDIR} ${PREFIX}/share/gnome/help/${prg}/${lng}/figures
+.  endfor
 .endfor
-.endfor
 
-.include "../../archivers/bzip2/buildlink.mk"
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/libglade/buildlink.mk"
-.include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
-.include "../../graphics/gnome-pixmaps/buildlink.mk"
-.include "../../lang/perl5/buildlink.mk"
-.include "../../textproc/libxml/buildlink.mk"
-.include "../../www/gtkhtml/buildlink.mk"
-.include "../../www/libghttp/buildlink.mk"
-.include "../../mk/x11.buildlink.mk"
+.include "../../archivers/bzip2/buildlink2.mk"
+.include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/libglade/buildlink2.mk"
+.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../graphics/gnome-pixmaps/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
+.include "../../textproc/libxml/buildlink2.mk"
+.include "../../www/gtkhtml/buildlink2.mk"
+.include "../../www/libghttp/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/distinfo b/x11/gnome-core/distinfo
index 3cd36d05a83..fc077e427fc 100644
--- a/x11/gnome-core/distinfo
+++ b/x11/gnome-core/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2002/09/14 02:46:56 rh Exp $
+$NetBSD: distinfo,v 1.9 2002/09/21 23:11:19 jlam Exp $
 
 SHA1 (gnome-core-1.4.2.tar.bz2) = 213989b6ded4175f98a208d51fae180897beb20b
 Size (gnome-core-1.4.2.tar.bz2) = 6276384 bytes
-SHA1 (patch-aa) = 9101f170b13095fe1f3517a1f9aba7e919aa733f
+SHA1 (patch-aa) = f36c0409e5ece6978fe373d4f40f88ed1f04062e
 SHA1 (patch-ab) = 54d7ee01544a4928742d89773f9e9ec2c8e9f0bf
 SHA1 (patch-ac) = 02d5c68e9f2fedeb3a5b51900e553b92766ba32b
 SHA1 (patch-ag) = cf578cd3de610d216499f43dc229c266ab9ef447
diff --git a/x11/gnome-core/patches/patch-aa b/x11/gnome-core/patches/patch-aa
index e390ac18e42..7a2c6faa961 100644
--- a/x11/gnome-core/patches/patch-aa
+++ b/x11/gnome-core/patches/patch-aa
@@ -1,51 +1,7 @@
-$NetBSD: patch-aa,v 1.11 2002/09/14 02:46:56 rh Exp $
+$NetBSD: patch-aa,v 1.12 2002/09/21 23:11:19 jlam Exp $
 
 --- configure.orig	Tue Sep 10 04:09:25 2002
 +++ configure
-@@ -1328,8 +1328,8 @@ else
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 		
--		ORBIT_CFLAGS=`orbit-config --cflags client server`
--		ORBIT_LIBS=`orbit-config --use-service=name --libs client server`
-+		ORBIT_CFLAGS=`$ORBIT_CONFIG --cflags client server`
-+		ORBIT_LIBS=`$ORBIT_CONFIG --use-service=name --libs client server`
- 		
- 		
- 	else
-@@ -1346,8 +1346,8 @@ else
-   
- 		gnome_cv_gnorba_found=no
- 		if test x$gnome_cv_orbit_found = xyes; then
--			GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--			GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+			GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+			GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 			if test -n "$GNORBA_LIBS"; then
- 				gnome_cv_gnorba_found=yes
- 			fi
-@@ -1367,8 +1367,8 @@ else
- fi
- 	if test x$gnome_cv_orbit_found = xyes; then
- 		
--		GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`"
--		GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`"
-+		GNORBA_CFLAGS="`$GNOME_CONFIG --cflags gnorba gnomeui`"
-+		GNORBA_LIBS="`$GNOME_CONFIG --libs gnorba gnomeui`"
- 		
- 		
- 	else
-@@ -7068,8 +7068,8 @@ rm -f conftest*
- 
- CFLAGS_save=$CFLAGS
- LIBS_save=$LIBS
--CFLAGS=`gnome-config --cflags gnomeui`
--LIBS=`gnome-config --libs gnomeui`
-+CFLAGS=`$GNOME_CONFIG --cflags gnomeui`
-+LIBS=`$GNOME_CONFIG --libs gnomeui`
- 
- echo $ac_n "checking for gnome_window_icon_set_default_from_file in -lgnomeui""... $ac_c" 1>&6
- echo "configure:7076: checking for gnome_window_icon_set_default_from_file in -lgnomeui" >&5
 @@ -8792,6 +8792,11 @@ fi
     sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
  	< $srcdir/po/POTFILES.in > po/POTFILES
@@ -58,45 +14,3 @@ $NetBSD: patch-aa,v 1.11 2002/09/14 02:46:56 rh Exp $
  # AM_GNOME_GETTEXT above substs $DATADIRNAME
  # this is the directory where the *.{mo,gmo} files are installed
  gnomelocaledir='${prefix}/share/locale'
-@@ -9021,7 +9026,10 @@ echo "configure:9021: checking for GdkPi
- PIXBUF_CFLAGS=`$GNOME_CONFIG --cflags gdk_pixbuf`
- PIXBUF_LIBS=`$GNOME_CONFIG --libs gdk_pixbuf`
- if test "x$PIXBUF_CFLAGS" != x ; then
--    vers=`gdk-pixbuf-config --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-+    if test "x$GDK_PIXBUF_CONFIG" = "x"; then
-+        GDK_PIXBUF_CONFIG=gdk-pixbuf-config
-+    fi
-+    vers=`$GDK_PIXBUF_CONFIG --version | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-     if test "$vers" -ge 0007000; then
-         echo "$ac_t""found" 1>&6
-     else
-@@ -9049,8 +9057,8 @@ ZVT_LIBS=`$GNOME_CONFIG --libs zvt`
- echo $ac_n "checking for Glade libraries >= $LIBGLADE_REQUIRED""... $ac_c" 1>&6
- echo "configure:9051: checking for Glade libraries >= $LIBGLADE_REQUIRED" >&5
- libglade_ok=no
--if gnome-config --libs libglade > /dev/null 2>&1; then 
--    verstxt=`gnome-config --modversion libglade`
-+if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
-+    verstxt=`$GNOME_CONFIG --modversion libglade`
-     vers=`echo "$verstxt" | awk -F. '{ printf "%d", $1 * 1000 + $2;}'`
-     if test "$vers" -ge 14; then
- 	echo "$ac_t""$marker_ok found $verstxt" 1>&6
-@@ -9066,14 +9074,14 @@ if test "$libglade_ok" = no; then
- fi
- unset libglade_ok
- GT_LIBS="libglade zvt gnorba gnomeui"
--GNOME_TERMINAL_LIBS=`gnome-config --libs $GT_LIBS`
--GNOME_TERMINAL_CFLAGS=`gnome-config --cflags $GT_LIBS`
-+GNOME_TERMINAL_LIBS=`$GNOME_CONFIG --libs $GT_LIBS`
-+GNOME_TERMINAL_CFLAGS=`$GNOME_CONFIG --cflags $GT_LIBS`
- 
- 
- 
- 
--GLADE_LIBS=`gnome-config --libs libglade`
--GLADE_CFLAGS=`gnome-config --cflags libglade`
-+GLADE_LIBS=`$GNOME_CONFIG --libs libglade`
-+GLADE_CFLAGS=`$GNOME_CONFIG --cflags libglade`
- 
- 
-