tUpdate to latest version of libtool. - vaccinewars - be a doctor and try to va… | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 92b4e05e3b4cb2a1c87a23019475d2d7adfde518 | |
parent 61a106fe688537a86c904fceb9ebe96966a57edd | |
Author: Ben Webb <[email protected]> | |
Date: Mon, 2 Jun 2003 17:40:22 +0000 | |
Update to latest version of libtool. | |
Diffstat: | |
M config.guess | 620 ++++++++++++++++-------------… | |
M config.sub | 325 ++++++++++++++++++++---------… | |
M ltmain.sh | 440 ++++++++++++++++++++---------… | |
3 files changed, 830 insertions(+), 555 deletions(-) | |
--- | |
diff --git a/config.guess b/config.guess | |
t@@ -1,9 +1,9 @@ | |
#! /bin/sh | |
# Attempt to guess a canonical system name. | |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | |
-# Free Software Foundation, Inc. | |
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | |
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | |
-timestamp='2001-04-20' | |
+timestamp='2003-01-10' | |
# This file is free software; you can redistribute it and/or modify it | |
# under the terms of the GNU General Public License as published by | |
t@@ -24,8 +24,9 @@ timestamp='2001-04-20' | |
# configuration script generated by Autoconf, you may include it under | |
# the same distribution terms that you use for the rest of that program. | |
-# Written by Per Bothner <[email protected]>. | |
-# Please send patches to <[email protected]>. | |
+# Originally written by Per Bothner <[email protected]>. | |
+# Please send patches to <[email protected]>. Submit a context | |
+# diff and a properly formatted ChangeLog entry. | |
# | |
# This script attempts to guess a canonical system name similar to | |
# config.sub. If it succeeds, it prints the system name on stdout, and | |
t@@ -52,7 +53,7 @@ version="\ | |
GNU config.guess ($timestamp) | |
Originally written by Per Bothner. | |
-Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 | |
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | |
Free Software Foundation, Inc. | |
This is free software; see the source for copying conditions. There is NO | |
t@@ -87,33 +88,44 @@ if test $# != 0; then | |
exit 1 | |
fi | |
+trap 'exit 1' 1 2 15 | |
-dummy=dummy-$$ | |
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 | |
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a | |
+# compiler to aid in system detection is discouraged as it requires | |
+# temporary files to be created and, as you can see below, it is a | |
+# headache to deal with in a portable fashion. | |
-# CC_FOR_BUILD -- compiler used by this script. | |
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still | |
# use `HOST_CC' if defined, but it is deprecated. | |
+# Portable tmp directory creation inspired by the Autoconf team. | |
+ | |
+set_cc_for_build=' | |
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) &&… | |
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15… | |
+: ${TMPDIR=/tmp} ; | |
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n… | |
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) … | |
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; }… | |
+dummy=$tmp/dummy ; | |
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; | |
case $CC_FOR_BUILD,$HOST_CC,$CC in | |
- ,,) echo "int dummy(){}" > $dummy.c | |
- for c in cc gcc c89 ; do | |
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 | |
- if test $? = 0 ; then | |
- CC_FOR_BUILD="$c"; break | |
- fi | |
- done | |
- rm -f $dummy.c $dummy.o $dummy.rel | |
+ ,,) echo "int x;" > $dummy.c ; | |
+ for c in cc gcc c89 c99 ; do | |
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then | |
+ CC_FOR_BUILD="$c"; break ; | |
+ fi ; | |
+ done ; | |
if test x"$CC_FOR_BUILD" = x ; then | |
- CC_FOR_BUILD=no_compiler_found | |
+ CC_FOR_BUILD=no_compiler_found ; | |
fi | |
;; | |
,,*) CC_FOR_BUILD=$CC ;; | |
,*,*) CC_FOR_BUILD=$HOST_CC ;; | |
-esac | |
+esac ;' | |
# This is needed to find uname on a Pyramid OSx when run in the BSD universe. | |
-# ([email protected] 8/24/94.) | |
+# ([email protected] 1994-08-24) | |
if (test -f /.attbin/uname) >/dev/null 2>&1 ; then | |
PATH=$PATH:/.attbin ; export PATH | |
fi | |
t@@ -127,29 +139,31 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=… | |
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |
*:NetBSD:*:*) | |
- # Netbsd (nbsd) targets should (where applicable) match one or | |
+ # NetBSD (nbsd) targets should (where applicable) match one or | |
# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, | |
# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently | |
# switched to ELF, *-*-netbsd* would select the old | |
# object file format. This provides both forward | |
# compatibility and a consistent mechanism for selecting the | |
# object file format. | |
- # Determine the machine/vendor (is the vendor relevant). | |
- case "${UNAME_MACHINE}" in | |
- amiga) machine=m68k-unknown ;; | |
- arm32) machine=arm-unknown ;; | |
- atari*) machine=m68k-atari ;; | |
- sun3*) machine=m68k-sun ;; | |
- mac68k) machine=m68k-apple ;; | |
- macppc) machine=powerpc-apple ;; | |
- hp3[0-9][05]) machine=m68k-hp ;; | |
- ibmrt|romp-ibm) machine=romp-ibm ;; | |
- *) machine=${UNAME_MACHINE}-unknown ;; | |
+ # | |
+ # Note: NetBSD doesn't particularly care about the vendor | |
+ # portion of the name. We always set it to "unknown". | |
+ sysctl="sysctl -n hw.machine_arch" | |
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ | |
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)` | |
+ case "${UNAME_MACHINE_ARCH}" in | |
+ armeb) machine=armeb-unknown ;; | |
+ arm*) machine=arm-unknown ;; | |
+ sh3el) machine=shl-unknown ;; | |
+ sh3eb) machine=sh-unknown ;; | |
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;; | |
esac | |
# The Operating System including object format, if it has switched | |
# to ELF recently, or will in the future. | |
- case "${UNAME_MACHINE}" in | |
- i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news6… | |
+ case "${UNAME_MACHINE_ARCH}" in | |
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax) | |
+ eval $set_cc_for_build | |
if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | |
| grep __ELF__ >/dev/null | |
then | |
t@@ -165,12 +179,65 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:… | |
;; | |
esac | |
# The OS release | |
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | |
+ # Debian GNU/NetBSD machines have a different userland, and | |
+ # thus, need a distinct triplet. However, they do not need | |
+ # kernel version information, so it can be replaced with a | |
+ # suitable tag, in the style of linux-gnu. | |
+ case "${UNAME_VERSION}" in | |
+ Debian*) | |
+ release='-gnu' | |
+ ;; | |
+ *) | |
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` | |
+ ;; | |
+ esac | |
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: | |
# contains redundant information, the shorter form: | |
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. | |
echo "${machine}-${os}${release}" | |
exit 0 ;; | |
+ amiga:OpenBSD:*:*) | |
+ echo m68k-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ arc:OpenBSD:*:*) | |
+ echo mipsel-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ hp300:OpenBSD:*:*) | |
+ echo m68k-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ mac68k:OpenBSD:*:*) | |
+ echo m68k-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ macppc:OpenBSD:*:*) | |
+ echo powerpc-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ mvme68k:OpenBSD:*:*) | |
+ echo m68k-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ mvme88k:OpenBSD:*:*) | |
+ echo m88k-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ mvmeppc:OpenBSD:*:*) | |
+ echo powerpc-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ pmax:OpenBSD:*:*) | |
+ echo mipsel-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ sgi:OpenBSD:*:*) | |
+ echo mipseb-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ sun3:OpenBSD:*:*) | |
+ echo m68k-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ wgrisc:OpenBSD:*:*) | |
+ echo mipsel-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ *:OpenBSD:*:*) | |
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ *:MicroBSD:*:*) | |
+ echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} | |
+ exit 0 ;; | |
alpha:OSF1:*:*) | |
if test $UNAME_RELEASE = "V4.0"; then | |
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | |
t@@ -179,6 +246,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${… | |
# A Tn.n version is a released field test version. | |
# A Xn.n version is an unreleased experimental baselevel. | |
# 1.2 uses "1.2" for uname -r. | |
+ eval $set_cc_for_build | |
cat <<EOF >$dummy.s | |
.data | |
\$Lformat: | |
t@@ -204,9 +272,9 @@ main: | |
jsr \$26,exit | |
.end main | |
EOF | |
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null | |
+ $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null | |
if test "$?" = 0 ; then | |
- case `./$dummy` in | |
+ case `$dummy` in | |
0-0) | |
UNAME_MACHINE="alpha" | |
;; | |
t@@ -225,9 +293,14 @@ EOF | |
2-307) | |
UNAME_MACHINE="alphaev67" | |
;; | |
+ 2-1307) | |
+ UNAME_MACHINE="alphaev68" | |
+ ;; | |
+ 3-1307) | |
+ UNAME_MACHINE="alphaev7" | |
+ ;; | |
esac | |
fi | |
- rm -f $dummy.s $dummy | |
echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]… | |
exit 0 ;; | |
Alpha\ *:Windows_NT*:*) | |
t@@ -242,29 +315,11 @@ EOF | |
Amiga*:UNIX_System_V:4.0:*) | |
echo m68k-unknown-sysv4 | |
exit 0;; | |
- amiga:OpenBSD:*:*) | |
- echo m68k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
*:[Aa]miga[Oo][Ss]:*:*) | |
echo ${UNAME_MACHINE}-unknown-amigaos | |
exit 0 ;; | |
- arc64:OpenBSD:*:*) | |
- echo mips64el-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- arc:OpenBSD:*:*) | |
- echo mipsel-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- hkmips:OpenBSD:*:*) | |
- echo mips-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- pmax:OpenBSD:*:*) | |
- echo mipsel-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- sgi:OpenBSD:*:*) | |
- echo mips-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- wgrisc:OpenBSD:*:*) | |
- echo mipsel-unknown-openbsd${UNAME_RELEASE} | |
+ *:[Mm]orph[Oo][Ss]:*:*) | |
+ echo ${UNAME_MACHINE}-unknown-morphos | |
exit 0 ;; | |
*:OS/390:*:*) | |
echo i370-ibm-openedition | |
t@@ -286,6 +341,10 @@ EOF | |
NILE*:*:*:dcosx) | |
echo pyramid-pyramid-svr4 | |
exit 0 ;; | |
+ DRS?6000:UNIX_SV:4.2*:7*) | |
+ case `/usr/bin/uname -p` in | |
+ sparc) echo sparc-icl-nx7 && exit 0 ;; | |
+ esac ;; | |
sun4H:SunOS:5.*:*) | |
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` | |
exit 0 ;; | |
t@@ -314,7 +373,7 @@ EOF | |
echo m68k-sun-sunos${UNAME_RELEASE} | |
exit 0 ;; | |
sun*:*:4.2BSD:*) | |
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/d… | |
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/de… | |
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 | |
case "`/bin/arch`" in | |
sun3) | |
t@@ -328,9 +387,6 @@ EOF | |
aushp:SunOS:*:*) | |
echo sparc-auspex-sunos${UNAME_RELEASE} | |
exit 0 ;; | |
- atari*:OpenBSD:*:*) | |
- echo m68k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
# The situation for MiNT is a little confusing. The machine name | |
# can be virtually everything (everything which is not | |
# "atarist" or "atariste" at least should have a processor | |
t@@ -357,18 +413,6 @@ EOF | |
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) | |
echo m68k-unknown-mint${UNAME_RELEASE} | |
exit 0 ;; | |
- sun3*:OpenBSD:*:*) | |
- echo m68k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- mac68k:OpenBSD:*:*) | |
- echo m68k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- mvme68k:OpenBSD:*:*) | |
- echo m68k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
- mvme88k:OpenBSD:*:*) | |
- echo m88k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
powerpc:machten:*:*) | |
echo powerpc-apple-machten${UNAME_RELEASE} | |
exit 0 ;; | |
t@@ -385,6 +429,7 @@ EOF | |
echo clipper-intergraph-clix${UNAME_RELEASE} | |
exit 0 ;; | |
mips:*:*:UMIPS | mips:*:*:RISCos) | |
+ eval $set_cc_for_build | |
sed 's/^ //' << EOF >$dummy.c | |
#ifdef __cplusplus | |
#include <stdio.h> /* for printf() prototype */ | |
t@@ -406,15 +451,20 @@ EOF | |
exit (-1); | |
} | |
EOF | |
- $CC_FOR_BUILD $dummy.c -o $dummy \ | |
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'`… | |
- && rm -f $dummy.c $dummy && exit 0 | |
- rm -f $dummy.c $dummy | |
+ $CC_FOR_BUILD -o $dummy $dummy.c \ | |
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ | |
+ && exit 0 | |
echo mips-mips-riscos${UNAME_RELEASE} | |
exit 0 ;; | |
Motorola:PowerMAX_OS:*:*) | |
echo powerpc-motorola-powermax | |
exit 0 ;; | |
+ Motorola:*:4.3:PL8-*) | |
+ echo powerpc-harris-powermax | |
+ exit 0 ;; | |
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) | |
+ echo powerpc-harris-powermax | |
+ exit 0 ;; | |
Night_Hawk:Power_UNIX:*:*) | |
echo powerpc-harris-powerunix | |
exit 0 ;; | |
t@@ -475,6 +525,7 @@ EOF | |
exit 0 ;; | |
*:AIX:2:3) | |
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then | |
+ eval $set_cc_for_build | |
sed 's/^ //' << EOF >$dummy.c | |
#include <sys/systemcfg.h> | |
t@@ -486,8 +537,7 @@ EOF | |
exit(0); | |
} | |
EOF | |
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c… | |
- rm -f $dummy.c $dummy | |
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 | |
echo rs6000-ibm-aix3.2.5 | |
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then | |
echo rs6000-ibm-aix3.2.4 | |
t@@ -496,7 +546,7 @@ EOF | |
fi | |
exit 0 ;; | |
*:AIX:*:[45]) | |
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | a… | |
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | aw… | |
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1;… | |
IBM_ARCH=rs6000 | |
else | |
t@@ -536,10 +586,8 @@ EOF | |
9000/31? ) HP_ARCH=m68000 ;; | |
9000/[34]?? ) HP_ARCH=m68k ;; | |
9000/[678][0-9][0-9]) | |
- case "${HPUX_REV}" in | |
- 11.[0-9][0-9]) | |
- if [ -x /usr/bin/getconf ]; then | |
- sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/nul… | |
+ if [ -x /usr/bin/getconf ]; then | |
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/nul… | |
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/nul… | |
case "${sc_cpu_version}" in | |
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | |
t@@ -548,12 +596,13 @@ EOF | |
case "${sc_kernel_bits}" in | |
32) HP_ARCH="hppa2.0n" ;; | |
64) HP_ARCH="hppa2.0w" ;; | |
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 | |
esac ;; | |
esac | |
- fi ;; | |
- esac | |
- if [ "${HP_ARCH}" = "" ]; then | |
- sed 's/^ //' << EOF >$dummy.c | |
+ fi | |
+ if [ "${HP_ARCH}" = "" ]; then | |
+ eval $set_cc_for_build | |
+ sed 's/^ //' << EOF >$dummy.c | |
#define _HPUX_SOURCE | |
#include <stdlib.h> | |
t@@ -586,11 +635,21 @@ EOF | |
exit (0); | |
} | |
EOF | |
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./… | |
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi | |
- rm -f $dummy.c $dummy | |
- fi ;; | |
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && … | |
+ test -z "$HP_ARCH" && HP_ARCH=hppa | |
+ fi ;; | |
esac | |
+ if [ ${HP_ARCH} = "hppa2.0w" ] | |
+ then | |
+ # avoid double evaluation of $set_cc_for_build | |
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build | |
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/… | |
+ then | |
+ HP_ARCH="hppa2.0w" | |
+ else | |
+ HP_ARCH="hppa64" | |
+ fi | |
+ fi | |
echo ${HP_ARCH}-hp-hpux${HPUX_REV} | |
exit 0 ;; | |
ia64:HP-UX:*:*) | |
t@@ -598,6 +657,7 @@ EOF | |
echo ia64-hp-hpux${HPUX_REV} | |
exit 0 ;; | |
3050*:HI-UX:*:*) | |
+ eval $set_cc_for_build | |
sed 's/^ //' << EOF >$dummy.c | |
#include <unistd.h> | |
int | |
t@@ -623,8 +683,7 @@ EOF | |
exit (0); | |
} | |
EOF | |
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy … | |
- rm -f $dummy.c $dummy | |
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 | |
echo unknown-hitachi-hiuxwe2 | |
exit 0 ;; | |
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) | |
t@@ -633,7 +692,7 @@ EOF | |
9000/8??:4.3bsd:*:*) | |
echo hppa1.0-hp-bsd | |
exit 0 ;; | |
- *9??*:MPE/iX:*:*) | |
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) | |
echo hppa1.0-hp-mpeix | |
exit 0 ;; | |
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) | |
t@@ -652,9 +711,6 @@ EOF | |
parisc*:Lites*:*:*) | |
echo hppa1.1-hp-lites | |
exit 0 ;; | |
- hppa*:OpenBSD:*:*) | |
- echo hppa-unknown-openbsd | |
- exit 0 ;; | |
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) | |
echo c1-convex-bsd | |
exit 0 ;; | |
t@@ -673,41 +729,33 @@ EOF | |
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) | |
echo c4-convex-bsd | |
exit 0 ;; | |
- CRAY*X-MP:*:*:*) | |
- echo xmp-cray-unicos | |
- exit 0 ;; | |
CRAY*Y-MP:*:*:*) | |
- echo ymp-cray-unicos${UNAME_RELEASE} | |
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
exit 0 ;; | |
CRAY*[A-Z]90:*:*:*) | |
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | |
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ | |
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ | |
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ | |
+ -e 's/\.[^.]*$/.X/' | |
exit 0 ;; | |
CRAY*TS:*:*:*) | |
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
exit 0 ;; | |
- CRAY*T3D:*:*:*) | |
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
- exit 0 ;; | |
CRAY*T3E:*:*:*) | |
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
exit 0 ;; | |
CRAY*SV1:*:*:*) | |
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
exit 0 ;; | |
- CRAY-2:*:*:*) | |
- echo cray2-cray-unicos | |
- exit 0 ;; | |
+ *:UNICOS/mp:*:*) | |
+ echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' | |
+ exit 0 ;; | |
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) | |
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijkl… | |
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklm… | |
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` | |
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" | |
exit 0 ;; | |
- hp300:OpenBSD:*:*) | |
- echo m68k-unknown-openbsd${UNAME_RELEASE} | |
- exit 0 ;; | |
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) | |
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} | |
exit 0 ;; | |
t@@ -718,10 +766,18 @@ EOF | |
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} | |
exit 0 ;; | |
*:FreeBSD:*:*) | |
- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/… | |
- exit 0 ;; | |
- *:OpenBSD:*:*) | |
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/… | |
+ # Determine whether the default compiler uses glibc. | |
+ eval $set_cc_for_build | |
+ sed 's/^ //' << EOF >$dummy.c | |
+ #include <features.h> | |
+ #if __GLIBC__ >= 2 | |
+ LIBC=gnu | |
+ #else | |
+ LIBC= | |
+ #endif | |
+EOF | |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` | |
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/… | |
exit 0 ;; | |
i*:CYGWIN*:*) | |
echo ${UNAME_MACHINE}-pc-cygwin | |
t@@ -732,11 +788,17 @@ EOF | |
i*:PW*:*) | |
echo ${UNAME_MACHINE}-pc-pw32 | |
exit 0 ;; | |
+ x86:Interix*:3*) | |
+ echo i586-pc-interix3 | |
+ exit 0 ;; | |
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) | |
+ echo i${UNAME_MACHINE}-pc-mks | |
+ exit 0 ;; | |
i*:Windows_NT*:* | Pentium*:Windows_NT*:*) | |
# How do we know it's Interix rather than the generic POSIX subsystem? | |
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we | |
# UNAME_MACHINE based on the output of uname instead of i386? | |
- echo i386-pc-interix | |
+ echo i586-pc-interix | |
exit 0 ;; | |
i*:UWIN*:*) | |
echo ${UNAME_MACHINE}-pc-uwin | |
t@@ -757,103 +819,67 @@ EOF | |
echo ${UNAME_MACHINE}-unknown-linux-gnu | |
exit 0 ;; | |
ia64:Linux:*:*) | |
- echo ${UNAME_MACHINE}-unknown-linux | |
+ echo ${UNAME_MACHINE}-unknown-linux-gnu | |
exit 0 ;; | |
m68*:Linux:*:*) | |
echo ${UNAME_MACHINE}-unknown-linux-gnu | |
exit 0 ;; | |
mips:Linux:*:*) | |
- cat >$dummy.c <<EOF | |
-#ifdef __cplusplus | |
-#include <stdio.h> /* for printf() prototype */ | |
-int main (int argc, char *argv[]) { | |
-#else | |
-int main (argc, argv) int argc; char *argv[]; { | |
-#endif | |
-#ifdef __MIPSEB__ | |
- printf ("%s-unknown-linux-gnu\n", argv[1]); | |
-#endif | |
-#ifdef __MIPSEL__ | |
- printf ("%sel-unknown-linux-gnu\n", argv[1]); | |
-#endif | |
- return 0; | |
-} | |
+ eval $set_cc_for_build | |
+ sed 's/^ //' << EOF >$dummy.c | |
+ #undef CPU | |
+ #undef mips | |
+ #undef mipsel | |
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || de… | |
+ CPU=mipsel | |
+ #else | |
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || de… | |
+ CPU=mips | |
+ #else | |
+ CPU= | |
+ #endif | |
+ #endif | |
EOF | |
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACH… | |
- rm -f $dummy.c $dummy | |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | |
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 | |
;; | |
- ppc:Linux:*:*) | |
- # Determine Lib Version | |
- cat >$dummy.c <<EOF | |
-#include <features.h> | |
-#if defined(__GLIBC__) | |
-extern char __libc_version[]; | |
-extern char __libc_release[]; | |
-#endif | |
-main(argc, argv) | |
- int argc; | |
- char *argv[]; | |
-{ | |
-#if defined(__GLIBC__) | |
- printf("%s %s\n", __libc_version, __libc_release); | |
-#else | |
- printf("unknown\n"); | |
-#endif | |
- return 0; | |
-} | |
+ mips64:Linux:*:*) | |
+ eval $set_cc_for_build | |
+ sed 's/^ //' << EOF >$dummy.c | |
+ #undef CPU | |
+ #undef mips64 | |
+ #undef mips64el | |
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || de… | |
+ CPU=mips64el | |
+ #else | |
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || de… | |
+ CPU=mips64 | |
+ #else | |
+ CPU= | |
+ #endif | |
+ #endif | |
EOF | |
- LIBC="" | |
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null | |
- if test "$?" = 0 ; then | |
- ./$dummy | grep 1\.99 > /dev/null | |
- if test "$?" = 0 ; then LIBC="libc1" ; fi | |
- fi | |
- rm -f $dummy.c $dummy | |
- echo powerpc-unknown-linux-gnu${LIBC} | |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` | |
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 | |
+ ;; | |
+ ppc:Linux:*:*) | |
+ echo powerpc-unknown-linux-gnu | |
+ exit 0 ;; | |
+ ppc64:Linux:*:*) | |
+ echo powerpc64-unknown-linux-gnu | |
exit 0 ;; | |
alpha:Linux:*:*) | |
- cat <<EOF >$dummy.s | |
- .data | |
- \$Lformat: | |
- .byte 37,100,45,37,120,10,0 # "%d-%x\n" | |
- .text | |
- .globl main | |
- .align 4 | |
- .ent main | |
- main: | |
- .frame \$30,16,\$26,0 | |
- ldgp \$29,0(\$27) | |
- .prologue 1 | |
- .long 0x47e03d80 # implver \$0 | |
- lda \$2,-1 | |
- .long 0x47e20c21 # amask \$2,\$1 | |
- lda \$16,\$Lformat | |
- mov \$0,\$17 | |
- not \$1,\$18 | |
- jsr \$26,printf | |
- ldgp \$29,0(\$26) | |
- mov 0,\$16 | |
- jsr \$26,exit | |
- .end main | |
-EOF | |
- LIBC="" | |
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null | |
- if test "$?" = 0 ; then | |
- case `./$dummy` in | |
- 0-0) UNAME_MACHINE="alpha" ;; | |
- 1-0) UNAME_MACHINE="alphaev5" ;; | |
- 1-1) UNAME_MACHINE="alphaev56" ;; | |
- 1-101) UNAME_MACHINE="alphapca56" ;; | |
- 2-303) UNAME_MACHINE="alphaev6" ;; | |
- 2-307) UNAME_MACHINE="alphaev67" ;; | |
- esac | |
- objdump --private-headers $dummy | \ | |
- grep ld.so.1 > /dev/null | |
- if test "$?" = 0 ; then | |
- LIBC="libc1" | |
- fi | |
- fi | |
- rm -f $dummy.s $dummy | |
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in | |
+ EV5) UNAME_MACHINE=alphaev5 ;; | |
+ EV56) UNAME_MACHINE=alphaev56 ;; | |
+ PCA56) UNAME_MACHINE=alphapca56 ;; | |
+ PCA57) UNAME_MACHINE=alphapca56 ;; | |
+ EV6) UNAME_MACHINE=alphaev6 ;; | |
+ EV67) UNAME_MACHINE=alphaev67 ;; | |
+ EV68*) UNAME_MACHINE=alphaev68 ;; | |
+ esac | |
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null | |
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi | |
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} | |
exit 0 ;; | |
parisc:Linux:*:* | hppa:Linux:*:*) | |
t@@ -883,71 +909,59 @@ EOF | |
# The BFD linker knows what the default object file format is, so | |
# first see if it will tell us. cd to the root directory to prevent | |
# problems with other programs or directories called `ld' in the path. | |
- ld_supported_emulations=`cd /; ld --help 2>&1 \ | |
- | sed -ne '/supported emulations:/!d | |
+ # Set LC_ALL=C to ensure ld outputs messages in English. | |
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | |
+ | sed -ne '/supported targets:/!d | |
s/[ ][ ]*/ /g | |
- s/.*supported emulations: *// | |
+ s/.*supported targets: *// | |
s/ .*// | |
p'` | |
- case "$ld_supported_emulations" in | |
- i*86linux) | |
- echo "${UNAME_MACHINE}-pc-linux-gnuaout" | |
- exit 0 | |
- ;; | |
- elf_i*86) | |
+ case "$ld_supported_targets" in | |
+ elf32-i386) | |
TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" | |
;; | |
- i*86coff) | |
+ a.out-i386-linux) | |
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" | |
+ exit 0 ;; | |
+ coff-i386) | |
echo "${UNAME_MACHINE}-pc-linux-gnucoff" | |
- exit 0 | |
- ;; | |
- esac | |
- # Either a pre-BFD a.out linker (linux-gnuoldld) | |
- # or one that does not give us useful --help. | |
- # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. | |
- # If ld does not provide *any* "supported emulations:" | |
- # that means it is gnuoldld. | |
- test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-… | |
- case "${UNAME_MACHINE}" in | |
- i*86) | |
- VENDOR=pc; | |
- ;; | |
- *) | |
- VENDOR=unknown; | |
- ;; | |
+ exit 0 ;; | |
+ "") | |
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or | |
+ # one that does not give us useful --help. | |
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld" | |
+ exit 0 ;; | |
esac | |
# Determine whether the default compiler is a.out or elf | |
- cat >$dummy.c <<EOF | |
-#include <features.h> | |
-#ifdef __cplusplus | |
-#include <stdio.h> /* for printf() prototype */ | |
- int main (int argc, char *argv[]) { | |
-#else | |
- int main (argc, argv) int argc; char *argv[]; { | |
-#endif | |
-#ifdef __ELF__ | |
-# ifdef __GLIBC__ | |
-# if __GLIBC__ >= 2 | |
- printf ("%s-${VENDOR}-linux-gnu\n", argv[1]); | |
-# else | |
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); | |
-# endif | |
-# else | |
- printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]); | |
-# endif | |
-#else | |
- printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]); | |
-#endif | |
- return 0; | |
-} | |
+ eval $set_cc_for_build | |
+ sed 's/^ //' << EOF >$dummy.c | |
+ #include <features.h> | |
+ #ifdef __ELF__ | |
+ # ifdef __GLIBC__ | |
+ # if __GLIBC__ >= 2 | |
+ LIBC=gnu | |
+ # else | |
+ LIBC=gnulibc1 | |
+ # endif | |
+ # else | |
+ LIBC=gnulibc1 | |
+ # endif | |
+ #else | |
+ #ifdef __INTEL_COMPILER | |
+ LIBC=gnu | |
+ #else | |
+ LIBC=gnuaout | |
+ #endif | |
+ #endif | |
EOF | |
- $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACH… | |
- rm -f $dummy.c $dummy | |
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` | |
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && ex… | |
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 | |
;; | |
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions | |
-# are messed up and put the nodename in both sysname and nodename. | |
i*86:DYNIX/ptx:4*:*) | |
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. | |
+ # earlier versions are messed up and put the nodename in both | |
+ # sysname and nodename. | |
echo i386-sequent-sysv4 | |
exit 0 ;; | |
i*86:UNIX_SV:4.2MP:2.*) | |
t@@ -958,6 +972,23 @@ EOF | |
# Use sysv4.2uw... so that sysv4* matches it. | |
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} | |
exit 0 ;; | |
+ i*86:OS/2:*:*) | |
+ # If we were able to find `uname', then EMX Unix compatibility | |
+ # is probably installed. | |
+ echo ${UNAME_MACHINE}-pc-os2-emx | |
+ exit 0 ;; | |
+ i*86:XTS-300:*:STOP) | |
+ echo ${UNAME_MACHINE}-unknown-stop | |
+ exit 0 ;; | |
+ i*86:atheos:*:*) | |
+ echo ${UNAME_MACHINE}-unknown-atheos | |
+ exit 0 ;; | |
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | |
+ echo i386-unknown-lynxos${UNAME_RELEASE} | |
+ exit 0 ;; | |
+ i*86:*DOS:*:*) | |
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp | |
+ exit 0 ;; | |
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) | |
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` | |
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then | |
t@@ -966,36 +997,32 @@ EOF | |
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} | |
fi | |
exit 0 ;; | |
- i*86:*:5:7*) | |
- # Fixed at (any) Pentium or better | |
- UNAME_MACHINE=i586 | |
- if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then | |
- echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} | |
- else | |
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} | |
- fi | |
+ i*86:*:5:[78]*) | |
+ case `/bin/uname -X | grep "^Machine"` in | |
+ *486*) UNAME_MACHINE=i486 ;; | |
+ *Pentium) UNAME_MACHINE=i586 ;; | |
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;; | |
+ esac | |
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNA… | |
exit 0 ;; | |
i*86:*:3.2:*) | |
if test -f /usr/options/cb.name; then | |
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` | |
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL | |
elif /bin/uname -X 2>/dev/null >/dev/null ; then | |
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` | |
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 | |
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ | |
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` | |
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 | |
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ | |
&& UNAME_MACHINE=i586 | |
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ | |
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ | |
&& UNAME_MACHINE=i686 | |
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ | |
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ | |
&& UNAME_MACHINE=i686 | |
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL | |
else | |
echo ${UNAME_MACHINE}-pc-sysv32 | |
fi | |
exit 0 ;; | |
- i*86:*DOS:*:*) | |
- echo ${UNAME_MACHINE}-pc-msdosdjgpp | |
- exit 0 ;; | |
pc:*:*:*) | |
# Left here for compatibility: | |
# uname -m prints for DJGPP always 'pc', but it prints nothing about | |
t@@ -1019,9 +1046,15 @@ EOF | |
# "miniframe" | |
echo m68010-convergent-sysv | |
exit 0 ;; | |
+ mc68k:UNIX:SYSTEM5:3.51m) | |
+ echo m68k-convergent-sysv | |
+ exit 0 ;; | |
+ M680?0:D-NIX:5.3:*) | |
+ echo m68k-diab-dnix | |
+ exit 0 ;; | |
M68*:*:R3V[567]*:*) | |
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; | |
- 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:… | |
+ 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*… | |
OS_REL='' | |
test -r /etc/.relid \ | |
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | |
t@@ -1038,9 +1071,6 @@ EOF | |
mc68030:UNIX_System_V:4.*:*) | |
echo m68k-atari-sysv4 | |
exit 0 ;; | |
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) | |
- echo i386-unknown-lynxos${UNAME_RELEASE} | |
- exit 0 ;; | |
TSUNAMI:LynxOS:2.*:*) | |
echo sparc-unknown-lynxos${UNAME_RELEASE} | |
exit 0 ;; | |
t@@ -1067,8 +1097,8 @@ EOF | |
echo ns32k-sni-sysv | |
fi | |
exit 0 ;; | |
- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort | |
- # says <[email protected]> | |
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort | |
+ # says <[email protected]> | |
echo i586-unisys-sysv4 | |
exit 0 ;; | |
*:UNIX_System_V:4*:FTX*) | |
t@@ -1080,6 +1110,10 @@ EOF | |
# From [email protected]. | |
echo i860-stratus-sysv4 | |
exit 0 ;; | |
+ *:VOS:*:*) | |
+ # From [email protected]. | |
+ echo hppa1.1-stratus-vos | |
+ exit 0 ;; | |
mc68*:A/UX:*:*) | |
echo m68k-apple-aux${UNAME_RELEASE} | |
exit 0 ;; | |
t@@ -1108,6 +1142,9 @@ EOF | |
SX-5:SUPER-UX:*:*) | |
echo sx5-nec-superux${UNAME_RELEASE} | |
exit 0 ;; | |
+ SX-6:SUPER-UX:*:*) | |
+ echo sx6-nec-superux${UNAME_RELEASE} | |
+ exit 0 ;; | |
Power*:Rhapsody:*:*) | |
echo powerpc-apple-rhapsody${UNAME_RELEASE} | |
exit 0 ;; | |
t@@ -1115,18 +1152,24 @@ EOF | |
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} | |
exit 0 ;; | |
*:Darwin:*:*) | |
- echo `uname -p`-apple-darwin${UNAME_RELEASE} | |
+ case `uname -p` in | |
+ *86) UNAME_PROCESSOR=i686 ;; | |
+ powerpc) UNAME_PROCESSOR=powerpc ;; | |
+ esac | |
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} | |
exit 0 ;; | |
*:procnto*:*:* | *:QNX:[0123456789]*:*) | |
- if test "${UNAME_MACHINE}" = "x86pc"; then | |
+ UNAME_PROCESSOR=`uname -p` | |
+ if test "$UNAME_PROCESSOR" = "x86"; then | |
+ UNAME_PROCESSOR=i386 | |
UNAME_MACHINE=pc | |
fi | |
- echo `uname -p`-${UNAME_MACHINE}-nto-qnx | |
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} | |
exit 0 ;; | |
*:QNX:*:4*) | |
echo i386-pc-qnx | |
exit 0 ;; | |
- NSR-[KW]:NONSTOP_KERNEL:*:*) | |
+ NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) | |
echo nsr-tandem-nsk${UNAME_RELEASE} | |
exit 0 ;; | |
*:NonStop-UX:*:*) | |
t@@ -1149,11 +1192,6 @@ EOF | |
fi | |
echo ${UNAME_MACHINE}-unknown-plan9 | |
exit 0 ;; | |
- i*86:OS/2:*:*) | |
- # If we were able to find `uname', then EMX Unix compatibility | |
- # is probably installed. | |
- echo ${UNAME_MACHINE}-pc-os2-emx | |
- exit 0 ;; | |
*:TOPS-10:*:*) | |
echo pdp10-unknown-tops10 | |
exit 0 ;; | |
t@@ -1177,6 +1215,7 @@ esac | |
#echo '(No uname command or uname output not recognized.)' 1>&2 | |
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 | |
+eval $set_cc_for_build | |
cat >$dummy.c <<EOF | |
#ifdef _SEQUENT_ | |
# include <sys/types.h> | |
t@@ -1291,8 +1330,7 @@ main () | |
} | |
EOF | |
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $du… | |
-rm -f $dummy.c $dummy | |
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 | |
# Apollos put the system type in the environment. | |
diff --git a/config.sub b/config.sub | |
t@@ -1,9 +1,9 @@ | |
#! /bin/sh | |
# Configuration validation subroutine script. | |
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | |
-# Free Software Foundation, Inc. | |
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, | |
+# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. | |
-timestamp='2001-04-20' | |
+timestamp='2003-01-03' | |
# This file is (in principle) common to ALL GNU software. | |
# The presence of a machine in this file suggests that SOME GNU software | |
t@@ -29,7 +29,8 @@ timestamp='2001-04-20' | |
# configuration script generated by Autoconf, you may include it under | |
# the same distribution terms that you use for the rest of that program. | |
-# Please send patches to <[email protected]>. | |
+# Please send patches to <[email protected]>. Submit a context | |
+# diff and a properly formatted ChangeLog entry. | |
# | |
# Configuration subroutine to validate and canonicalize a configuration type. | |
# Supply the specified configuration type as an argument. | |
t@@ -117,7 +118,7 @@ esac | |
# Here we must recognize all the valid KERNEL-OS combinations. | |
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` | |
case $maybe_os in | |
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) | |
+ nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-em… | |
os=-$maybe_os | |
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` | |
;; | |
t@@ -157,6 +158,14 @@ case $os in | |
os=-vxworks | |
basic_machine=$1 | |
;; | |
+ -chorusos*) | |
+ os=-chorusos | |
+ basic_machine=$1 | |
+ ;; | |
+ -chorusrdb) | |
+ os=-chorusrdb | |
+ basic_machine=$1 | |
+ ;; | |
-hiux*) | |
os=-hiuxwe2 | |
;; | |
t@@ -215,26 +224,49 @@ esac | |
case $basic_machine in | |
# Recognize the basic CPU types without company name. | |
# Some are omitted here because they have special meanings below. | |
- tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \ | |
- | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | str… | |
- | pyramid | mn10200 | mn10300 | tron | a29k \ | |
- | 580 | i960 | h8300 \ | |
- | x86 | ppcbe | mipsbe | mipsle | shbe | shle \ | |
- | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ | |
- | hppa64 \ | |
- | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ | |
- | alphaev6[78] \ | |
- | we32k | ns16k | clipper | i370 | sh | sh[34] \ | |
- | powerpc | powerpcle \ | |
- | 1750a | dsp16xx | pdp10 | pdp11 \ | |
- | mips16 | mips64 | mipsel | mips64el \ | |
- | mips64orion | mips64orionel | mipstx39 | mipstx39el \ | |
- | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100e… | |
- | mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \ | |
- | sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \ | |
- | v850 | c4x \ | |
- | thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \ | |
- | pj | pjl | h8500) | |
+ 1750a | 580 \ | |
+ | a29k \ | |
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | |
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca… | |
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ | |
+ | clipper \ | |
+ | d10v | d30v | dlx | dsp16xx \ | |
+ | fr30 | frv \ | |
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | |
+ | i370 | i860 | i960 | ia64 \ | |
+ | ip2k \ | |
+ | m32r | m68000 | m68k | m88k | mcore \ | |
+ | mips | mipsbe | mipseb | mipsel | mipsle \ | |
+ | mips16 \ | |
+ | mips64 | mips64el \ | |
+ | mips64vr | mips64vrel \ | |
+ | mips64orion | mips64orionel \ | |
+ | mips64vr4100 | mips64vr4100el \ | |
+ | mips64vr4300 | mips64vr4300el \ | |
+ | mips64vr5000 | mips64vr5000el \ | |
+ | mipsisa32 | mipsisa32el \ | |
+ | mipsisa32r2 | mipsisa32r2el \ | |
+ | mipsisa64 | mipsisa64el \ | |
+ | mipsisa64sb1 | mipsisa64sb1el \ | |
+ | mipsisa64sr71k | mipsisa64sr71kel \ | |
+ | mipstx39 | mipstx39el \ | |
+ | mn10200 | mn10300 \ | |
+ | msp430 \ | |
+ | ns16k | ns32k \ | |
+ | openrisc | or32 \ | |
+ | pdp10 | pdp11 | pj | pjl \ | |
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | |
+ | pyramid \ | |
+ | s390 | s390x \ | |
+ | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | |
+ | sh64 | sh64le \ | |
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv… | |
+ | strongarm \ | |
+ | tahoe | thumb | tic80 | tron \ | |
+ | v850 | v850e \ | |
+ | we32k \ | |
+ | x86 | xscale | xstormy16 | xtensa \ | |
+ | z8k) | |
basic_machine=$basic_machine-unknown | |
;; | |
m6811 | m68hc11 | m6812 | m68hc12) | |
t@@ -242,7 +274,7 @@ case $basic_machine in | |
basic_machine=$basic_machine-unknown | |
os=-none | |
;; | |
- m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65) | |
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) | |
;; | |
# We use `pc' rather than `unknown' | |
t@@ -257,31 +289,59 @@ case $basic_machine in | |
exit 1 | |
;; | |
# Recognize the basic CPU types with company name. | |
- # FIXME: clean up the formatting here. | |
- vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-… | |
- | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \ | |
- | arm-* | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \ | |
- | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ | |
- | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-… | |
- | xmp-* | ymp-* \ | |
- | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \ | |
- | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ | |
- | hppa2.0n-* | hppa64-* \ | |
- | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ | |
- | alphaev6[78]-* \ | |
- | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ | |
- | clipper-* | orion-* \ | |
- | sparclite-* | pdp10-* | pdp11-* | sh-* | powerpc-* | powerpcle… | |
- | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \ | |
- | mips16-* | mips64-* | mipsel-* \ | |
- | mips64el-* | mips64orion-* | mips64orionel-* \ | |
- | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4… | |
- | mipstx39-* | mipstx39el-* | mcore-* \ | |
- | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \ | |
- | [cjt]90-* \ | |
- | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v… | |
- | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-*… | |
- | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*) | |
+ 580-* \ | |
+ | a29k-* \ | |
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | |
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | |
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | |
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | |
+ | avr-* \ | |
+ | bs2000-* \ | |
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ | |
+ | clipper-* | cydra-* \ | |
+ | d10v-* | d30v-* | dlx-* \ | |
+ | elxsi-* \ | |
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ | |
+ | h8300-* | h8500-* \ | |
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | |
+ | i*86-* | i860-* | i960-* | ia64-* \ | |
+ | ip2k-* \ | |
+ | m32r-* \ | |
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | |
+ | m88110-* | m88k-* | mcore-* \ | |
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | |
+ | mips16-* \ | |
+ | mips64-* | mips64el-* \ | |
+ | mips64vr-* | mips64vrel-* \ | |
+ | mips64orion-* | mips64orionel-* \ | |
+ | mips64vr4100-* | mips64vr4100el-* \ | |
+ | mips64vr4300-* | mips64vr4300el-* \ | |
+ | mips64vr5000-* | mips64vr5000el-* \ | |
+ | mipsisa32-* | mipsisa32el-* \ | |
+ | mipsisa32r2-* | mipsisa32r2el-* \ | |
+ | mipsisa64-* | mipsisa64el-* \ | |
+ | mipsisa64sb1-* | mipsisa64sb1el-* \ | |
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | |
+ | mipstx39-* | mipstx39el-* \ | |
+ | msp430-* \ | |
+ | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | |
+ | orion-* \ | |
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | |
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | |
+ | pyramid-* \ | |
+ | romp-* | rs6000-* \ | |
+ | s390-* | s390x-* \ | |
+ | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ | |
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | |
+ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | |
+ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | |
+ | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ | |
+ | v850-* | v850e-* | vax-* \ | |
+ | we32k-* \ | |
+ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ | |
+ | xtensa-* \ | |
+ | ymp-* \ | |
+ | z8k-*) | |
;; | |
# Recognize the various machine names and aliases which stand | |
# for a CPU type and a company and sometimes even an OS. | |
t@@ -344,6 +404,10 @@ case $basic_machine in | |
basic_machine=ns32k-sequent | |
os=-dynix | |
;; | |
+ c90) | |
+ basic_machine=c90-cray | |
+ os=-unicos | |
+ ;; | |
convex-c1) | |
basic_machine=c1-convex | |
os=-bsd | |
t@@ -364,16 +428,8 @@ case $basic_machine in | |
basic_machine=c38-convex | |
os=-bsd | |
;; | |
- cray | ymp) | |
- basic_machine=ymp-cray | |
- os=-unicos | |
- ;; | |
- cray2) | |
- basic_machine=cray2-cray | |
- os=-unicos | |
- ;; | |
- [cjt]90) | |
- basic_machine=${basic_machine}-cray | |
+ cray | j90) | |
+ basic_machine=j90-cray | |
os=-unicos | |
;; | |
crds | unos) | |
t@@ -388,6 +444,14 @@ case $basic_machine in | |
decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decsta… | |
basic_machine=mips-dec | |
;; | |
+ decsystem10* | dec10*) | |
+ basic_machine=pdp10-dec | |
+ os=-tops10 | |
+ ;; | |
+ decsystem20* | dec20*) | |
+ basic_machine=pdp10-dec | |
+ os=-tops20 | |
+ ;; | |
delta | 3300 | motorola-3300 | motorola-delta \ | |
| 3300-motorola | delta-motorola) | |
basic_machine=m68k-motorola | |
t@@ -568,14 +632,6 @@ case $basic_machine in | |
basic_machine=m68k-atari | |
os=-mint | |
;; | |
- mipsel*-linux*) | |
- basic_machine=mipsel-unknown | |
- os=-linux-gnu | |
- ;; | |
- mips*-linux*) | |
- basic_machine=mips-unknown | |
- os=-linux-gnu | |
- ;; | |
mips3*-*) | |
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` | |
;; | |
t@@ -590,6 +646,10 @@ case $basic_machine in | |
basic_machine=m68k-rom68k | |
os=-coff | |
;; | |
+ morphos) | |
+ basic_machine=powerpc-unknown | |
+ os=-morphos | |
+ ;; | |
msdos) | |
basic_machine=i386-pc | |
os=-msdos | |
t@@ -662,6 +722,10 @@ case $basic_machine in | |
np1) | |
basic_machine=np1-gould | |
;; | |
+ nv1) | |
+ basic_machine=nv1-cray | |
+ os=-unicosmp | |
+ ;; | |
nsr-tandem) | |
basic_machine=nsr-tandem | |
;; | |
t@@ -669,6 +733,10 @@ case $basic_machine in | |
basic_machine=hppa1.1-oki | |
os=-proelf | |
;; | |
+ or32 | or32-*) | |
+ basic_machine=or32-unknown | |
+ os=-coff | |
+ ;; | |
OSE68000 | ose68000) | |
basic_machine=m68000-ericsson | |
os=-ose | |
t@@ -691,19 +759,19 @@ case $basic_machine in | |
pbb) | |
basic_machine=m68k-tti | |
;; | |
- pc532 | pc532-*) | |
+ pc532 | pc532-*) | |
basic_machine=ns32k-pc532 | |
;; | |
- pentium | p5 | k5 | k6 | nexgen) | |
+ pentium | p5 | k5 | k6 | nexgen | viac3) | |
basic_machine=i586-pc | |
;; | |
- pentiumpro | p6 | 6x86 | athlon) | |
+ pentiumpro | p6 | 6x86 | athlon | athlon_*) | |
basic_machine=i686-pc | |
;; | |
pentiumii | pentium2) | |
basic_machine=i686-pc | |
;; | |
- pentium-* | p5-* | k5-* | k6-* | nexgen-*) | |
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | |
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` | |
;; | |
pentiumpro-* | p6-* | 6x86-* | athlon-*) | |
t@@ -718,15 +786,25 @@ case $basic_machine in | |
power) basic_machine=power-ibm | |
;; | |
ppc) basic_machine=powerpc-unknown | |
- ;; | |
+ ;; | |
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-… | |
;; | |
ppcle | powerpclittle | ppc-le | powerpc-little) | |
basic_machine=powerpcle-unknown | |
- ;; | |
+ ;; | |
ppcle-* | powerpclittle-*) | |
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-/… | |
;; | |
+ ppc64) basic_machine=powerpc64-unknown | |
+ ;; | |
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-… | |
+ ;; | |
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little) | |
+ basic_machine=powerpc64le-unknown | |
+ ;; | |
+ ppc64le-* | powerpc64little-*) | |
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*… | |
+ ;; | |
ps2) | |
basic_machine=i386-ibm | |
;; | |
t@@ -748,6 +826,12 @@ case $basic_machine in | |
basic_machine=a29k-amd | |
os=-udi | |
;; | |
+ sb1) | |
+ basic_machine=mipsisa64sb1-unknown | |
+ ;; | |
+ sb1el) | |
+ basic_machine=mipsisa64sb1el-unknown | |
+ ;; | |
sequent) | |
basic_machine=i386-sequent | |
;; | |
t@@ -755,7 +839,7 @@ case $basic_machine in | |
basic_machine=sh-hitachi | |
os=-hms | |
;; | |
- sparclite-wrs) | |
+ sparclite-wrs | simso-wrs) | |
basic_machine=sparclite-wrs | |
os=-vxworks | |
;; | |
t@@ -822,9 +906,17 @@ case $basic_machine in | |
os=-dynix | |
;; | |
t3e) | |
- basic_machine=t3e-cray | |
+ basic_machine=alphaev5-cray | |
+ os=-unicos | |
+ ;; | |
+ t90) | |
+ basic_machine=t90-cray | |
os=-unicos | |
;; | |
+ tic4x | c4x*) | |
+ basic_machine=tic4x-unknown | |
+ os=-coff | |
+ ;; | |
tic54x | c54x*) | |
basic_machine=tic54x-unknown | |
os=-coff | |
t@@ -835,6 +927,10 @@ case $basic_machine in | |
tx39el) | |
basic_machine=mipstx39el-unknown | |
;; | |
+ toad1) | |
+ basic_machine=pdp10-xkl | |
+ os=-tops20 | |
+ ;; | |
tower | tower-32) | |
basic_machine=m68k-ncr | |
;; | |
t@@ -859,8 +955,8 @@ case $basic_machine in | |
os=-vms | |
;; | |
vpp*|vx|vx-*) | |
- basic_machine=f301-fujitsu | |
- ;; | |
+ basic_machine=f301-fujitsu | |
+ ;; | |
vxworks960) | |
basic_machine=i960-wrs | |
os=-vxworks | |
t@@ -881,13 +977,13 @@ case $basic_machine in | |
basic_machine=hppa1.1-winbond | |
os=-proelf | |
;; | |
- xmp) | |
- basic_machine=xmp-cray | |
- os=-unicos | |
- ;; | |
- xps | xps100) | |
+ xps | xps100) | |
basic_machine=xps100-honeywell | |
;; | |
+ ymp) | |
+ basic_machine=ymp-cray | |
+ os=-unicos | |
+ ;; | |
z8k-*-coff) | |
basic_machine=z8k-unknown | |
os=-sim | |
t@@ -908,13 +1004,6 @@ case $basic_machine in | |
op60c) | |
basic_machine=hppa1.1-oki | |
;; | |
- mips) | |
- if [ x$os = x-linux-gnu ]; then | |
- basic_machine=mips-unknown | |
- else | |
- basic_machine=mips-mips | |
- fi | |
- ;; | |
romp) | |
basic_machine=romp-ibm | |
;; | |
t@@ -934,13 +1023,16 @@ case $basic_machine in | |
we32k) | |
basic_machine=we32k-att | |
;; | |
- sh3 | sh4) | |
+ sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) | |
basic_machine=sh-unknown | |
;; | |
+ sh64) | |
+ basic_machine=sh64-unknown | |
+ ;; | |
sparc | sparcv9 | sparcv9b) | |
basic_machine=sparc-sun | |
;; | |
- cydra) | |
+ cydra) | |
basic_machine=cydra-cydrome | |
;; | |
orion) | |
t@@ -955,10 +1047,6 @@ case $basic_machine in | |
pmac | pmac-mpw) | |
basic_machine=powerpc-apple | |
;; | |
- c4x*) | |
- basic_machine=c4x-none | |
- os=-coff | |
- ;; | |
*-unknown) | |
# Make sure to match an already-canonicalized machine name. | |
;; | |
t@@ -1018,11 +1106,15 @@ case $os in | |
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oa… | |
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | |
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | |
+ | -chorusos* | -chorusrdb* \ | |
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | |
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ | |
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | |
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | |
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | |
- | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*) | |
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | |
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | |
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | |
+ | -powermax* | -dnix* | -microbsd*) | |
# Remember, each alternative MUST END IN *, to match a version number. | |
;; | |
-qnx*) | |
t@@ -1034,8 +1126,10 @@ case $os in | |
;; | |
esac | |
;; | |
+ -nto-qnx*) | |
+ ;; | |
-nto*) | |
- os=-nto-qnx | |
+ os=`echo $os | sed -e 's|nto|nto-qnx|'` | |
;; | |
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | |
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \ | |
t@@ -1074,14 +1168,20 @@ case $os in | |
-acis*) | |
os=-aos | |
;; | |
+ -atheos*) | |
+ os=-atheos | |
+ ;; | |
-386bsd) | |
os=-bsd | |
;; | |
-ctix* | -uts*) | |
os=-sysv | |
;; | |
+ -nova*) | |
+ os=-rtmk-nova | |
+ ;; | |
-ns2 ) | |
- os=-nextstep2 | |
+ os=-nextstep2 | |
;; | |
-nsk*) | |
os=-nsk | |
t@@ -1120,8 +1220,8 @@ case $os in | |
-xenix) | |
os=-xenix | |
;; | |
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | |
- os=-mint | |
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | |
+ os=-mint | |
;; | |
-none) | |
;; | |
t@@ -1154,10 +1254,11 @@ case $basic_machine in | |
arm*-semi) | |
os=-aout | |
;; | |
+ # This must come before the *-dec entry. | |
pdp10-*) | |
os=-tops20 | |
;; | |
- pdp11-*) | |
+ pdp11-*) | |
os=-none | |
;; | |
*-dec | vax-*) | |
t@@ -1184,6 +1285,9 @@ case $basic_machine in | |
mips*-*) | |
os=-elf | |
;; | |
+ or32-*) | |
+ os=-coff | |
+ ;; | |
*-tti) # must be before sparc entry or we get the wrong os. | |
os=-sysv3 | |
;; | |
t@@ -1247,19 +1351,19 @@ case $basic_machine in | |
*-next) | |
os=-nextstep3 | |
;; | |
- *-gould) | |
+ *-gould) | |
os=-sysv | |
;; | |
- *-highlevel) | |
+ *-highlevel) | |
os=-bsd | |
;; | |
*-encore) | |
os=-bsd | |
;; | |
- *-sgi) | |
+ *-sgi) | |
os=-irix | |
;; | |
- *-siemens) | |
+ *-siemens) | |
os=-sysv4 | |
;; | |
*-masscomp) | |
t@@ -1331,7 +1435,7 @@ case $basic_machine in | |
-ptx*) | |
vendor=sequent | |
;; | |
- -vxsim* | -vxworks*) | |
+ -vxsim* | -vxworks* | -windiss*) | |
vendor=wrs | |
;; | |
-aux*) | |
t@@ -1346,6 +1450,9 @@ case $basic_machine in | |
-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) | |
vendor=atari | |
;; | |
+ -vos*) | |
+ vendor=stratus | |
+ ;; | |
esac | |
basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` | |
;; | |
diff --git a/ltmain.sh b/ltmain.sh | |
t@@ -48,15 +48,18 @@ EOF | |
exit 0 | |
fi | |
+# define SED for historic ltconfig's generated by Libtool 1.3 | |
+test -z "$SED" && SED=sed | |
+ | |
# The name of this program. | |
-progname=`$echo "$0" | sed 's%^.*/%%'` | |
+progname=`$echo "$0" | ${SED} 's%^.*/%%'` | |
modename="$progname" | |
# Constants. | |
PROGRAM=ltmain.sh | |
PACKAGE=libtool | |
-VERSION=1.4.2 | |
-TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)" | |
+VERSION=1.4.3 | |
+TIMESTAMP=" (1.922.2.111 2002/10/23 02:54:36)" | |
default_mode= | |
help="Try \`$progname --help' for more information." | |
t@@ -67,10 +70,19 @@ rm="rm -f" | |
# Sed substitution that helps us do robust quoting. It backslashifies | |
# metacharacters that are still active within double-quoted strings. | |
-Xsed='sed -e 1s/^X//' | |
+Xsed="${SED}"' -e 1s/^X//' | |
sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' | |
-SP2NL='tr \040 \012' | |
-NL2SP='tr \015\012 \040\040' | |
+# test EBCDIC or ASCII | |
+case `echo A|od -x` in | |
+ *[Cc]1*) # EBCDIC based system | |
+ SP2NL="tr '\100' '\n'" | |
+ NL2SP="tr '\r\n' '\100\100'" | |
+ ;; | |
+ *) # Assume ASCII based system | |
+ SP2NL="tr '\040' '\012'" | |
+ NL2SP="tr '\015\012' '\040\040'" | |
+ ;; | |
+esac | |
# NLS nuisances. | |
# Only set LANG and LC_ALL to C if already set. | |
t@@ -144,7 +156,7 @@ do | |
;; | |
--config) | |
- sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,… | |
+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFI… | |
exit 0 | |
;; | |
t@@ -177,6 +189,8 @@ do | |
--mode) prevopt="--mode" prev=mode ;; | |
--mode=*) mode="$optarg" ;; | |
+ --preserve-dup-deps) duplicate_deps="yes" ;; | |
+ | |
--quiet | --silent) | |
show=: | |
;; | |
t@@ -215,7 +229,7 @@ if test -z "$show_help"; then | |
# Infer the operation mode. | |
if test -z "$mode"; then | |
case $nonopt in | |
- *cc | *++ | gcc* | *-gcc*) | |
+ *cc | *++ | gcc* | *-gcc* | xlc*) | |
mode=link | |
for arg | |
do | |
t@@ -757,6 +771,7 @@ compiler." | |
linker_flags= | |
dllsearchpath= | |
lib_search_path=`pwd` | |
+ inst_prefix_dir= | |
avoid_version=no | |
dlfiles= | |
t@@ -887,6 +902,11 @@ compiler." | |
prev= | |
continue | |
;; | |
+ inst_prefix) | |
+ inst_prefix_dir="$arg" | |
+ prev= | |
+ continue | |
+ ;; | |
release) | |
release="-$arg" | |
prev= | |
t@@ -988,11 +1008,16 @@ compiler." | |
continue | |
;; | |
+ -inst-prefix-dir) | |
+ prev=inst_prefix | |
+ continue | |
+ ;; | |
+ | |
# The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* | |
# so, if we see these flags be careful not to treat them like -L | |
-L[A-Z][A-Z]*:*) | |
case $with_gcc/$host in | |
- no/*-*-irix*) | |
+ no/*-*-irix* | no/*-*-nonstopux*) | |
compile_command="$compile_command $arg" | |
finalize_command="$finalize_command $arg" | |
;; | |
t@@ -1043,14 +1068,14 @@ compiler." | |
# These systems don't actually have a C library (as such) | |
test "X$arg" = "X-lc" && continue | |
;; | |
- *-*-openbsd*) | |
+ *-*-openbsd* | *-*-freebsd*) | |
# Do not include libc due to us having libc/libc_r. | |
test "X$arg" = "X-lc" && continue | |
;; | |
esac | |
elif test "X$arg" = "X-lc_r"; then | |
case $host in | |
- *-*-openbsd*) | |
+ *-*-openbsd* | *-*-freebsd*) | |
# Do not include libc_r directly, use -pthread flag. | |
continue | |
;; | |
t@@ -1303,11 +1328,11 @@ compiler." | |
output_objdir="$output_objdir/$objdir" | |
fi | |
# Create the object directory. | |
- if test ! -d "$output_objdir"; then | |
+ if test ! -d $output_objdir; then | |
$show "$mkdir $output_objdir" | |
$run $mkdir $output_objdir | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$output_objdir"; then | |
+ if test $status -ne 0 && test ! -d $output_objdir; then | |
exit $status | |
fi | |
fi | |
t@@ -1330,9 +1355,11 @@ compiler." | |
# Find all interdependent deplibs by searching for libraries | |
# that are linked more than once (e.g. -la -lb -la) | |
for deplib in $deplibs; do | |
- case "$libs " in | |
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
- esac | |
+ if test "X$duplicate_deps" = "Xyes" ; then | |
+ case "$libs " in | |
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
+ esac | |
+ fi | |
libs="$libs $deplib" | |
done | |
deplibs= | |
t@@ -1366,7 +1393,7 @@ compiler." | |
;; | |
esac | |
for pass in $passes; do | |
- if test "$linkmode" = prog; then | |
+ if test $linkmode = prog; then | |
# Determine which files to process | |
case $pass in | |
dlopen) | |
t@@ -1383,11 +1410,11 @@ compiler." | |
found=no | |
case $deplib in | |
-l*) | |
- if test "$linkmode" = oldlib && test "$linkmode" = obj; then | |
+ if test $linkmode = oldlib && test $linkmode = obj; then | |
$echo "$modename: warning: \`-l' is ignored for archives/objects: … | |
continue | |
fi | |
- if test "$pass" = conv; then | |
+ if test $pass = conv; then | |
deplibs="$deplib $deplibs" | |
continue | |
fi | |
t@@ -1407,7 +1434,7 @@ compiler." | |
finalize_deplibs="$deplib $finalize_deplibs" | |
else | |
deplibs="$deplib $deplibs" | |
- test "$linkmode" = lib && newdependency_libs="$deplib $newdepend… | |
+ test $linkmode = lib && newdependency_libs="$deplib $newdependen… | |
fi | |
continue | |
fi | |
t@@ -1416,16 +1443,16 @@ compiler." | |
case $linkmode in | |
lib) | |
deplibs="$deplib $deplibs" | |
- test "$pass" = conv && continue | |
+ test $pass = conv && continue | |
newdependency_libs="$deplib $newdependency_libs" | |
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed… | |
;; | |
prog) | |
- if test "$pass" = conv; then | |
+ if test $pass = conv; then | |
deplibs="$deplib $deplibs" | |
continue | |
fi | |
- if test "$pass" = scan; then | |
+ if test $pass = scan; then | |
deplibs="$deplib $deplibs" | |
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xs… | |
else | |
t@@ -1440,7 +1467,7 @@ compiler." | |
continue | |
;; # -L | |
-R*) | |
- if test "$pass" = link; then | |
+ if test $pass = link; then | |
dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` | |
# Make sure the xrpath contains only unique directories. | |
case "$xrpath " in | |
t@@ -1453,7 +1480,7 @@ compiler." | |
;; | |
*.la) lib="$deplib" ;; | |
*.$libext) | |
- if test "$pass" = conv; then | |
+ if test $pass = conv; then | |
deplibs="$deplib $deplibs" | |
continue | |
fi | |
t@@ -1461,10 +1488,12 @@ compiler." | |
lib) | |
if test "$deplibs_check_method" != pass_all; then | |
echo | |
- echo "*** Warning: This library needs some functionality provide… | |
+ echo "*** Warning: Trying to link with static lib archive $depli… | |
echo "*** I have the capability to make that library automatical… | |
echo "*** you link to this library. But I can only do this if y… | |
- echo "*** shared version of the library, which you do not appear… | |
+ echo "*** shared version of the library, which you do not appear… | |
+ echo "*** because the file extensions .$libext of this argument … | |
+ echo "*** that it is just a static archive that I should not use… | |
else | |
echo | |
echo "*** Warning: Linking the shared library $output against th… | |
t@@ -1474,7 +1503,7 @@ compiler." | |
continue | |
;; | |
prog) | |
- if test "$pass" != link; then | |
+ if test $pass != link; then | |
deplibs="$deplib $deplibs" | |
else | |
compile_deplibs="$deplib $compile_deplibs" | |
t@@ -1485,7 +1514,7 @@ compiler." | |
esac # linkmode | |
;; # *.$libext | |
*.lo | *.$objext) | |
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test… | |
+ if test $pass = dlpreopen || test "$dlopen_support" != yes || test "… | |
# If there is no dlopen support or we're linking statically, | |
# we need to preload. | |
newdlprefiles="$newdlprefiles $deplib" | |
t@@ -1501,14 +1530,14 @@ compiler." | |
continue | |
;; | |
esac # case $deplib | |
- if test "$found" = yes || test -f "$lib"; then : | |
+ if test $found = yes || test -f "$lib"; then : | |
else | |
$echo "$modename: cannot find the library \`$lib'" 1>&2 | |
exit 1 | |
fi | |
# Check to see that this really is a libtool archive. | |
- if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null … | |
+ if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/nu… | |
else | |
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 | |
exit 1 | |
t@@ -1535,13 +1564,13 @@ compiler." | |
if test "$linkmode,$pass" = "lib,link" || | |
test "$linkmode,$pass" = "prog,scan" || | |
- { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then | |
+ { test $linkmode = oldlib && test $linkmode = obj; }; then | |
# Add dl[pre]opened files of deplib | |
test -n "$dlopen" && dlfiles="$dlfiles $dlopen" | |
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" | |
fi | |
- if test "$pass" = conv; then | |
+ if test $pass = conv; then | |
# Only check for convenience libraries | |
deplibs="$lib $deplibs" | |
if test -z "$libdir"; then | |
t@@ -1555,12 +1584,14 @@ compiler." | |
tmp_libs= | |
for deplib in $dependency_libs; do | |
deplibs="$deplib $deplibs" | |
- case "$tmp_libs " in | |
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
- esac | |
+ if test "X$duplicate_deps" = "Xyes" ; then | |
+ case "$tmp_libs " in | |
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
+ esac | |
+ fi | |
tmp_libs="$tmp_libs $deplib" | |
done | |
- elif test "$linkmode" != prog && test "$linkmode" != lib; then | |
+ elif test $linkmode != prog && test $linkmode != lib; then | |
$echo "$modename: \`$lib' is not a convenience library" 1>&2 | |
exit 1 | |
fi | |
t@@ -1578,7 +1609,7 @@ compiler." | |
fi | |
# This library was specified with -dlopen. | |
- if test "$pass" = dlopen; then | |
+ if test $pass = dlopen; then | |
if test -z "$libdir"; then | |
$echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1… | |
exit 1 | |
t@@ -1627,7 +1658,7 @@ compiler." | |
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` | |
# This library was specified with -dlpreopen. | |
- if test "$pass" = dlpreopen; then | |
+ if test $pass = dlpreopen; then | |
if test -z "$libdir"; then | |
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'… | |
exit 1 | |
t@@ -1646,7 +1677,7 @@ compiler." | |
if test -z "$libdir"; then | |
# Link the convenience library | |
- if test "$linkmode" = lib; then | |
+ if test $linkmode = lib; then | |
deplibs="$dir/$old_library $deplibs" | |
elif test "$linkmode,$pass" = "prog,link"; then | |
compile_deplibs="$dir/$old_library $compile_deplibs" | |
t@@ -1657,7 +1688,7 @@ compiler." | |
continue | |
fi | |
- if test "$linkmode" = prog && test "$pass" != link; then | |
+ if test $linkmode = prog && test $pass != link; then | |
newlib_search_path="$newlib_search_path $ladir" | |
deplibs="$lib $deplibs" | |
t@@ -1673,16 +1704,18 @@ compiler." | |
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | … | |
esac | |
# Need to link against all dependency_libs? | |
- if test "$linkalldeplibs" = yes; then | |
+ if test $linkalldeplibs = yes; then | |
deplibs="$deplib $deplibs" | |
else | |
# Need to hardcode shared library paths | |
# or/and link against static libraries | |
newdependency_libs="$deplib $newdependency_libs" | |
fi | |
- case "$tmp_libs " in | |
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
- esac | |
+ if test "X$duplicate_deps" = "Xyes" ; then | |
+ case "$tmp_libs " in | |
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
+ esac | |
+ fi | |
tmp_libs="$tmp_libs $deplib" | |
done # for deplib | |
continue | |
t@@ -1694,7 +1727,7 @@ compiler." | |
# Link against this shared library | |
if test "$linkmode,$pass" = "prog,link" || | |
- { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; th… | |
+ { test $linkmode = lib && test $hardcode_into_libs = yes; }; then | |
# Hardcode the library path. | |
# Skip directories that are in the system default run-time | |
# search path. | |
t@@ -1716,7 +1749,7 @@ compiler." | |
esac | |
;; | |
esac | |
- if test "$linkmode" = prog; then | |
+ if test $linkmode = prog; then | |
# We need to hardcode the library path | |
if test -n "$shlibpath_var"; then | |
# Make sure the rpath contains only unique directories. | |
t@@ -1766,8 +1799,8 @@ compiler." | |
# Make a new name for the extract_expsyms_cmds to use | |
soroot="$soname" | |
- soname=`echo $soroot | sed -e 's/^.*\///'` | |
- newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a" | |
+ soname=`echo $soroot | ${SED} -e 's/^.*\///'` | |
+ newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" | |
# If the library has no export list, then create one now | |
if test -f "$output_objdir/$soname-def"; then : | |
t@@ -1798,9 +1831,9 @@ compiler." | |
# make sure the library variables are pointing to the new library | |
dir=$output_objdir | |
linklib=$newlib | |
- fi # test -n "$old_archive_from_expsyms_cmds" | |
+ fi # test -n $old_archive_from_expsyms_cmds | |
- if test "$linkmode" = prog || test "$mode" != relink; then | |
+ if test $linkmode = prog || test "$mode" != relink; then | |
add_shlibpath= | |
add_dir= | |
add= | |
t@@ -1849,7 +1882,7 @@ compiler." | |
*) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; | |
esac | |
fi | |
- if test "$linkmode" = prog; then | |
+ if test $linkmode = prog; then | |
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" | |
test -n "$add" && compile_deplibs="$add $compile_deplibs" | |
else | |
t@@ -1866,7 +1899,7 @@ compiler." | |
fi | |
fi | |
- if test "$linkmode" = prog || test "$mode" = relink; then | |
+ if test $linkmode = prog || test "$mode" = relink; then | |
add_shlibpath= | |
add_dir= | |
add= | |
t@@ -1874,7 +1907,16 @@ compiler." | |
if test "$hardcode_direct" = yes; then | |
add="$libdir/$linklib" | |
elif test "$hardcode_minus_L" = yes; then | |
- add_dir="-L$libdir" | |
+ # Try looking first in the location we're being installed to. | |
+ add_dir= | |
+ if test -n "$inst_prefix_dir"; then | |
+ case "$libdir" in | |
+ [\\/]*) | |
+ add_dir="-L$inst_prefix_dir$libdir" | |
+ ;; | |
+ esac | |
+ fi | |
+ add_dir="$add_dir -L$libdir" | |
add="-l$name" | |
elif test "$hardcode_shlibpath_var" = yes; then | |
case :$finalize_shlibpath: in | |
t@@ -1884,11 +1926,20 @@ compiler." | |
add="-l$name" | |
else | |
# We cannot seem to hardcode it, guess we'll fake it. | |
- add_dir="-L$libdir" | |
+ # Try looking first in the location we're being installed to. | |
+ add_dir= | |
+ if test -n "$inst_prefix_dir"; then | |
+ case "$libdir" in | |
+ [\\/]*) | |
+ add_dir="-L$inst_prefix_dir$libdir" | |
+ ;; | |
+ esac | |
+ fi | |
+ add_dir="$add_dir -L$libdir" | |
add="-l$name" | |
fi | |
- if test "$linkmode" = prog; then | |
+ if test $linkmode = prog; then | |
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_depli… | |
test -n "$add" && finalize_deplibs="$add $finalize_deplibs" | |
else | |
t@@ -1896,7 +1947,7 @@ compiler." | |
test -n "$add" && deplibs="$add $deplibs" | |
fi | |
fi | |
- elif test "$linkmode" = prog; then | |
+ elif test $linkmode = prog; then | |
if test "$alldeplibs" = yes && | |
{ test "$deplibs_check_method" = pass_all || | |
{ test "$build_libtool_libs" = yes && | |
t@@ -1926,13 +1977,14 @@ compiler." | |
# Just print a warning and add the library to dependency_libs so | |
# that the program can be linked against the static library. | |
echo | |
- echo "*** Warning: This library needs some functionality provided … | |
+ echo "*** Warning: This system can not link to static lib archive … | |
echo "*** I have the capability to make that library automatically… | |
echo "*** you link to this library. But I can only do this if you… | |
echo "*** shared version of the library, which you do not appear t… | |
if test "$module" = yes; then | |
- echo "*** Therefore, libtool will create a static module, that s… | |
- echo "*** as long as the dlopening application is linked with th… | |
+ echo "*** But as you try to build a module library, libtool will… | |
+ echo "*** a static module, that should work as long as the dlope… | |
+ echo "*** is linked with the -dlopen flag to resolve symbols at … | |
if test -z "$global_symbol_pipe"; then | |
echo | |
echo "*** However, this would only work if libtool was able to… | |
t@@ -1955,10 +2007,10 @@ compiler." | |
fi | |
fi # link shared/static library? | |
- if test "$linkmode" = lib; then | |
+ if test $linkmode = lib; then | |
if test -n "$dependency_libs" && | |
- { test "$hardcode_into_libs" != yes || test "$build_old_libs" = y… | |
- test "$link_static" = yes; }; then | |
+ { test $hardcode_into_libs != yes || test $build_old_libs = yes || | |
+ test $link_static = yes; }; then | |
# Extract -R from dependency_libs | |
temp_deplibs= | |
for libdir in $dependency_libs; do | |
t@@ -1981,13 +2033,15 @@ compiler." | |
tmp_libs= | |
for deplib in $dependency_libs; do | |
newdependency_libs="$deplib $newdependency_libs" | |
- case "$tmp_libs " in | |
- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
- esac | |
+ if test "X$duplicate_deps" = "Xyes" ; then | |
+ case "$tmp_libs " in | |
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; | |
+ esac | |
+ fi | |
tmp_libs="$tmp_libs $deplib" | |
done | |
- if test "$link_all_deplibs" != no; then | |
+ if test $link_all_deplibs != no; then | |
# Add the search paths of all dependency libraries | |
for deplib in $dependency_libs; do | |
case $deplib in | |
t@@ -2009,7 +2063,7 @@ compiler." | |
if grep "^installed=no" $deplib > /dev/null; then | |
path="-L$absdir/$objdir" | |
else | |
- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | |
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | |
if test -z "$libdir"; then | |
$echo "$modename: \`$deplib' is not a valid libtool archiv… | |
exit 1 | |
t@@ -2030,15 +2084,15 @@ compiler." | |
fi # link_all_deplibs != no | |
fi # linkmode = lib | |
done # for deplib in $libs | |
- if test "$pass" = dlpreopen; then | |
+ if test $pass = dlpreopen; then | |
# Link the dlpreopened libraries before other libraries | |
for deplib in $save_deplibs; do | |
deplibs="$deplib $deplibs" | |
done | |
fi | |
- if test "$pass" != dlopen; then | |
- test "$pass" != scan && dependency_libs="$newdependency_libs" | |
- if test "$pass" != conv; then | |
+ if test $pass != dlopen; then | |
+ test $pass != scan && dependency_libs="$newdependency_libs" | |
+ if test $pass != conv; then | |
# Make sure lib_search_path contains only unique directories. | |
lib_search_path= | |
for dir in $newlib_search_path; do | |
t@@ -2096,7 +2150,7 @@ compiler." | |
deplibs= | |
fi | |
done # for pass | |
- if test "$linkmode" = prog; then | |
+ if test $linkmode = prog; then | |
dlfiles="$newdlfiles" | |
dlprefiles="$newdlprefiles" | |
fi | |
t@@ -2173,7 +2227,7 @@ compiler." | |
fi | |
set dummy $rpath | |
- if test "$#" -gt 2; then | |
+ if test $# -gt 2; then | |
$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool … | |
fi | |
install_libdir="$2" | |
t@@ -2240,7 +2294,7 @@ compiler." | |
;; | |
esac | |
- if test "$age" -gt "$current"; then | |
+ if test $age -gt $current; then | |
$echo "$modename: AGE \`$age' is greater than the current interface … | |
$echo "$modename: \`$vinfo' is not valid version information" 1>&2 | |
exit 1 | |
t@@ -2273,16 +2327,21 @@ compiler." | |
versuffix=".$current"; | |
;; | |
- irix) | |
+ irix | nonstopux) | |
major=`expr $current - $age + 1` | |
- verstring="sgi$major.$revision" | |
+ | |
+ case $version_type in | |
+ nonstopux) verstring_prefix=nonstopux ;; | |
+ *) verstring_prefix=sgi ;; | |
+ esac | |
+ verstring="$verstring_prefix$major.$revision" | |
# Add in all the interfaces that we are compatible with. | |
loop=$revision | |
- while test "$loop" -ne 0; do | |
+ while test $loop != 0; do | |
iface=`expr $revision - $loop` | |
loop=`expr $loop - 1` | |
- verstring="sgi$major.$iface:$verstring" | |
+ verstring="$verstring_prefix$major.$iface:$verstring" | |
done | |
# Before this point, $major must not contain `.'. | |
t@@ -2296,13 +2355,13 @@ compiler." | |
;; | |
osf) | |
- major=`expr $current - $age` | |
+ major=.`expr $current - $age` | |
versuffix=".$current.$age.$revision" | |
verstring="$current.$age.$revision" | |
# Add in all the interfaces that we are compatible with. | |
loop=$age | |
- while test "$loop" -ne 0; do | |
+ while test $loop != 0; do | |
iface=`expr $current - $loop` | |
loop=`expr $loop - 1` | |
verstring="$verstring:${iface}.0" | |
t@@ -2388,9 +2447,9 @@ compiler." | |
# Eliminate all temporary directories. | |
for path in $notinst_path; do | |
- lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'` | |
- deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'` | |
- dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'` | |
+ lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'` | |
+ deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'` | |
+ dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g… | |
done | |
if test -n "$xrpath"; then | |
t@@ -2403,7 +2462,7 @@ compiler." | |
*) finalize_rpath="$finalize_rpath $libdir" ;; | |
esac | |
done | |
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; … | |
+ if test $hardcode_into_libs != yes || test $build_old_libs = yes; then | |
dependency_libs="$temp_xrpath $dependency_libs" | |
fi | |
fi | |
t@@ -2441,12 +2500,12 @@ compiler." | |
*-*-netbsd*) | |
# Don't link with libc until the a.out ld.so is fixed. | |
;; | |
- *-*-openbsd*) | |
+ *-*-openbsd* | *-*-freebsd*) | |
# Do not include libc due to us having libc/libc_r. | |
;; | |
*) | |
# Add libc to deplibs on all other systems if necessary. | |
- if test "$build_libtool_need_lc" = "yes"; then | |
+ if test $build_libtool_need_lc = "yes"; then | |
deplibs="$deplibs -lc" | |
fi | |
;; | |
t@@ -2487,7 +2546,7 @@ compiler." | |
EOF | |
$rm conftest | |
$CC -o conftest conftest.c $deplibs | |
- if test "$?" -eq 0 ; then | |
+ if test $? -eq 0 ; then | |
ldd_output=`ldd conftest` | |
for i in $deplibs; do | |
name="`expr $i : '-l\(.*\)'`" | |
t@@ -2502,18 +2561,20 @@ EOF | |
else | |
droppeddeps=yes | |
echo | |
- echo "*** Warning: This library needs some functionality pro… | |
+ echo "*** Warning: dynamic linker does not accept needed lib… | |
echo "*** I have the capability to make that library automat… | |
echo "*** you link to this library. But I can only do this … | |
- echo "*** shared version of the library, which you do not ap… | |
+ echo "*** shared version of the library, which I believe you… | |
+ echo "*** because a test_compile did reveal that the linker … | |
+ echo "*** its dynamic dependency list that programs get reso… | |
fi | |
else | |
newdeplibs="$newdeplibs $i" | |
fi | |
done | |
else | |
- # Error occured in the first compile. Let's try to salvage the si… | |
- # Compile a seperate program for each library. | |
+ # Error occured in the first compile. Let's try to salvage | |
+ # the situation: Compile a separate program for each library. | |
for i in $deplibs; do | |
name="`expr $i : '-l\(.*\)'`" | |
# If $name is empty we are operating on a -L argument. | |
t@@ -2521,7 +2582,7 @@ EOF | |
$rm conftest | |
$CC -o conftest conftest.c $i | |
# Did it work? | |
- if test "$?" -eq 0 ; then | |
+ if test $? -eq 0 ; then | |
ldd_output=`ldd conftest` | |
libname=`eval \\$echo \"$libname_spec\"` | |
deplib_matches=`eval \\$echo \"$library_names_spec\"` | |
t@@ -2532,10 +2593,12 @@ EOF | |
else | |
droppeddeps=yes | |
echo | |
- echo "*** Warning: This library needs some functionality p… | |
+ echo "*** Warning: dynamic linker does not accept needed l… | |
echo "*** I have the capability to make that library autom… | |
echo "*** you link to this library. But I can only do thi… | |
- echo "*** shared version of the library, which you do not … | |
+ echo "*** shared version of the library, which you do not … | |
+ echo "*** because a test_compile did reveal that the linke… | |
+ echo "*** as a dynamic dependency that programs can get re… | |
fi | |
else | |
droppeddeps=yes | |
t@@ -2574,14 +2637,14 @@ EOF | |
# but so what? | |
potlib="$potent_lib" | |
while test -h "$potlib" 2>/dev/null; do | |
- potliblink=`ls -ld $potlib | sed 's/.* -> //'` | |
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` | |
case $potliblink in | |
[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; | |
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$… | |
esac | |
done | |
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ | |
- | sed 10q \ | |
+ | ${SED} 10q \ | |
| egrep "$file_magic_regex" > /dev/null; then | |
newdeplibs="$newdeplibs $a_deplib" | |
a_deplib="" | |
t@@ -2592,10 +2655,17 @@ EOF | |
if test -n "$a_deplib" ; then | |
droppeddeps=yes | |
echo | |
- echo "*** Warning: This library needs some functionality provi… | |
+ echo "*** Warning: linker path does not have real file for lib… | |
echo "*** I have the capability to make that library automatic… | |
echo "*** you link to this library. But I can only do this if… | |
- echo "*** shared version of the library, which you do not appe… | |
+ echo "*** shared version of the library, which you do not appe… | |
+ echo "*** because I did check the linker path looking for a fi… | |
+ if test -z "$potlib" ; then | |
+ echo "*** with $libname but no candidates were found. (...fo… | |
+ else | |
+ echo "*** with $libname and none of the candidates passed a … | |
+ echo "*** using a file magic. Last file checked: $potlib" | |
+ fi | |
fi | |
else | |
# Add a -L argument. | |
t@@ -2614,8 +2684,9 @@ EOF | |
for i in $lib_search_path $sys_lib_search_path $shlib_search_pat… | |
potential_libs=`ls $i/$libname[.-]* 2>/dev/null` | |
for potent_lib in $potential_libs; do | |
+ potlib="$potent_lib" # see symlink-check below in file_magic… | |
if eval echo \"$potent_lib\" 2>/dev/null \ | |
- | sed 10q \ | |
+ | ${SED} 10q \ | |
| egrep "$match_pattern_regex" > /dev/null; then | |
newdeplibs="$newdeplibs $a_deplib" | |
a_deplib="" | |
t@@ -2626,10 +2697,17 @@ EOF | |
if test -n "$a_deplib" ; then | |
droppeddeps=yes | |
echo | |
- echo "*** Warning: This library needs some functionality provi… | |
+ echo "*** Warning: linker path does not have real file for lib… | |
echo "*** I have the capability to make that library automatic… | |
echo "*** you link to this library. But I can only do this if… | |
- echo "*** shared version of the library, which you do not appe… | |
+ echo "*** shared version of the library, which you do not appe… | |
+ echo "*** because I did check the linker path looking for a fi… | |
+ if test -z "$potlib" ; then | |
+ echo "*** with $libname but no candidates were found. (...fo… | |
+ else | |
+ echo "*** with $libname and none of the candidates passed a … | |
+ echo "*** using a regex pattern. Last file checked: $potlib" | |
+ fi | |
fi | |
else | |
# Add a -L argument. | |
t@@ -2692,7 +2770,7 @@ EOF | |
echo "*** automatically added whenever a program is linked with th… | |
echo "*** or is declared to -dlopen it." | |
- if test "$allow_undefined" = no; then | |
+ if test $allow_undefined = no; then | |
echo | |
echo "*** Since this library must not contain undefined symbols," | |
echo "*** because either the platform does not support them or" | |
t@@ -2719,7 +2797,7 @@ EOF | |
# Test again, we may have decided not to build it any more | |
if test "$build_libtool_libs" = yes; then | |
- if test "$hardcode_into_libs" = yes; then | |
+ if test $hardcode_into_libs = yes; then | |
# Hardcode the library paths | |
hardcode_libdirs= | |
dep_rpath= | |
t@@ -2850,7 +2928,7 @@ EOF | |
$show "mkdir $gentop" | |
$run mkdir "$gentop" | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$gentop"; then | |
+ if test $status -ne 0 && test ! -d "$gentop"; then | |
exit $status | |
fi | |
generated="$generated $gentop" | |
t@@ -2869,7 +2947,7 @@ EOF | |
$show "mkdir $xdir" | |
$run mkdir "$xdir" | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$xdir"; then | |
+ if test $status -ne 0 && test ! -d "$xdir"; then | |
exit $status | |
fi | |
$show "(cd $xdir && $AR x $xabs)" | |
t@@ -2894,7 +2972,18 @@ EOF | |
if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then | |
eval cmds=\"$archive_expsym_cmds\" | |
else | |
+ save_deplibs="$deplibs" | |
+ for conv in $convenience; do | |
+ tmp_deplibs= | |
+ for test_deplib in $deplibs; do | |
+ if test "$test_deplib" != "$conv"; then | |
+ tmp_deplibs="$tmp_deplibs $test_deplib" | |
+ fi | |
+ done | |
+ deplibs="$tmp_deplibs" | |
+ done | |
eval cmds=\"$archive_cmds\" | |
+ deplibs="$save_deplibs" | |
fi | |
save_ifs="$IFS"; IFS='~' | |
for cmd in $cmds; do | |
t@@ -2989,7 +3078,7 @@ EOF | |
$show "mkdir $gentop" | |
$run mkdir "$gentop" | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$gentop"; then | |
+ if test $status -ne 0 && test ! -d "$gentop"; then | |
exit $status | |
fi | |
generated="$generated $gentop" | |
t@@ -3008,7 +3097,7 @@ EOF | |
$show "mkdir $xdir" | |
$run mkdir "$xdir" | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$xdir"; then | |
+ if test $status -ne 0 && test ! -d "$xdir"; then | |
exit $status | |
fi | |
$show "(cd $xdir && $AR x $xabs)" | |
t@@ -3093,7 +3182,7 @@ EOF | |
prog) | |
case $host in | |
- *cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;; | |
+ *cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; | |
esac | |
if test -n "$vinfo"; then | |
$echo "$modename: warning: \`-version-info' is ignored for programs" 1… | |
t@@ -3115,6 +3204,13 @@ EOF | |
# On Rhapsody replace the C library is the System framework | |
compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -fram… | |
finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -fr… | |
+ case $host in | |
+ *darwin*) | |
+ # Don't allow lazy linking, it breaks C++ global constructors | |
+ compile_command="$compile_command ${wl}-bind_at_load" | |
+ finalize_command="$finalize_command ${wl}-bind_at_load" | |
+ ;; | |
+ esac | |
;; | |
esac | |
t@@ -3281,9 +3377,9 @@ extern \"C\" { | |
if test -z "$export_symbols"; then | |
export_symbols="$output_objdir/$output.exp" | |
$run $rm $export_symbols | |
- $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' … | |
+ $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/… | |
else | |
- $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/… | |
+ $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$… | |
$run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$n… | |
$run eval 'mv "$nlist"T "$nlist"' | |
fi | |
t@@ -3291,7 +3387,7 @@ extern \"C\" { | |
for arg in $dlprefiles; do | |
$show "extracting global C symbols from \`$arg'" | |
- name=`echo "$arg" | sed -e 's%^.*/%%'` | |
+ name=`echo "$arg" | ${SED} -e 's%^.*/%%'` | |
$run eval 'echo ": $name " >> "$nlist"' | |
$run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" | |
done | |
t@@ -3306,7 +3402,13 @@ extern \"C\" { | |
fi | |
# Try sorting and uniquifying the output. | |
- if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then | |
+ if grep -v "^: " < "$nlist" | | |
+ if sort -k 3 </dev/null >/dev/null 2>&1; then | |
+ sort -k 3 | |
+ else | |
+ sort +2 | |
+ fi | | |
+ uniq > "$nlist"S; then | |
: | |
else | |
grep -v "^: " < "$nlist" > "$nlist"S | |
t@@ -3403,7 +3505,7 @@ static const void *lt_preloaded_setup() { | |
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%… | |
fi | |
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then | |
+ if test $need_relink = no || test "$build_libtool_libs" != yes; then | |
# Replace the output file specification. | |
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$o… | |
link_command="$compile_command$compile_rpath" | |
t@@ -3548,7 +3650,7 @@ static const void *lt_preloaded_setup() { | |
# win32 will think the script is a binary if it has | |
# a .exe suffix, so we strip it off here. | |
case $output in | |
- *.exe) output=`echo $output|sed 's,.exe$,,'` ;; | |
+ *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;; | |
esac | |
# test for cygwin because mv fails w/o .exe extensions | |
case $host in | |
t@@ -3572,7 +3674,7 @@ static const void *lt_preloaded_setup() { | |
# Sed substitution that helps us do robust quoting. It backslashifies | |
# metacharacters that are still active within double-quoted strings. | |
-Xsed='sed -e 1s/^X//' | |
+Xsed="${SED}"' -e 1s/^X//' | |
sed_quote_subst='$sed_quote_subst' | |
# The HP-UX ksh and POSIX shell print the target directory to stdout | |
t@@ -3610,7 +3712,7 @@ else | |
test \"x\$thisdir\" = \"x\$file\" && thisdir=. | |
# Follow symbolic links until we get to the real thisdir. | |
- file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\` | |
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` | |
while test -n \"\$file\"; do | |
destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` | |
t@@ -3623,7 +3725,7 @@ else | |
fi | |
file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` | |
- file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\` | |
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` | |
done | |
# Try to get the absolute directory name. | |
t@@ -3637,7 +3739,7 @@ else | |
progdir=\"\$thisdir/$objdir\" | |
if test ! -f \"\$progdir/\$program\" || \\ | |
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/de… | |
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/de… | |
test \"X\$file\" != \"X\$progdir/\$program\"; }; then | |
file=\"\$\$-\$program\" | |
t@@ -3683,7 +3785,7 @@ else | |
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\" | |
# Some systems cannot cope with colon-terminated $shlibpath_var | |
- # The second colon is a workaround for a bug in BeOS R4 sed | |
+ # The second colon is a workaround for a bug in BeOS R4 ${SED} | |
$shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` | |
export $shlibpath_var | |
t@@ -3771,7 +3873,7 @@ fi\ | |
$show "mkdir $gentop" | |
$run mkdir "$gentop" | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$gentop"; then | |
+ if test $status -ne 0 && test ! -d "$gentop"; then | |
exit $status | |
fi | |
generated="$generated $gentop" | |
t@@ -3791,7 +3893,7 @@ fi\ | |
$show "mkdir $xdir" | |
$run mkdir "$xdir" | |
status=$? | |
- if test "$status" -ne 0 && test ! -d "$xdir"; then | |
+ if test $status -ne 0 && test ! -d "$xdir"; then | |
exit $status | |
fi | |
$show "(cd $xdir && $AR x $xabs)" | |
t@@ -3858,7 +3960,7 @@ fi\ | |
fi | |
done | |
# Quote the link command for shipping. | |
- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)" | |
+ relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_p… | |
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` | |
# Only create the output if not a dry run. | |
t@@ -3875,7 +3977,7 @@ fi\ | |
case $deplib in | |
*.la) | |
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` | |
- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | |
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` | |
if test -z "$libdir"; then | |
$echo "$modename: \`$deplib' is not a valid libtool archive"… | |
exit 1 | |
t@@ -3889,7 +3991,7 @@ fi\ | |
newdlfiles= | |
for lib in $dlfiles; do | |
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` | |
- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | |
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | |
if test -z "$libdir"; then | |
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 | |
exit 1 | |
t@@ -3900,7 +4002,7 @@ fi\ | |
newdlprefiles= | |
for lib in $dlprefiles; do | |
name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` | |
- eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | |
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` | |
if test -z "$libdir"; then | |
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 | |
exit 1 | |
t@@ -3948,7 +4050,7 @@ dlpreopen='$dlprefiles' | |
# Directory that this library needs to be installed in: | |
libdir='$install_libdir'" | |
- if test "$installed" = no && test "$need_relink" = yes; then | |
+ if test "$installed" = no && test $need_relink = yes; then | |
$echo >> $output "\ | |
relink_command=\"$relink_command\"" | |
fi | |
t@@ -4084,7 +4186,7 @@ relink_command=\"$relink_command\"" | |
# Not a directory, so check to see that there is only one file specified. | |
set dummy $files | |
- if test "$#" -gt 2; then | |
+ if test $# -gt 2; then | |
$echo "$modename: \`$dest' is not a directory" 1>&2 | |
$echo "$help" 1>&2 | |
exit 1 | |
t@@ -4124,7 +4226,7 @@ relink_command=\"$relink_command\"" | |
*.la) | |
# Check to see that this really is a libtool archive. | |
- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null… | |
+ if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/n… | |
else | |
$echo "$modename: \`$file' is not a valid libtool archive" 1>&2 | |
$echo "$help" 1>&2 | |
t@@ -4159,12 +4261,30 @@ relink_command=\"$relink_command\"" | |
dir="$dir$objdir" | |
if test -n "$relink_command"; then | |
+ # Determine the prefix the user has applied to our future dir. | |
+ inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"` | |
+ | |
+ # Don't allow the user to place us outside of our expected | |
+ # location b/c this prevents finding dependent libraries that | |
+ # are installed to the same prefix. | |
+ if test "$inst_prefix_dir" = "$destdir"; then | |
+ $echo "$modename: error: cannot install \`$file' to a directory no… | |
+ exit 1 | |
+ fi | |
+ | |
+ if test -n "$inst_prefix_dir"; then | |
+ # Stick the inst_prefix_dir data into the link command. | |
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@… | |
+ else | |
+ relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@… | |
+ fi | |
+ | |
$echo "$modename: warning: relinking \`$file'" 1>&2 | |
$show "$relink_command" | |
if $run eval "$relink_command"; then : | |
else | |
$echo "$modename: error: relink \`$file' with the above command be… | |
- continue | |
+ exit 1 | |
fi | |
fi | |
t@@ -4186,7 +4306,7 @@ relink_command=\"$relink_command\"" | |
$run eval "$striplib $destdir/$realname" || exit $? | |
fi | |
- if test "$#" -gt 0; then | |
+ if test $# -gt 0; then | |
# Delete the old symlinks, and create new ones. | |
for linkname | |
do | |
t@@ -4273,19 +4393,27 @@ relink_command=\"$relink_command\"" | |
fi | |
# Do a test to see if this is really a libtool program. | |
- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null… | |
+ case $host in | |
+ *cygwin*|*mingw*) | |
+ wrapper=`echo $file | ${SED} -e 's,.exe$,,'` | |
+ ;; | |
+ *) | |
+ wrapper=$file | |
+ ;; | |
+ esac | |
+ if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev… | |
notinst_deplibs= | |
relink_command= | |
# If there is no directory component, then add one. | |
case $file in | |
- */* | *\\*) . $file ;; | |
- *) . ./$file ;; | |
+ */* | *\\*) . $wrapper ;; | |
+ *) . ./$wrapper ;; | |
esac | |
# Check the variables that should have been set. | |
if test -z "$notinst_deplibs"; then | |
- $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2 | |
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 | |
exit 1 | |
fi | |
t@@ -4310,8 +4438,8 @@ relink_command=\"$relink_command\"" | |
relink_command= | |
# If there is no directory component, then add one. | |
case $file in | |
- */* | *\\*) . $file ;; | |
- *) . ./$file ;; | |
+ */* | *\\*) . $wrapper ;; | |
+ *) . ./$wrapper ;; | |
esac | |
outputname= | |
t@@ -4319,11 +4447,13 @@ relink_command=\"$relink_command\"" | |
if test "$finalize" = yes && test -z "$run"; then | |
tmpdir="/tmp" | |
test -n "$TMPDIR" && tmpdir="$TMPDIR" | |
- tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` | |
- if test $? = 0 ; then : | |
- else | |
- tmpdir="$tmpdir/libtool-$$" | |
- fi | |
+ tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` | |
+ if test $? = 0 ; then | |
+ tmpdir="$tmpdir_mktemp" | |
+ unset tmpdir_mktemp | |
+ else | |
+ tmpdir="$tmpdir/libtool-$$" | |
+ fi | |
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : | |
else | |
$echo "$modename: error: cannot create temporary directory \`$… | |
t@@ -4363,7 +4493,7 @@ relink_command=\"$relink_command\"" | |
destfile=$destfile.exe | |
;; | |
*:*.exe) | |
- destfile=`echo $destfile | sed -e 's,.exe$,,'` | |
+ destfile=`echo $destfile | ${SED} -e 's,.exe$,,'` | |
;; | |
esac | |
;; | |
t@@ -4448,7 +4578,7 @@ relink_command=\"$relink_command\"" | |
fi | |
# Exit here if they wanted silent mode. | |
- test "$show" = : && exit 0 | |
+ test "$show" = ":" && exit 0 | |
echo "--------------------------------------------------------------------… | |
echo "Libraries have been installed in:" | |
t@@ -4511,7 +4641,7 @@ relink_command=\"$relink_command\"" | |
case $file in | |
*.la) | |
# Check to see that this really is a libtool archive. | |
- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null… | |
+ if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/n… | |
else | |
$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 | |
$echo "$help" 1>&2 | |
t@@ -4582,7 +4712,7 @@ relink_command=\"$relink_command\"" | |
-*) ;; | |
*) | |
# Do a test to see if this is really a libtool program. | |
- if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null… | |
+ if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/n… | |
# If there is no directory component, then add one. | |
case $file in | |
*/* | *\\*) . $file ;; | |
t@@ -4664,10 +4794,10 @@ relink_command=\"$relink_command\"" | |
objdir="$dir/$objdir" | |
fi | |
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` | |
- test "$mode" = uninstall && objdir="$dir" | |
+ test $mode = uninstall && objdir="$dir" | |
# Remember objdir for removal later, being careful to avoid duplicates | |
- if test "$mode" = clean; then | |
+ if test $mode = clean; then | |
case " $rmdirs " in | |
*" $objdir "*) ;; | |
*) rmdirs="$rmdirs $objdir" ;; | |
t@@ -4691,7 +4821,7 @@ relink_command=\"$relink_command\"" | |
case $name in | |
*.la) | |
# Possibly a libtool archive, so verify it. | |
- if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null… | |
+ if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/n… | |
. $dir/$name | |
# Delete the libtool libraries and symlinks. | |
t@@ -4699,9 +4829,9 @@ relink_command=\"$relink_command\"" | |
rmfiles="$rmfiles $objdir/$n" | |
done | |
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" | |
- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${na… | |
+ test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name… | |
- if test "$mode" = uninstall; then | |
+ if test $mode = uninstall; then | |
if test -n "$library_names"; then | |
# Do each command in the postuninstall commands. | |
eval cmds=\"$postuninstall_cmds\" | |
t@@ -4710,7 +4840,7 @@ relink_command=\"$relink_command\"" | |
IFS="$save_ifs" | |
$show "$cmd" | |
$run eval "$cmd" | |
- if test "$?" -ne 0 && test "$rmforce" != yes; then | |
+ if test $? != 0 && test "$rmforce" != yes; then | |
exit_status=1 | |
fi | |
done | |
t@@ -4725,7 +4855,7 @@ relink_command=\"$relink_command\"" | |
IFS="$save_ifs" | |
$show "$cmd" | |
$run eval "$cmd" | |
- if test "$?" -ne 0 && test "$rmforce" != yes; then | |
+ if test $? != 0 && test "$rmforce" != yes; then | |
exit_status=1 | |
fi | |
done | |
t@@ -4745,8 +4875,8 @@ relink_command=\"$relink_command\"" | |
*) | |
# Do a test to see if this is a libtool program. | |
- if test "$mode" = clean && | |
- (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null… | |
+ if test $mode = clean && | |
+ (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/n… | |
relink_command= | |
. $dir/$file | |