--- configure.orig	Thu Dec 30 18:02:16 1999
+++ configure	Fri Dec 31 12:29:33 1999
@@ -2790,7 +2790,7 @@
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  PTHREAD_LIB="-lc_r"
+  PTHREAD_LIB=""
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pthread_create""... $ac_c" 1>&6
@@ -3335,7 +3335,7 @@
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lxml `$GNOME_CONFIG --libs xml` $LIBS"
+LIBS="`xml-config --libs` $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 3341 "configure"
 #include "confdefs.h"
@@ -3365,7 +3365,7 @@
   echo "$ac_t""yes" 1>&6
   
 		
-		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
+		GNOME_XML_LIB=`xml-config --libs`
 	
 else
   echo "$ac_t""no" 1>&6
@@ -5602,15 +5602,16 @@
 fi
 
         
-	USE_INCLUDED_LIBINTL=yes
+#	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
         INSTOBJEXT=.mo
         DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/intl/libintl.a'
+#	INTLDEPS='$(top_builddir)/intl/libintl.a'
+	INTLDEPS="-lintl"
 	INTLLIBS=$INTLDEPS
 	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=intl/libintl.h
-        nls_cv_header_libgt=intl/libgettext.h
+#        nls_cv_header_intl=intl/libintl.h
+#        nls_cv_header_libgt=intl/libgettext.h
       fi
 
             if test "$XGETTEXT" != ":"; then
@@ -6110,7 +6111,7 @@
 echo "configure:6111: checking for GnomePrint libraries" >&5
 if gnome-config --libs print > /dev/null 2>&1; then 
     echo "$ac_t""found" 1>&6
-    . `gnome-config --libdir`/printConf.sh
+    . `$GNOME_CONFIG --sysconfdir`/printConf.sh
     echo $ac_n "checking for GnomePrint >= 0.8""... $ac_c" 1>&6
 echo "configure:6116: checking for GnomePrint >= 0.8" >&5
     case x$MODULE_VERSION in
@@ -6125,8 +6126,8 @@
 
 echo $ac_n "checking for Glade libraries >= 0.11""... $ac_c" 1>&6
 echo "configure:6128: checking for Glade libraries >= 0.11" >&5
-if gnome-config --libs libglade > /dev/null 2>&1; then 
-	vers=`gnome-config --modversion libglade`
+if libglade-config --libs > /dev/null 2>&1; then 
+	vers=`libglade-config --version | sed -e 's/ /-/'`
 	case $vers
 	in
 	    libglade-0.1[123456789]) echo "$ac_t""found" 1>&6 ;;
@@ -6136,8 +6137,8 @@
     { echo "configure: error: Did not find libGlade installed" 1>&2; exit 1; }
 fi
 
-EXTRA_GNOME_LIBS=`gnome-config --libs gnomeui print libglade $bonobo $gb`
-EXTRA_GNOME_CFLAGS=`gnome-config --cflags gnomeui print libglade $bonobo $gb`
+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs gnomeui print $bonobo $gb` `libglade-config --libs gnome`"
+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags gnomeui print $bonobo $gb` `libglade-config --cflags gnome`"