[Emacs-diffs] /srv/bzr/emacs/trunk r104618: Small configure.in fix.

[Glenn Morris]

------------------------------------------------------------
revno: 104618
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-06-17 13:29:50 -0400
message:
  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).
modified:
  ChangeLog
  configure.in

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-06-16 23:10:17 +0000
+++ b/ChangeLog 2011-06-17 17:29:50 +0000
@@ -1,3 +1,8 @@
+2011-06-17  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * m4/lstat.m4: Merge from gnulib (Bug#8878).

=== modified file 'configure.in'
--- a/configure.in      2011-06-16 17:50:21 +0000
+++ b/configure.in      2011-06-17 17:29:50 +0000
@@ -988,23 +988,20 @@
 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*)