$NetBSD: patch-aa,v 1.6 2002/04/10 15:56:13 jlam Exp $

--- configure.orig	Tue Dec 18 17:36:11 2001
+++ configure
@@ -2292,8 +2292,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
@@ -2310,8 +2310,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
@@ -2331,8 +2331,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
@@ -4858,8 +4858,11 @@
 
 echo $ac_n "checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0""... $ac_c" 1>&6
 echo "configure:4861: checking for libxml (aka gnome-xml) libraries 1.8.8 <= version < 2.0.0" >&5
-if xml-config --libs > /dev/null 2>&1; then 
-    vers=`xml-config --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+if test -n "$XML_CONFIG"; then
+  XML_CONFIG=xml-config
+fi
+if $XML_CONFIG --libs > /dev/null 2>&1; then 
+    vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
     if test "$vers" -ge 1008008; then
 	if test "$vers" -lt 2000000; then
 	    echo "$ac_t""found" 1>&6
@@ -5185,8 +5188,8 @@
 
 echo $ac_n "checking for GnomePrint libraries >= 0.25""... $ac_c" 1>&6
 echo "configure:5188: checking for GnomePrint libraries >= 0.25" >&5
-if gnome-config --libs print > /dev/null 2>&1; then 
-    vers=`gnome-config --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \
+if $GNOME_CONFIG --libs print > /dev/null 2>&1; then 
+    vers=`$GNOME_CONFIG --modversion print | sed -e "s/gnome-print-//" -e 's/cvs$//' -e 's/pre$//' | \
         awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
     if test "$vers" -ge 25; then
         echo "$ac_t""found" 1>&6
@@ -5199,8 +5202,8 @@
 
 echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6
 echo "configure:5202: checking for Glade libraries >= 0.13" >&5
-if gnome-config --libs libglade > /dev/null 2>&1; then 
-    vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
+if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
+    vers=`$GNOME_CONFIG --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
     if test "$vers" -ge 13; then
         echo "$ac_t""found" 1>&6
     else
@@ -5226,8 +5229,8 @@
 
 echo $ac_n "checking for GNOME-VFS""... $ac_c" 1>&6
 echo "configure:5229: checking for GNOME-VFS" >&5
-if gnome-config --libs vfs > /dev/null 2>&1; then
-	vers=`gnome-config --modversion vfs`
+if $GNOME_CONFIG --libs vfs > /dev/null 2>&1; then
+	vers=`$GNOME_CONFIG --modversion vfs`
 	case $vers
 	in
 	    gnome-vfs-0.012) vfs_ok=false ;;
@@ -5240,8 +5243,8 @@
 if $vfs_ok; then
 	echo "$ac_t""$vers" 1>&6
 
-	GNOME_VFS_LIBS="`gnome-config --libs vfs`"
-	GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"
+	GNOME_VFS_LIBS="`$GNOME_CONFIG --libs vfs`"
+	GNOME_VFS_CFLAGS="`$GNOME_CONFIG --cflags vfs`"
 	
 	
 
@@ -5307,8 +5310,8 @@
 
 
 
-EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
-EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
+EXTRA_GNOME_LIBS=`$GNOME_CONFIG --libs gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`
+EXTRA_GNOME_CFLAGS=`$GNOME_CONFIG --cflags gnomeui print libart libglade gdk_pixbuf gnomecanvaspixbuf`