aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2008-11-07 06:56:47 +0000
committerGlenn Morris2008-11-07 06:56:47 +0000
commit9fea5ed149e58172d07707b8083d748c5a655205 (patch)
tree275b22dc652e5980960f54dedd0ce192787a27cc
parenta0b66ce057cda19c557700ddd6a8bd50a090410b (diff)
downloademacs-9fea5ed149e58172d07707b8083d748c5a655205.tar.gz
emacs-9fea5ed149e58172d07707b8083d748c5a655205.zip
(HAVE_LIB64_DIR): Check for crtn.o. (Bug#1287)
-rw-r--r--ChangeLog4
-rw-r--r--configure.in4
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0287efa03ed..cf313b1dc5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12008-11-07 Glenn Morris <rgm@gnu.org>
2
3 * configure.in (HAVE_LIB64_DIR): Check for crtn.o. (Bug#1287)
4
12008-10-31 Eli Zaretskii <eliz@gnu.org> 52008-10-31 Eli Zaretskii <eliz@gnu.org>
2 6
3 * config.bat: Tell user to expect one "File not found" message 7 * config.bat: Tell user to expect one "File not found" message
diff --git a/configure.in b/configure.in
index e40203bb38c..1cd2c439c4b 100644
--- a/configure.in
+++ b/configure.in
@@ -907,9 +907,11 @@ AC_SYS_LARGEFILE
907 907
908### The standard library on x86-64 and s390x GNU/Linux distributions can 908### The standard library on x86-64 and s390x GNU/Linux distributions can
909### be located in either /usr/lib64 or /usr/lib. 909### be located in either /usr/lib64 or /usr/lib.
910### In some rare cases, /usr/lib64 exists but does not contain the
911### relevant files (bug#1287). Hence test for crtn.o.
910case "${canonical}" in 912case "${canonical}" in
911 x86_64-*-linux-gnu* | s390x-*-linux-gnu* ) 913 x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
912 if test -d /usr/lib64; then 914 if test -e /usr/lib64/crtn.o; then
913 AC_DEFINE(HAVE_LIB64_DIR, 1, 915 AC_DEFINE(HAVE_LIB64_DIR, 1,
914 [Define to 1 if the directory /usr/lib64 exists.]) 916 [Define to 1 if the directory /usr/lib64 exists.])
915fi 917fi