--- configure.orig	Tue Feb 22 01:04:03 2000
+++ configure	Wed Jun 28 16:08:33 2000
@@ -2120,7 +2120,7 @@
 # Check whether --enable-gconf or --disable-gconf was given.
 if test "${enable_gconf+set}" = set; then
   enableval="$enable_gconf"
-  gconf_enabled="yes"
+  gconf_enabled="$enableval"
 fi
 
 # Check whether --with-default-backend or --without-default-backend was given.
@@ -4772,7 +4772,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo
-		   DATADIRNAME=lib
+		   DATADIRNAME=share
 fi
 rm -f conftest*
 		INSTOBJEXT=.mo
@@ -5545,7 +5545,7 @@
 VFSPTHREAD_LIBDIR='-L${libdir}'
 VFSPTHREAD_INCLUDEDIR='-I${includedir}'
 VFSPTHREAD_INCLUDEDIR="$VFSPTHREAD_INCLUDEDIR `gnome-config --cflags gnome`"
-VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `glib-config --libs gthread`"
+VFSPTHREAD_LIBS="-lgnomevfs -lgnomevfs-pthread `gnome-config --libs gnome` `$GLIB_CONFIG --libs gthread`"
 
 
 
@@ -5558,9 +5558,9 @@
 EOF
 
 
-VFS_LIBS="-lgnomevfs `glib-config --libs gthread gmodule`"
+VFS_LIBS="-lgnomevfs `$GLIB_CONFIG --libs gthread gmodule`"
 VFS_LIBDIR='-L${libdir}'
-VFS_INCLUDEDIR='-I${includedir}'" `glib-config --cflags gthread gmodule`"
+VFS_INCLUDEDIR='-I${includedir}'" `$GLIB_CONFIG --cflags gthread gmodule`"