http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/config.guess ---------------------------------------------------------------------- diff --cc config/config.guess index d622a44,d622a44..dc84c68 --- a/config/config.guess +++ b/config/config.guess @@@ -1,10 -1,10 +1,10 @@@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. --timestamp='2012-02-10' ++timestamp='2009-11-20' # 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 @@@ -17,7 -17,7 +17,9 @@@ # General Public License for more details. # # You should have received a copy of the GNU General Public License --# along with this program; if not, see <http://www.gnu.org/licenses/>. ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@@ -54,9 -54,9 +56,8 @@@ version=" GNU config.guess ($timestamp) Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@@ -143,7 -143,7 +144,7 @@@ UNAME_VERSION=`(uname -v) 2>/dev/null` case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, ++ # 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 @@@ -179,7 -179,7 +180,7 @@@ fi ;; *) -- os=netbsd ++ os=netbsd ;; esac # The OS release @@@ -222,7 -222,7 +223,7 @@@ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ++ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@@ -268,10 -268,10 +269,7 @@@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -- exitcode=$? -- trap '' 0 -- exit $exitcode ;; ++ exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@@ -297,7 -297,7 +295,7 @@@ echo s390-ibm-zvmoe exit ;; *:OS400:*:*) -- echo powerpc-ibm-os400 ++ echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} @@@ -396,23 -396,23 +394,23 @@@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; ++ exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} ++ echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; ++ echo m68k-milan-mint${UNAME_RELEASE} ++ exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; ++ echo m68k-hades-mint${UNAME_RELEASE} ++ exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-unknown-mint${UNAME_RELEASE} -- exit ;; ++ echo m68k-unknown-mint${UNAME_RELEASE} ++ exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@@ -482,8 -482,8 +480,8 @@@ EO echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` ++ # DG/UX returns AViiON for all architectures ++ UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@@ -496,7 -496,7 +494,7 @@@ else echo i586-dg-dgux${UNAME_RELEASE} fi -- exit ;; ++ exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@@ -553,7 -553,7 +551,7 @@@ EO echo rs6000-ibm-aix3.2 fi exit ;; -- *:AIX:*:[4567]) ++ *:AIX:*:[456]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@@ -596,52 -596,52 +594,52 @@@ 9000/[678][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 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; ++ 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 ++ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 ++ 532) # CPU_PA_RISC2_0 ++ 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 ++ esac ;; ++ esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c ++ sed 's/^ //' << EOF >$dummy.c -- #define _HPUX_SOURCE -- #include <stdlib.h> -- #include <unistd.h> ++ #define _HPUX_SOURCE ++ #include <stdlib.h> ++ #include <unistd.h> -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); ++ int main () ++ { ++ #if defined(_SC_KERNEL_BITS) ++ long bits = sysconf(_SC_KERNEL_BITS); ++ #endif ++ long cpu = sysconf (_SC_CPU_VERSION); -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } ++ switch (cpu) ++ { ++ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; ++ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; ++ case CPU_PA_RISC2_0: ++ #if defined(_SC_KERNEL_BITS) ++ switch (bits) ++ { ++ case 64: puts ("hppa2.0w"); break; ++ case 32: puts ("hppa2.0n"); break; ++ default: puts ("hppa2.0"); break; ++ } break; ++ #else /* !defined(_SC_KERNEL_BITS) */ ++ puts ("hppa2.0"); break; ++ #endif ++ default: puts ("hppa1.0"); break; ++ } ++ exit (0); ++ } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@@ -732,22 -732,22 +730,22 @@@ EO exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd -- exit ;; ++ exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi -- exit ;; ++ exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd -- exit ;; ++ exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd -- exit ;; ++ exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd -- exit ;; ++ exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@@ -771,14 -771,14 +769,14 @@@ exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` ++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ exit ;; 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" ++ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` ++ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` ++ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@@ -790,12 -790,12 +788,13 @@@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) -- UNAME_PROCESSOR=`/usr/bin/uname -p` -- case ${UNAME_PROCESSOR} in ++ case ${UNAME_MACHINE} in ++ pc98) ++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) -- echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; ++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@@ -804,18 -804,18 +803,15 @@@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; -- i*:MSYS*:*) -- echo ${UNAME_MACHINE}-pc-msys -- exit ;; i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 ++ # uname -m includes "-pc" on this system. ++ echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) -- case ${UNAME_MACHINE} in ++ case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@@ -861,13 -861,13 +857,6 @@@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; -- aarch64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; -- aarch64_be:Linux:*:*) -- UNAME_MACHINE=aarch64_be -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@@ -877,7 -877,7 +866,7 @@@ EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; -- esac ++ esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} @@@ -889,29 -889,29 +878,20 @@@ then echo ${UNAME_MACHINE}-unknown-linux-gnu else -- if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -- | grep -q __ARM_PCS_VFP -- then -- echo ${UNAME_MACHINE}-unknown-linux-gnueabi -- else -- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -- fi ++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi fi exit ;; avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo cris-axis-linux-gnu exit ;; crisv32:Linux:*:*) -- echo ${UNAME_MACHINE}-axis-linux-gnu ++ echo crisv32-axis-linux-gnu exit ;; frv:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; -- hexagon:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo frv-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@@ -953,7 -953,7 +933,7 @@@ EO test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo or32-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@@ -979,7 -979,7 +959,7 @@@ echo ${UNAME_MACHINE}-ibm-linux exit ;; sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@@ -987,17 -987,17 +967,14 @@@ sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; -- tile*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu -- exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo x86_64-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-unknown-linux-gnu ++ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@@ -1006,11 -1006,11 +983,11 @@@ echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, ++ # Unixware is an offshoot of SVR4, but it has its own version ++ # number series starting with 2... ++ # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. ++ # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@@ -1042,7 -1042,7 +1019,7 @@@ fi exit ;; i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. ++ # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@@ -1070,13 -1070,13 +1047,13 @@@ exit ;; pc:*:*:*) # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. ++ # uname -m prints for DJGPP always 'pc', but it prints nothing about ++ # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp -- exit ;; ++ exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@@ -1111,8 -1111,8 +1088,8 @@@ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; ++ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ ++ && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@@ -1155,10 -1155,10 +1132,10 @@@ echo ns32k-sni-sysv fi exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says <[email protected]> -- echo i586-unisys-sysv4 -- exit ;; ++ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort ++ # says <[email protected]> ++ echo i586-unisys-sysv4 ++ exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <[email protected]>. # How about differentiating between stratus architectures? -djm @@@ -1184,11 -1184,11 +1161,11 @@@ exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} ++ echo mips-nec-sysv${UNAME_RELEASE} else -- echo mips-unknown-sysv${UNAME_RELEASE} ++ echo mips-unknown-sysv${UNAME_RELEASE} fi -- exit ;; ++ exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@@ -1253,9 -1253,9 +1230,6 @@@ *:QNX:*:4*) echo i386-pc-qnx exit ;; -- NEO-?:NONSTOP_KERNEL:*:*) -- echo neo-tandem-nsk${UNAME_RELEASE} -- exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; @@@ -1301,13 -1301,13 +1275,13 @@@ echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} ++ echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` ++ UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@@ -1325,9 -1325,9 +1299,6 @@@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; -- x86_64:VMkernel:*:*) -- echo ${UNAME_MACHINE}-unknown-esx -- exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@@ -1350,11 -1350,11 +1321,11 @@@ main ( #include <sys/param.h> printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 -- "4" ++ "4" #else -- "" ++ "" #endif -- ); exit (0); ++ ); exit (0); #endif #endif
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/config.sub ---------------------------------------------------------------------- diff --cc config/config.sub index c894da4,c894da4..2a55a50 --- a/config/config.sub +++ b/config/config.sub @@@ -1,10 -1,10 +1,10 @@@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, --# 2011, 2012 Free Software Foundation, Inc. ++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++# Free Software Foundation, Inc. --timestamp='2012-02-10' ++timestamp='2009-11-20' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@@ -21,7 -21,7 +21,9 @@@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License --# along with this program; if not, see <http://www.gnu.org/licenses/>. ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA ++# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@@ -73,9 -73,9 +75,8 @@@ Report bugs and patches to <config-patc version="\ GNU config.sub ($timestamp) --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, --2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 --Free Software Foundation, Inc. ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, ++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@@ -122,18 -122,18 +123,13 @@@ esa # 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* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -- knetbsd*-gnu* | netbsd*-gnu* | \ ++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ ++ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; -- android-linux) -- os=-linux-android -- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -- ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@@ -160,8 -160,8 +156,8 @@@ case $os i os= basic_machine=$1 ;; -- -bluegene*) -- os=-cnk ++ -bluegene*) ++ os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@@ -177,10 -177,10 +173,10 @@@ os=-chorusos basic_machine=$1 ;; -- -chorusrdb) -- os=-chorusrdb ++ -chorusrdb) ++ os=-chorusrdb basic_machine=$1 -- ;; ++ ;; -hiux*) os=-hiuxwe2 ;; @@@ -249,22 -249,22 +245,17 @@@ case $basic_machine i # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ -- | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -- | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ -- | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -- | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ -- | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@@ -290,39 -290,39 +281,29 @@@ | moxie \ | mt \ | msp430 \ -- | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ -- | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle \ ++ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ -- | rl78 | rx \ ++ | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu \ -- | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ ++ | spu | strongarm \ ++ | tahoe | thumb | tic4x | tic80 | tron \ | ubicom32 \ -- | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ ++ | v850 | v850e \ | we32k \ -- | x86 | xc16x | xstormy16 | xtensa \ ++ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; -- c54x) -- basic_machine=tic54x-unknown -- ;; -- c55x) -- basic_machine=tic55x-unknown -- ;; -- c6x) -- basic_machine=tic6x-unknown -- ;; -- m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) ++ m6811 | m68hc11 | m6812 | m68hc12 | picochip) ++ # Motorola 68HC11/12. basic_machine=$basic_machine-unknown os=-none ;; @@@ -332,21 -332,21 +313,6 @@@ basic_machine=mt-unknown ;; -- strongarm | thumb | xscale) -- basic_machine=arm-unknown -- ;; -- xgate) -- basic_machine=$basic_machine-unknown -- os=-none -- ;; -- xscaleeb) -- basic_machine=armeb-unknown -- ;; -- -- xscaleel) -- basic_machine=armel-unknown -- ;; -- # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@@ -361,25 -361,25 +327,21 @@@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ -- | aarch64-* | aarch64_be-* \ | 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-* | avr32-* \ -- | be32-* | be64-* \ | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* \ ++ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -- | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ -- | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@@ -405,29 -405,29 +367,25 @@@ | mmix-* \ | mt-* \ | msp430-* \ -- | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ -- | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ ++ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ -- | rl78-* | romp-* | rs6000-* | rx-* \ ++ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -- | tahoe-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -- | tile*-* \ ++ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ ++ | tahoe-* | thumb-* \ ++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ | tron-* \ | ubicom32-* \ -- | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -- | vax-* \ ++ | v850-* | v850e-* | vax-* \ | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* \ ++ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@@ -452,7 -452,7 +410,7 @@@ basic_machine=a29k-amd os=-udi ;; -- abacus) ++ abacus) basic_machine=abacus-unknown ;; adobe68k) @@@ -522,20 -522,20 +480,11 @@@ basic_machine=powerpc-ibm os=-cnk ;; -- c54x-*) -- basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; -- c55x-*) -- basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; -- c6x-*) -- basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; c90) basic_machine=c90-cray os=-unicos ;; -- cegcc) ++ cegcc) basic_machine=arm-unknown os=-cegcc ;; @@@ -567,7 -567,7 +516,7 @@@ basic_machine=craynv-cray os=-unicosmp ;; -- cr16 | cr16-*) ++ cr16) basic_machine=cr16-unknown os=-elf ;; @@@ -725,6 -725,6 +674,7 @@@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; ++# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@@ -782,7 -782,7 +732,7 @@@ basic_machine=ns32k-utek os=-sysv ;; -- microblaze) ++ microblaze) basic_machine=microblaze-xilinx ;; mingw32) @@@ -821,18 -821,18 +771,10 @@@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; -- msys) -- basic_machine=i386-pc -- os=-msys -- ;; mvs) basic_machine=i370-ibm os=-mvs ;; -- nacl) -- basic_machine=le32-unknown -- os=-nacl -- ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@@ -897,12 -897,12 +839,6 @@@ np1) basic_machine=np1-gould ;; -- neo-tandem) -- basic_machine=neo-tandem -- ;; -- nse-tandem) -- basic_machine=nse-tandem -- ;; nsr-tandem) basic_machine=nsr-tandem ;; @@@ -985,10 -985,10 +921,9 @@@ ;; power) basic_machine=power-ibm ;; -- ppc | ppcbe) basic_machine=powerpc-unknown ++ ppc) basic_machine=powerpc-unknown ;; -- ppc-* | ppcbe-*) -- basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ++ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@@ -1082,9 -1082,9 +1017,6 @@@ basic_machine=i860-stratus os=-sysv4 ;; -- strongarm-* | thumb-*) -- basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -- ;; sun2) basic_machine=m68000-sun ;; @@@ -1141,8 -1141,8 +1073,20 @@@ basic_machine=t90-cray os=-unicos ;; ++ tic54x | c54x*) ++ basic_machine=tic54x-unknown ++ os=-coff ++ ;; ++ tic55x | c55x*) ++ basic_machine=tic55x-unknown ++ os=-coff ++ ;; ++ tic6x | c6x*) ++ basic_machine=tic6x-unknown ++ os=-coff ++ ;; tile*) -- basic_machine=$basic_machine-unknown ++ basic_machine=tile-unknown os=-linux-gnu ;; tx39) @@@ -1212,9 -1212,9 +1156,6 @@@ xps | xps100) basic_machine=xps100-honeywell ;; -- xscale-* | xscalee[bl]-*) -- basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -- ;; ymp) basic_machine=ymp-cray os=-unicos @@@ -1312,11 -1312,11 +1253,11 @@@ esa if [ x"$os" != x"" ] then case $os in -- # First match some system type aliases -- # that might get confused with valid system types. ++ # First match some system type aliases ++ # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux ++ -auroraux) ++ os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@@ -1352,9 -1352,9 +1293,8 @@@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ ++ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ ++ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@@ -1401,7 -1401,7 +1341,7 @@@ -opened*) os=-openedition ;; -- -os400*) ++ -os400*) os=-os400 ;; -wince*) @@@ -1450,7 -1450,7 +1390,7 @@@ -sinix*) os=-sysv4 ;; -- -tpf*) ++ -tpf*) os=-tpf ;; -triton*) @@@ -1495,8 -1495,8 +1435,6 @@@ -dicos*) os=-dicos ;; -- -nacl*) -- ;; -none) ;; *) @@@ -1519,10 -1519,10 +1457,10 @@@ els # system, and we'll never get to this point. case $basic_machine in -- score-*) ++ score-*) os=-elf ;; -- spu-*) ++ spu-*) os=-elf ;; *-acorn) @@@ -1534,17 -1534,17 +1472,8 @@@ arm*-semi) os=-aout ;; -- c4x-* | tic4x-*) -- os=-coff -- ;; -- tic54x-*) -- os=-coff -- ;; -- tic55x-*) -- os=-coff -- ;; -- tic6x-*) -- os=-coff ++ c4x-* | tic4x-*) ++ os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@@ -1564,11 -1564,11 +1493,14 @@@ ;; m68000-sun) os=-sunos3 ++ # This also exists in the configure program, but was not the ++ # default. ++ # os=-sunos4 ;; m68*-cisco) os=-aout ;; -- mep-*) ++ mep-*) os=-elf ;; mips*-cisco) @@@ -1595,7 -1595,7 +1527,7 @@@ *-ibm) os=-aix ;; -- *-knuth) ++ *-knuth) os=-mmixware ;; *-wec) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/depcomp ---------------------------------------------------------------------- diff --cc config/depcomp index bd0ac08,bd0ac08..df8eea7 --- a/config/depcomp +++ b/config/depcomp @@@ -1,10 -1,10 +1,10 @@@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects --scriptversion=2011-12-04.11; # UTC ++scriptversion=2009-04-28.21; # UTC --# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, --# 2011 Free Software Foundation, Inc. ++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free ++# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@@ -44,7 -44,7 +44,7 @@@ Environment variables object Object file output by `PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. -- tmpdepfile Temporary file to use when outputting dependencies. ++ tmpdepfile Temporary file to use when outputing dependencies. libtool Whether libtool is used (yes/no). Report bugs to <[email protected]>. @@@ -90,18 -90,18 +90,10 @@@ if test "$depmode" = msvcmsys; the # This is just like msvisualcpp but w/o cygpath translation. # Just convert the backslash-escaped backslashes to single forward # slashes to satisfy depend.m4 -- cygpath_u='sed s,\\\\,/,g' ++ cygpath_u="sed s,\\\\\\\\,/,g" depmode=msvisualcpp fi --if test "$depmode" = msvc7msys; then -- # This is just like msvc7 but w/o cygpath translation. -- # Just convert the backslash-escaped backslashes to single forward -- # slashes to satisfy depend.m4 -- cygpath_u='sed s,\\\\,/,g' -- depmode=msvc7 --fi -- case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@@ -166,12 -166,12 +158,10 @@@ gcc ' < "$tmpdepfile" | ## Some versions of gcc put a space before the `:'. On the theory ## that the space means something, we add a space to the output as --## well. hp depmode also adds that space, but also prefixes the VPATH --## to the object. Take care to not repeat it in the output. ++## well. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. -- sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ -- | sed -e 's/$/ :/' >> "$depfile" ++ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@@ -415,52 -415,52 +405,6 @@@ tru64 rm -f "$tmpdepfile" ;; --msvc7) -- if test "$libtool" = yes; then -- showIncludes=-Wc,-showIncludes -- else -- showIncludes=-showIncludes -- fi -- "$@" $showIncludes > "$tmpdepfile" -- stat=$? -- grep -v '^Note: including file: ' "$tmpdepfile" -- if test "$stat" = 0; then : -- else -- rm -f "$tmpdepfile" -- exit $stat -- fi -- rm -f "$depfile" -- echo "$object : \\" > "$depfile" -- # The first sed program below extracts the file names and escapes -- # backslashes for cygpath. The second sed program outputs the file -- # name when reading, but also accumulates all include files in the -- # hold buffer in order to output them again at the end. This only -- # works with sed implementations that can handle large buffers. -- sed < "$tmpdepfile" -n ' --/^Note: including file: *\(.*\)/ { -- s//\1/ -- s/\\/\\\\/g -- p --}' | $cygpath_u | sort -u | sed -n ' --s/ /\\ /g --s/\(.*\)/ \1 \\/p --s/.\(.*\) \\/\1:/ --H --$ { -- s/.*/ / -- G -- p --}' >> "$depfile" -- rm -f "$tmpdepfile" -- ;; -- --msvc7msys) -- # This case exists only to let depend.m4 do its work. It works by -- # looking at the text of this script. This case will never be run, -- # since it is checked for above. -- exit 1 -- ;; -- #nosideeffect) # This comment above is used by automake to tell side-effect # dependency tracking mechanisms from slower ones. @@@ -559,9 -559,9 +503,7 @@@ makedepend touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" -- # makedepend may prepend the VPATH from the source file name to the object. -- # No need to regex-escape $object, excess matching of '.' is harmless. -- sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" ++ cat < "$tmpdepfile" > "$depfile" sed '1,2d' "$tmpdepfile" | tr ' ' ' ' | \ ## Some versions of the HPUX 10.20 sed can't process this invocation http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2498ff13/config/install-sh ---------------------------------------------------------------------- diff --cc config/install-sh index a9244eb,a9244eb..6781b98 --- a/config/install-sh +++ b/config/install-sh @@@ -1,7 -1,7 +1,7 @@@ #!/bin/sh # install - install a program, script, or datafile --scriptversion=2011-01-19.21; # UTC ++scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@@ -156,10 -156,10 +156,6 @@@ while test $# -ne 0; d -s) stripcmd=$stripprog;; -t) dst_arg=$2 -- # Protect names problematic for `test' and other utilities. -- case $dst_arg in -- -* | [=\(\)!]) dst_arg=./$dst_arg;; -- esac shift;; -T) no_target_directory=true;; @@@ -190,10 -190,10 +186,6 @@@ if test $# -ne 0 && test -z "$dir_arg$d fi shift # arg dst_arg=$arg -- # Protect names problematic for `test' and other utilities. -- case $dst_arg in -- -* | [=\(\)!]) dst_arg=./$dst_arg;; -- esac done fi @@@ -208,11 -208,11 +200,7 @@@ if test $# -eq 0; the fi if test -z "$dir_arg"; then -- do_exit='(exit $ret); exit $ret' -- trap "ret=129; $do_exit" 1 -- trap "ret=130; $do_exit" 2 -- trap "ret=141; $do_exit" 13 -- trap "ret=143; $do_exit" 15 ++ trap '(exit $?); exit' 1 2 13 15 # Set umask so as not to create temps with too-generous modes. # However, 'strip' requires both read and write access to temps. @@@ -240,9 -240,9 +228,9 @@@ f for src do -- # Protect names problematic for `test' and other utilities. ++ # Protect names starting with `-'. case $src in -- -* | [=\(\)!]) src=./$src;; ++ -*) src=./$src;; esac if test -n "$dir_arg"; then @@@ -264,7 -264,7 +252,12 @@@ echo "$0: no destination specified." >&2 exit 1 fi ++ dst=$dst_arg ++ # Protect names starting with `-'. ++ case $dst in ++ -*) dst=./$dst;; ++ esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. @@@ -392,7 -392,7 +385,7 @@@ case $dstdir in /*) prefix='/';; -- [-=\(\)!]*) prefix='./';; ++ -*) prefix='./';; *) prefix='';; esac @@@ -410,7 -410,7 +403,7 @@@ for d do -- test X"$d" = X && continue ++ test -z "$d" && continue prefix=$prefix$d if test -d "$prefix"; then
