From: Glenn Morris <rgm@gnu.org>
Date: Wed, 29 Jun 2011 03:47:07 +0000 (-0700)
Subject: * configure.in: Do not override user crt-dir, even if faulty.
X-Git-Tag: emacs-pretest-24.0.90~104^2~152^2~343
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e9dfbb4a2cc9fd0b5a542114803a60732a375599;p=emacs.git

* configure.in: Do not override user crt-dir, even if faulty.
---

diff --git a/configure.in b/configure.in
index 956167bd4c8..d7e4efe51ed 100644
--- a/configure.in
+++ b/configure.in
@@ -1040,6 +1040,8 @@ done
 if test "x$crt_files" != x; then
 
   ## If user specified a crt-dir, use that unconditionally.
+  crt_gcc=no
+
   if test "X$CRT_DIR" = "X"; then
 
     CRT_DIR=/usr/lib            # default
@@ -1063,18 +1065,17 @@ if test "x$crt_files" != x; then
       hpux10-20) CRT_DIR=/lib ;;
     esac
 
+    test "x${GCC}" = xyes && crt_gcc=yes
+
   fi                            # CRT_DIR = ""
 
   crt_missing=
-  crt_gcc=no
-  test "x${GCC}" = xyes && crt_gcc=yes
 
   for file in $crt_files; do
 
     ## If we're using gcc, try to determine it automatically by asking
     ## gcc.  [If this doesn't work, CRT_DIR will remain at the
     ## system-dependent default from above.]
-    ## Note that this overrides a faulty with-crt-dir.
     if test $crt_gcc = yes && test ! -e $CRT_DIR/$file; then
 
        crt_file=`$CC --print-file-name=$file 2>/dev/null`