diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 55afae13d89..d9aa7dd8a58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-05-03 Glenn Morris <rgm@gnu.org> + + * configure.in (x_libraries): Remove standard 64-bit directories - + experimental workaround for minor autoconf bug. + 2008-04-23 Dan Nicolaescu <dann@ics.uci.edu> * configure.in: Remove hpux10.20 from the desupported list. diff --git a/configure.in b/configure.in index 4740fb9b5da..6e128a1bd9b 100644 --- a/configure.in +++ b/configure.in @@ -1339,6 +1339,16 @@ else window_system=x11 fi +## Workaround for bug in autoconf <= 2.62. +## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html +## No need to do anything special for these standard directories. +## This is an experiment, take it out if it causes problems. +if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then + + x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'` + +fi + 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"` |