[Emacs-diffs] /srv/bzr/emacs/trunk r100043: Regenerate configure.

[Glenn Morris]

------------------------------------------------------------
revno: 100043
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2010-04-26 20:18:39 -0700
message:
  Regenerate configure.
modified:
  configure

=== modified file 'configure'
--- a/configure 2010-04-27 02:38:36 +0000
+++ b/configure 2010-04-27 03:18:39 +0000
@@ -1542,8 +1542,8 @@
 
   --with-pkg-config-prog=PATH
                           path to pkg-config for finding GTK and librsvg
-  --with-crt-dir=DIR      directory containing crtn.o etc. This option is only
-                          used on x86-64 and s390x GNU/Linux architectures.
+  --with-crt-dir=DIR      directory containing crtn.o etc. The default is
+                          /usr/lib, or /usr/lib64 on some platforms.
   --with-gnustep-conf=PATH
                           path to GNUstep.conf; default $GNUSTEP_CONFIG_FILE,
                           or /etc/GNUstep/GNUstep.conf
@@ -5782,9 +5782,6 @@
 echo '
 #include "'${srcdir}'/src/'${opsysfile}'"
 #include "'${srcdir}'/src/'${machfile}'"
-#ifndef LIBS_MACHINE
-#define LIBS_MACHINE
-#endif
 #ifndef LIBS_SYSTEM
 #define LIBS_SYSTEM
 #endif
@@ -5794,7 +5791,7 @@
 #ifndef C_SWITCH_MACHINE
 #define C_SWITCH_MACHINE
 #endif
-configure___ libsrc_libs=LIBS_MACHINE LIBS_SYSTEM
+configure___ libsrc_libs=LIBS_SYSTEM
 configure___ c_switch_system=C_SWITCH_SYSTEM
 configure___ c_switch_machine=C_SWITCH_MACHINE
 
@@ -6255,40 +6252,42 @@
 
 
 
-## Note: at present CRT_DIR is only used for amdx86-64 and ibms390x.
-## Other machine types hard-code the location in src/[ms]/*.h.
-case "${canonical}" in
-  x86_64-*-linux-gnu* | s390x-*-linux-gnu* )
-
-   ## On x86-64 and s390x GNU/Linux distributions, the standard library
-   ## can be in a variety of places.  We only try /usr/lib64 and /usr/lib.
-   ## For anything else (eg /usr/lib32), it is up the user to specify
-   ## the location (bug#5655).
-   ## Test for crtn.o, not just the directory, because sometimes the
-   ## directory exists but does not have the relevant files (bug#1287).
-   ## If user specified a crt-dir, use that unconditionally.
-   if test "X$CRT_DIR" = "X"; then
-     CRT_DIR=/usr/lib
-     test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
-   fi
-
-   test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
-     { { $as_echo "$as_me:$LINENO: error: crt*.o not found.  Use 
--with-crt-dir to specify the location." >&5
-$as_echo "$as_me: error: crt*.o not found.  Use --with-crt-dir to specify the 
location." >&2;}
+## If user specified a crt-dir, use that unconditionally.
+if test "X$CRT_DIR" = "X"; then
+
+  case "$canonical" in
+    x86_64-*-linux-gnu* | s390x-*-linux-gnu*)
+    ## On x86-64 and s390x GNU/Linux distributions, the standard library
+    ## can be in a variety of places.  We only try /usr/lib64 and /usr/lib.
+    ## For anything else (eg /usr/lib32), it is up the user to specify
+    ## the location (bug#5655).
+    ## Test for crtn.o, not just the directory, because sometimes the
+    ## directory exists but does not have the relevant files (bug#1287).
+    ## FIXME better to test for binary compatibility somehow.
+    test -e /usr/lib64/crtn.o && CRT_DIR=/usr/lib64
+    ;;
+
+    powerpc64-*-linux-gnu* | sparc64-*-linux-gnu*) CRT_DIR=/usr/lib64 ;;
+  esac
+
+  case "$opsys" in
+    hpux10-20) CRT_DIR=/lib ;;
+  esac
+
+  ## Default is /usr/lib.
+  test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
+
+else
+
+  ## Some platforms don't use any of these files, so it is not
+  ## appropriate to put this test outside the if block.
+  test -e $CRT_DIR/crtn.o || test -e $CRT_DIR/crt0.o || \
+    { { $as_echo "$as_me:$LINENO: error: crt*.o not found in specified 
location." >&5
+$as_echo "$as_me: error: crt*.o not found in specified location." >&2;}
    { (exit 1); exit 1; }; }
-   ;;
-
-  *)
-   ## For clarity, ignore any user-specified setting on other platforms.
-   if test "X$CRT_DIR" != "X"; then
-     { $as_echo "$as_me:$LINENO: WARNING: Ignoring user-specified crt-dir." >&5
-$as_echo "$as_me: WARNING: Ignoring user-specified crt-dir." >&2;}
-     CRT_DIR=
-   fi
-   ;;
-
-esac
-test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib
+
+fi
+