[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/configure.in,v
From: |
Andreas Schwab |
Subject: |
[Emacs-diffs] Changes to emacs/configure.in,v |
Date: |
Mon, 23 Oct 2006 15:28:18 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Andreas Schwab <schwab> 06/10/23 15:28:18
Index: configure.in
===================================================================
RCS file: /sources/emacs/emacs/configure.in,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -b -r1.413 -r1.414
--- configure.in 28 Sep 2006 05:47:26 -0000 1.413
+++ configure.in 23 Oct 2006 15:28:18 -0000 1.414
@@ -1720,11 +1720,18 @@
window_system=x11
fi
-if test "${x_libraries}" != NONE && test -n "${x_libraries}"; then
+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:\
- [Emacs-diffs] Changes to emacs/configure.in,v,
Andreas Schwab <=