--- configure.orig	Tue Dec 16 17:35:58 2003
+++ configure	Sat Jan  3 18:50:45 2004
@@ -7997,6 +7997,7 @@
 
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -8050,7 +8051,7 @@
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $prefix/bin
+for as_dir in $prefix/bin $X11BASE/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
@@ -8101,7 +8102,7 @@
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $prefix/bin
+for as_dir in $prefix/bin $X11BASE/bin
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
