--- configure.orig	Tue May 18 18:00:05 1999
+++ configure	Sat May 22 15:59:03 1999
@@ -2860,7 +2860,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
@@ -3405,7 +3405,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 3411 "configure"
 #include "confdefs.h"
@@ -3436,7 +3436,7 @@
   
 		
 		
-		GNOME_XML_LIB=`gnome-config --libs xml`
+		GNOME_XML_LIB=`xml-config --libs`
 	
 else
   echo "$ac_t""no" 1>&6
@@ -5657,15 +5657,15 @@
 fi
 
         
-	USE_INCLUDED_LIBINTL=yes
+#	USE_INCLUDED_LIBINTL=yes
         CATOBJEXT=.gmo
         INSTOBJEXT=.mo
         DATADIRNAME=share
-	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
@@ -6249,7 +6249,7 @@
 test -n "$AWK" && break
 done
 
-GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gdk/gdkkeysyms.h"
+GDK_KEYSYMS="`$GTK_CONFIG --prefix`/include/gtk12/gdk/gdkkeysyms.h"
 
 cat >> confdefs.h <<\EOF
 #define ENABLE_GNOME 1
@@ -6273,8 +6273,8 @@
   LIBGLADE_FULLDIST_TRUE='#'
   LIBGLADE_FULLDIST_FALSE=
 fi
-XML_LIBS=`gnome-config --libs xml`
-XML_CFLAGS=`gnome-config --cflags xml`/gnome-xml
+XML_LIBS=`xml-config --libs`
+XML_CFLAGS=`xml-config --cflags`
 
 
 if false; then