aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-06-17 13:32:58 -0400
committerGlenn Morris2011-06-17 13:32:58 -0400
commite9bc61b072df081624b7287ad118be330c7de37f (patch)
treefa472df0e5121d27e1abbec48450fcf05d1bac76
parent3a4725e11e57f17146b11463d04a83efda038df1 (diff)
downloademacs-e9bc61b072df081624b7287ad118be330c7de37f.tar.gz
emacs-e9bc61b072df081624b7287ad118be330c7de37f.zip
Fix previous change.
-rw-r--r--configure.in24
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.in b/configure.in
index ec0dd263b51..0135b9f1bf1 100644
--- a/configure.in
+++ b/configure.in
@@ -991,18 +991,6 @@ AC_SYS_LARGEFILE
991## If user specified a crt-dir, use that unconditionally. 991## If user specified a crt-dir, use that unconditionally.
992if test "X$CRT_DIR" = "X"; then 992if test "X$CRT_DIR" = "X"; then
993 993
994 ## If we're using gcc, and the user hasn't specified a crt-dir, try to
995 ## determine it automatically by asking gcc. [If this doesn't work,
996 ## CRT_DIR will remain empty and system-dependent code will be used below.]
997 if test "x${GCC}" = xyes; then
998 crt_file=`$CC --print-file-name=crt1.o 2>/dev/null`
999 case "$crt_file" in
1000 */*)
1001 CRT_DIR=`AS_DIRNAME(["$crt_file"])`
1002 ;;
1003 esac
1004 fi
1005
1006 case "$canonical" in 994 case "$canonical" in
1007 x86_64-*-linux-gnu* | s390x-*-linux-gnu*) 995 x86_64-*-linux-gnu* | s390x-*-linux-gnu*)
1008 ## On x86-64 and s390x GNU/Linux distributions, the standard library 996 ## On x86-64 and s390x GNU/Linux distributions, the standard library
@@ -1025,6 +1013,18 @@ if test "X$CRT_DIR" = "X"; then
1025 ## Default is /usr/lib. 1013 ## Default is /usr/lib.
1026 test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib 1014 test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
1027 1015
1016 ## If we're using gcc, try to determine it automatically by asking
1017 ## gcc. [If this doesn't work, CRT_DIR will remain at the
1018 ## system-dependent default from above.]
1019 if test "x${GCC}" = xyes; then
1020 crt_file=`$CC --print-file-name=crt1.o 2>/dev/null`
1021 case "$crt_file" in
1022 */*)
1023 CRT_DIR=`AS_DIRNAME(["$crt_file"])`
1024 ;;
1025 esac
1026 fi
1027
1028else 1028else
1029 1029
1030 ## Some platforms don't use any of these files, so it is not 1030 ## Some platforms don't use any of these files, so it is not