--- configure.orig	Thu Sep 23 14:19:28 1999
+++ configure	Fri Sep 24 10:24:46 1999
@@ -2393,7 +2393,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
@@ -2938,7 +2938,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 2944 "configure"
 #include "confdefs.h"
@@ -2969,7 +2969,7 @@
   
 		
 		
-		GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
+		GNOME_XML_LIB=`xml-config --libs`
 	
 else
   echo "$ac_t""no" 1>&6
@@ -4348,7 +4348,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo
-		   DATADIRNAME=lib
+		   DATADIRNAME=share
 fi
 rm -f conftest*
 		INSTOBJEXT=.mo
@@ -4735,8 +4735,8 @@
                                                                                  
 PRINT_LIBDIR='-L${libdir}'
 PRINT_INCLUDEDIR='-I${includedir}'
-PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `gnome-config --cflags gnomeui xml`"
-PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui xml`"
+PRINT_INCLUDEDIR="$PRINT_INCLUDEDIR `gnome-config --cflags gnomeui` `xml-config --cflags`"
+PRINT_LIBS="-lgnomeprint `gnome-config --libs gnomeui` `xml-config --libs`"
 
 
 
