diff options
| author | Andreas Schwab <schwab@suse.de> | 2006-10-23 15:28:18 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2006-10-23 15:28:18 +0000 |
| commit | f13de01e9312a66ea67189ca1b65a6ea5acb25b3 (patch) | |
| tree | b7888805a6c0eda25bbcfba497549abf59922295 | |
| parent | 081ff0c9bc4ea8668f795dc86d6f1549df132cf5 (diff) | |
| download | emacs-f13de01e9312a66ea67189ca1b65a6ea5acb25b3.tar.gz | |
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.
| -rw-r--r-- | configure.in | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/configure.in b/configure.in index 03ef25375b4..a64d161a79a 100644 --- a/configure.in +++ b/configure.in @@ -1720,11 +1720,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:\ |