Regenerate.

2 files changed, 19 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index d05eb9c5c02..f6253dcdd92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-23  Andreas Schwab  <schwab@suse.de>
+
+        * configure.in: Make sure x_default_search_path is always set even
+        when x_libraries is empty, and look in .../share as well for each
+        library directory.
+
+        * configure: Regenerate.
+
 2006-10-03  Kim F. Storm  <storm@cua.dk>
 
         * AUTHORS: Regenerate.
diff --git a/configure b/configure
index 18fd27ec3b5..2fad7c5c3fa 100755
--- a/configure
+++ b/configure
@@ -8610,11 +8610,18 @@ else
   window_system=x11
 fi
 
-if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
-  LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
-  LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
+if test "${x_libraries}" != NONE; then
+  if test -n "${x_libraries}"; then
+    LD_SWITCH_X_SITE=-L`echo ${x_libraries} | sed -e "s/:/ -L/g"`
+    LD_SWITCH_X_SITE_AUX=-R`echo ${x_libraries} | sed -e "s/:/ -R/g"`
+  fi
   x_default_search_path=""
-  for x_library in `echo ${x_libraries} | sed -e "s/:/ /g"`; do
+  x_search_path=${x_libraries}
+  if test -z "${x_search_path}"; then
+    x_search_path=/usr/lib
+  fi
+  for x_library in `echo ${x_search_path}: | \
+                    sed -e "s/:/ /g" -e p -e "s:/lib[^ /]* :/share :g"`; do
     x_search_path="\
 ${x_library}/X11/%L/%T/%N%C%S:\
 ${x_library}/X11/%l/%T/%N%C%S:\