--- configure.orig	Tue Jul 18 13:28:55 2000
+++ configure	Tue Jul 18 13:31:30 2000
@@ -3821,7 +3821,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo
-		   DATADIRNAME=lib
+		   DATADIRNAME=share
 fi
 rm -f conftest*
 		INSTOBJEXT=.mo
@@ -3831,7 +3831,7 @@
 	    # Added by Martin Baulig 12/15/98 for libc5 systems
 	    if test "$gt_cv_func_dgettext_libc" != "yes" \
 	       && test "$gt_cv_func_dgettext_libintl" = "yes"; then
-	       INTLLIBS=-lintl
+	       INTLLIBS="-lintl -lxpg4"
 	       LIBS=`echo $LIBS | sed -e 's/-lintl//'`
 	    fi
 	
@@ -4598,6 +4598,7 @@
   glib_thread_cflags="$GLIB_CFLAGS"
   glib_libs=`$GLIB_CONFIG_2_0 glib gobject gmodule --libs`
   glib_thread_libs="$GLIB_LIBS"
+  GLIB_CFLAGS="$glib_cflags"
   GLIB_LIBS="$glib_libs"
   GLIB_DEPLIBS="$glib_libs"
 else