Small configure.in fix.

Ref: http://lists.gnu.org/archive/html/emacs-buildstatus/2011-06/msg00007.html

* configure.in: Restore the behavior of checking crt-dir only
when the user specified it (not all platforms use it).
This commit is contained in:
Glenn Morris 2011-06-17 13:29:50 -04:00
parent 9be74fbbb9
commit 3a4725e11e
2 changed files with 17 additions and 15 deletions

View file

@ -1,3 +1,8 @@
2011-06-17 Glenn Morris <rgm@gnu.org>
* configure.in: Restore the behavior of checking crt-dir only
when the user specified it (not all platforms use it).
2011-06-16 Paul Eggert <eggert@cs.ucla.edu>
* m4/lstat.m4: Merge from gnulib (Bug#8878).

View file

@ -988,23 +988,20 @@ dnl Do this early because it can frob feature test macros for Unix-98 &c.
AC_SYS_LARGEFILE
## If we're using gcc, and the user hasn't specified a crt-dir, try to
## determine it automatically by asking gcc. [If this doesn't work,
## CRT_DIR will remain empty and system-dependent code will be used
## below.]
##
if test "x${GCC}z$CRT_DIR" = xyesz; then
crt_file=`$CC 2>/dev/null --print-file-name=crt1.o`
case "$crt_file" in
*/*)
CRT_DIR=`AS_DIRNAME(["$crt_file"])`
;;
esac
fi
## If user specified a crt-dir, use that unconditionally.
if test "X$CRT_DIR" = "X"; then
## If we're using gcc, and the user hasn't specified a crt-dir, try to
## determine it automatically by asking gcc. [If this doesn't work,
## CRT_DIR will remain empty and system-dependent code will be used below.]
if test "x${GCC}" = xyes; then
crt_file=`$CC --print-file-name=crt1.o 2>/dev/null`
case "$crt_file" in
*/*)
CRT_DIR=`AS_DIRNAME(["$crt_file"])`
;;
esac
fi
case "$canonical" in
x86_64-*-linux-gnu* | s390x-*-linux-gnu*)