aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-04-16 14:32:59 -0400
committerGlenn Morris2012-04-16 14:32:59 -0400
commit9b9b2ef28d8a85ca46ce12b344ea9d267b283aac (patch)
treed205ed1df3bdd78ec49aff1b1e288155d2adab29
parent3851314bd40e31c30fdd4ad7ec1dd8ad19c8030e (diff)
downloademacs-9b9b2ef28d8a85ca46ce12b344ea9d267b283aac.tar.gz
emacs-9b9b2ef28d8a85ca46ce12b344ea9d267b283aac.zip
* configure.in: Remove X libs workaround for old autoconf.
-rw-r--r--ChangeLog4
-rw-r--r--configure.in9
2 files changed, 4 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a72290284b..fb0ce63727b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12012-04-16 Glenn Morris <rgm@gnu.org>
2
3 * configure.in: Remove X libs workaround for old autoconf.
4
12012-04-12 Ken Brown <kbrown@cornell.edu> 52012-04-12 Ken Brown <kbrown@cornell.edu>
2 6
3 * configure.in: Warn that Cygwin 1.5 is unsupported. (Bug#10398) 7 * configure.in: Warn that Cygwin 1.5 is unsupported. (Bug#10398)
diff --git a/configure.in b/configure.in
index bd8e3d62299..e0ac2ab1bad 100644
--- a/configure.in
+++ b/configure.in
@@ -1421,15 +1421,6 @@ else
1421 window_system=x11 1421 window_system=x11
1422fi 1422fi
1423 1423
1424## Workaround for bug in autoconf <= 2.62.
1425## http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01551.html
1426## No need to do anything special for these standard directories.
1427if test -n "${x_libraries}" && test x"${x_libraries}" != xNONE; then
1428
1429 x_libraries=`echo :${x_libraries}: | sed -e 's|:/usr/lib64:|:|g' -e 's|:/lib64:|:|g' -e 's|^:||' -e 's|:$||'`
1430
1431fi
1432
1433LD_SWITCH_X_SITE_AUX= 1424LD_SWITCH_X_SITE_AUX=
1434LD_SWITCH_X_SITE_AUX_RPATH= 1425LD_SWITCH_X_SITE_AUX_RPATH=
1435if test "${x_libraries}" != NONE; then 1426if test "${x_libraries}" != NONE; then