forked from php/php-src
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Upgrade bundled libtool to 1.4.2. Following stuff mentioned at:
http://www.gnu.org/software/libtool/news.html * Diagnose and warn about not-quite-working combinations of gcc and ld on Solaris. * Improved OpenBSD support. * Improved cygwin support. * Bugfixes.
- Loading branch information
foobar
committed
Jun 29, 2002
1 parent
f24cb97
commit e4e7960
Showing
3 changed files
with
166 additions
and
125 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | ||
# Free Software Foundation, Inc. | ||
|
||
timestamp='2001-11-08' | ||
timestamp='2001-09-04' | ||
|
||
# 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 | ||
|
@@ -24,9 +24,8 @@ timestamp='2001-11-08' | |
# configuration script generated by Autoconf, you may include it under | ||
# the same distribution terms that you use for the rest of that program. | ||
|
||
# Originally written by Per Bothner <[email protected]>. | ||
# Please send patches to <[email protected]>. Submit a context | ||
# diff and a properly formatted ChangeLog entry. | ||
# Written by Per Bothner <[email protected]>. | ||
# Please send patches to <[email protected]>. | ||
# | ||
# This script attempts to guess a canonical system name similar to | ||
# config.sub. If it succeeds, it prints the system name on stdout, and | ||
|
@@ -128,7 +127,7 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | |
|
||
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 | ||
|
@@ -145,7 +144,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |
macppc) machine=powerpc-apple ;; | ||
hp3[0-9][05]) machine=m68k-hp ;; | ||
ibmrt|romp-ibm) machine=romp-ibm ;; | ||
sparc*) machine=`uname -p`-unknown ;; | ||
*) machine=${UNAME_MACHINE}-unknown ;; | ||
esac | ||
# The Operating System including object format, if it has switched | ||
|
@@ -174,45 +172,6 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in | |
# 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 ;; | ||
alpha:OSF1:*:*) | ||
if test $UNAME_RELEASE = "V4.0"; then | ||
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` | ||
|
@@ -288,9 +247,30 @@ 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} | ||
exit 0 ;; | ||
*:OS/390:*:*) | ||
echo i370-ibm-openedition | ||
exit 0 ;; | ||
|
@@ -353,6 +333,12 @@ EOF | |
aushp:SunOS:*:*) | ||
echo sparc-auspex-sunos${UNAME_RELEASE} | ||
exit 0 ;; | ||
sparc*:NetBSD:*) | ||
echo `uname -p`-unknown-netbsd${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 | ||
|
@@ -379,6 +365,18 @@ 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 ;; | ||
|
@@ -548,8 +546,10 @@ EOF | |
9000/31? ) HP_ARCH=m68000 ;; | ||
9000/[34]?? ) HP_ARCH=m68k ;; | ||
9000/[678][0-9][0-9]) | ||
if [ -x /usr/bin/getconf ]; then | ||
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` | ||
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/null` | ||
sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` | ||
case "${sc_cpu_version}" in | ||
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 | ||
|
@@ -558,13 +558,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 | ||
if [ "${HP_ARCH}" = "" ]; then | ||
eval $set_cc_for_build | ||
sed 's/^ //' << EOF >$dummy.c | ||
fi ;; | ||
esac | ||
if [ "${HP_ARCH}" = "" ]; then | ||
eval $set_cc_for_build | ||
sed 's/^ //' << EOF >$dummy.c | ||
#define _HPUX_SOURCE | ||
#include <stdlib.h> | ||
|
@@ -597,10 +597,10 @@ EOF | |
exit (0); | ||
} | ||
EOF | ||
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy` | ||
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi | ||
rm -f $dummy.c $dummy | ||
fi ;; | ||
(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` | ||
if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi | ||
rm -f $dummy.c $dummy | ||
fi ;; | ||
esac | ||
echo ${HP_ARCH}-hp-hpux${HPUX_REV} | ||
exit 0 ;; | ||
|
@@ -664,6 +664,9 @@ 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 ;; | ||
|
@@ -715,6 +718,9 @@ EOF | |
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 ;; | ||
|
@@ -727,6 +733,9 @@ EOF | |
*: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/[-_].*/\./'` | ||
exit 0 ;; | ||
i*:CYGWIN*:*) | ||
echo ${UNAME_MACHINE}-pc-cygwin | ||
exit 0 ;; | ||
|
@@ -947,7 +956,7 @@ EOF | |
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 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) | ||
3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) | ||
OS_REL='' | ||
test -r /etc/.relid \ | ||
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ | |
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 | ||
# Free Software Foundation, Inc. | ||
|
||
timestamp='2001-11-08' | ||
timestamp='2001-09-07' | ||
|
||
# This file is (in principle) common to ALL GNU software. | ||
# The presence of a machine in this file suggests that SOME GNU software | ||
|
@@ -29,8 +29,7 @@ timestamp='2001-11-08' | |
# 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]>. Submit a context | ||
# diff and a properly formatted ChangeLog entry. | ||
# Please send patches to <[email protected]>. | ||
# | ||
# Configuration subroutine to validate and canonicalize a configuration type. | ||
# Supply the specified configuration type as an argument. | ||
|
@@ -245,13 +244,14 @@ case $basic_machine in | |
| pdp10 | pdp11 | pj | pjl \ | ||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | ||
| pyramid \ | ||
| s390 | s390x \ | ||
| sh | sh[34] | sh[34]eb | shbe | shle \ | ||
| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ | ||
| strongarm \ | ||
| stormy16 | strongarm \ | ||
| tahoe | thumb | tic80 | tron \ | ||
| v850 \ | ||
| we32k \ | ||
| x86 | xscale | xstormy16 \ | ||
| x86 | xscale \ | ||
| z8k) | ||
basic_machine=$basic_machine-unknown | ||
;; | ||
|
@@ -280,7 +280,6 @@ case $basic_machine in | |
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | ||
| alphapca5[67]-* | arc-* \ | ||
| arm-* | armbe-* | armle-* | armv*-* \ | ||
| avr-* \ | ||
| bs2000-* \ | ||
| c[123]* | c30-* | [cjt]90-* | c54x-* \ | ||
| clipper-* | cray2-* | cydra-* \ | ||
|
@@ -303,13 +302,14 @@ case $basic_machine in | |
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | ||
| pyramid-* \ | ||
| romp-* | rs6000-* \ | ||
| s390-* | s390x-* \ | ||
| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ | ||
| sparc-* | sparc64-* | sparc86x-* | sparclite-* \ | ||
| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \ | ||
| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ | ||
| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ | ||
| v850-* | vax-* \ | ||
| we32k-* \ | ||
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* | xstormy16-* \ | ||
| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ | ||
| ymp-* \ | ||
| z8k-*) | ||
;; | ||
|
@@ -724,7 +724,7 @@ case $basic_machine in | |
pc532 | pc532-*) | ||
basic_machine=ns32k-pc532 | ||
;; | ||
pentium | p5 | k5 | k6 | nexgen | viac3) | ||
pentium | p5 | k5 | k6 | nexgen) | ||
basic_machine=i586-pc | ||
;; | ||
pentiumpro | p6 | 6x86 | athlon) | ||
|
@@ -733,7 +733,7 @@ case $basic_machine in | |
pentiumii | pentium2) | ||
basic_machine=i686-pc | ||
;; | ||
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) | ||
pentium-* | p5-* | k5-* | k6-* | nexgen-*) | ||
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` | ||
;; | ||
pentiumpro-* | p6-* | 6x86-* | athlon-*) | ||
|
@@ -784,12 +784,6 @@ case $basic_machine in | |
rtpc | rtpc-*) | ||
basic_machine=romp-ibm | ||
;; | ||
s390 | s390-*) | ||
basic_machine=s390-ibm | ||
;; | ||
s390x | s390x-*) | ||
basic_machine=s390x-ibm | ||
;; | ||
sa29200) | ||
basic_machine=a29k-amd | ||
os=-udi | ||
|
@@ -801,7 +795,7 @@ case $basic_machine in | |
basic_machine=sh-hitachi | ||
os=-hms | ||
;; | ||
sparclite-wrs | simso-wrs) | ||
sparclite-wrs) | ||
basic_machine=sparclite-wrs | ||
os=-vxworks | ||
;; | ||
|
@@ -1074,7 +1068,7 @@ case $os in | |
| -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ | ||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | ||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | ||
| -os2* | -vos* | -palmos* | -uclinux*) | ||
| -os2* | -vos*) | ||
# Remember, each alternative MUST END IN *, to match a version number. | ||
;; | ||
-qnx*) | ||
|
Oops, something went wrong.