fix compiler warning
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@615 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale
parent
774372dcea
commit
26deb420a8
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +1,9 @@
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
# Configuration validation subroutine script.
|
# Configuration validation subroutine script.
|
||||||
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
|
||||||
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
|
# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||||
# Inc.
|
|
||||||
|
|
||||||
timestamp='2007-04-29'
|
timestamp='2003-06-18'
|
||||||
|
|
||||||
# This file is (in principle) common to ALL GNU software.
|
# This file is (in principle) common to ALL GNU software.
|
||||||
# The presence of a machine in this file suggests that SOME GNU software
|
# The presence of a machine in this file suggests that SOME GNU software
|
||||||
|
|
@ -22,15 +21,14 @@ timestamp='2007-04-29'
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
|
# Foundation, Inc., 59 Temple Place - Suite 330,
|
||||||
# 02110-1301, USA.
|
# Boston, MA 02111-1307, USA.
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License, if you
|
# As a special exception to the GNU General Public License, if you
|
||||||
# distribute this file as part of a program that contains a
|
# distribute this file as part of a program that contains a
|
||||||
# configuration script generated by Autoconf, you may include it under
|
# configuration script generated by Autoconf, you may include it under
|
||||||
# the same distribution terms that you use for the rest of that program.
|
# the same distribution terms that you use for the rest of that program.
|
||||||
|
|
||||||
|
|
||||||
# Please send patches to <config-patches@gnu.org>. Submit a context
|
# Please send patches to <config-patches@gnu.org>. Submit a context
|
||||||
# diff and a properly formatted ChangeLog entry.
|
# diff and a properly formatted ChangeLog entry.
|
||||||
#
|
#
|
||||||
|
|
@ -72,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
|
||||||
version="\
|
version="\
|
||||||
GNU config.sub ($timestamp)
|
GNU config.sub ($timestamp)
|
||||||
|
|
||||||
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
|
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
|
||||||
Free Software Foundation, Inc.
|
Free Software Foundation, Inc.
|
||||||
|
|
||||||
This is free software; see the source for copying conditions. There is NO
|
This is free software; see the source for copying conditions. There is NO
|
||||||
|
|
@ -85,11 +83,11 @@ Try \`$me --help' for more information."
|
||||||
while test $# -gt 0 ; do
|
while test $# -gt 0 ; do
|
||||||
case $1 in
|
case $1 in
|
||||||
--time-stamp | --time* | -t )
|
--time-stamp | --time* | -t )
|
||||||
echo "$timestamp" ; exit ;;
|
echo "$timestamp" ; exit 0 ;;
|
||||||
--version | -v )
|
--version | -v )
|
||||||
echo "$version" ; exit ;;
|
echo "$version" ; exit 0 ;;
|
||||||
--help | --h* | -h )
|
--help | --h* | -h )
|
||||||
echo "$usage"; exit ;;
|
echo "$usage"; exit 0 ;;
|
||||||
-- ) # Stop option processing
|
-- ) # Stop option processing
|
||||||
shift; break ;;
|
shift; break ;;
|
||||||
- ) # Use stdin as input.
|
- ) # Use stdin as input.
|
||||||
|
|
@ -101,7 +99,7 @@ while test $# -gt 0 ; do
|
||||||
*local*)
|
*local*)
|
||||||
# First pass through any local machine types.
|
# First pass through any local machine types.
|
||||||
echo $1
|
echo $1
|
||||||
exit ;;
|
exit 0;;
|
||||||
|
|
||||||
* )
|
* )
|
||||||
break ;;
|
break ;;
|
||||||
|
|
@ -120,9 +118,7 @@ esac
|
||||||
# Here we must recognize all the valid KERNEL-OS combinations.
|
# Here we must recognize all the valid KERNEL-OS combinations.
|
||||||
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
|
||||||
case $maybe_os in
|
case $maybe_os in
|
||||||
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
|
nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
|
||||||
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
|
|
||||||
storm-chaos* | os2-emx* | rtmk-nova*)
|
|
||||||
os=-$maybe_os
|
os=-$maybe_os
|
||||||
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
|
||||||
;;
|
;;
|
||||||
|
|
@ -148,7 +144,7 @@ case $os in
|
||||||
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
|
||||||
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
|
||||||
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
|
||||||
-apple | -axis | -knuth | -cray)
|
-apple | -axis)
|
||||||
os=
|
os=
|
||||||
basic_machine=$1
|
basic_machine=$1
|
||||||
;;
|
;;
|
||||||
|
|
@ -173,10 +169,6 @@ case $os in
|
||||||
-hiux*)
|
-hiux*)
|
||||||
os=-hiuxwe2
|
os=-hiuxwe2
|
||||||
;;
|
;;
|
||||||
-sco6)
|
|
||||||
os=-sco5v6
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
||||||
;;
|
|
||||||
-sco5)
|
-sco5)
|
||||||
os=-sco3.2v5
|
os=-sco3.2v5
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||||
|
|
@ -193,10 +185,6 @@ case $os in
|
||||||
# Don't forget version if it is 3.2v4 or newer.
|
# Don't forget version if it is 3.2v4 or newer.
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||||
;;
|
;;
|
||||||
-sco5v6*)
|
|
||||||
# Don't forget version if it is 3.2v4 or newer.
|
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
|
||||||
;;
|
|
||||||
-sco*)
|
-sco*)
|
||||||
os=-sco3.2v2
|
os=-sco3.2v2
|
||||||
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
|
||||||
|
|
@ -240,17 +228,14 @@ case $basic_machine in
|
||||||
| a29k \
|
| a29k \
|
||||||
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
|
||||||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[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 \
|
||||||
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
|
|
||||||
| bfin \
|
|
||||||
| c4x | clipper \
|
| c4x | clipper \
|
||||||
| d10v | d30v | dlx | dsp16xx \
|
| d10v | d30v | dlx | dsp16xx \
|
||||||
| fido | fr30 | frv \
|
| fr30 | frv \
|
||||||
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
|
||||||
| i370 | i860 | i960 | ia64 \
|
| i370 | i860 | i960 | ia64 \
|
||||||
| ip2k | iq2000 \
|
| ip2k \
|
||||||
| m32c | m32r | m32rle | m68000 | m68k | m88k \
|
| m32r | m68000 | m68k | m88k | mcore \
|
||||||
| maxq | mb | microblaze | mcore | mep \
|
|
||||||
| mips | mipsbe | mipseb | mipsel | mipsle \
|
| mips | mipsbe | mipseb | mipsel | mipsle \
|
||||||
| mips16 \
|
| mips16 \
|
||||||
| mips64 | mips64el \
|
| mips64 | mips64el \
|
||||||
|
|
@ -259,33 +244,28 @@ case $basic_machine in
|
||||||
| mips64vr4100 | mips64vr4100el \
|
| mips64vr4100 | mips64vr4100el \
|
||||||
| mips64vr4300 | mips64vr4300el \
|
| mips64vr4300 | mips64vr4300el \
|
||||||
| mips64vr5000 | mips64vr5000el \
|
| mips64vr5000 | mips64vr5000el \
|
||||||
| mips64vr5900 | mips64vr5900el \
|
|
||||||
| mipsisa32 | mipsisa32el \
|
| mipsisa32 | mipsisa32el \
|
||||||
| mipsisa32r2 | mipsisa32r2el \
|
| mipsisa32r2 | mipsisa32r2el \
|
||||||
| mipsisa64 | mipsisa64el \
|
| mipsisa64 | mipsisa64el \
|
||||||
| mipsisa64r2 | mipsisa64r2el \
|
|
||||||
| mipsisa64sb1 | mipsisa64sb1el \
|
| mipsisa64sb1 | mipsisa64sb1el \
|
||||||
| mipsisa64sr71k | mipsisa64sr71kel \
|
| mipsisa64sr71k | mipsisa64sr71kel \
|
||||||
| mipstx39 | mipstx39el \
|
| mipstx39 | mipstx39el \
|
||||||
| mn10200 | mn10300 \
|
| mn10200 | mn10300 \
|
||||||
| mt \
|
|
||||||
| msp430 \
|
| msp430 \
|
||||||
| nios | nios2 \
|
|
||||||
| ns16k | ns32k \
|
| ns16k | ns32k \
|
||||||
| or32 \
|
| openrisc | or32 \
|
||||||
| pdp10 | pdp11 | pj | pjl \
|
| pdp10 | pdp11 | pj | pjl \
|
||||||
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
|
||||||
| pyramid \
|
| pyramid \
|
||||||
| score \
|
| s390 | s390x \
|
||||||
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
|
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
|
||||||
| sh64 | sh64le \
|
| sh64 | sh64le \
|
||||||
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
|
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
|
||||||
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
|
| strongarm \
|
||||||
| spu | strongarm \
|
|
||||||
| tahoe | thumb | tic4x | tic80 | tron \
|
| tahoe | thumb | tic4x | tic80 | tron \
|
||||||
| v850 | v850e \
|
| v850 | v850e \
|
||||||
| we32k \
|
| we32k \
|
||||||
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
|
| x86 | xscale | xstormy16 | xtensa \
|
||||||
| z8k)
|
| z8k)
|
||||||
basic_machine=$basic_machine-unknown
|
basic_machine=$basic_machine-unknown
|
||||||
;;
|
;;
|
||||||
|
|
@ -296,9 +276,6 @@ case $basic_machine in
|
||||||
;;
|
;;
|
||||||
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
|
||||||
;;
|
;;
|
||||||
ms1)
|
|
||||||
basic_machine=mt-unknown
|
|
||||||
;;
|
|
||||||
|
|
||||||
# We use `pc' rather than `unknown'
|
# We use `pc' rather than `unknown'
|
||||||
# because (1) that's what they normally are, and
|
# because (1) that's what they normally are, and
|
||||||
|
|
@ -318,20 +295,20 @@ case $basic_machine in
|
||||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
|
||||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||||
| avr-* | avr32-* \
|
| avr-* \
|
||||||
| bfin-* | bs2000-* \
|
| bs2000-* \
|
||||||
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
|
||||||
| clipper-* | craynv-* | cydra-* \
|
| clipper-* | cydra-* \
|
||||||
| d10v-* | d30v-* | dlx-* \
|
| d10v-* | d30v-* | dlx-* \
|
||||||
| elxsi-* \
|
| elxsi-* \
|
||||||
| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
|
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
|
||||||
| h8300-* | h8500-* \
|
| h8300-* | h8500-* \
|
||||||
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
|
||||||
| i*86-* | i860-* | i960-* | ia64-* \
|
| i*86-* | i860-* | i960-* | ia64-* \
|
||||||
| ip2k-* | iq2000-* \
|
| ip2k-* \
|
||||||
| m32c-* | m32r-* | m32rle-* \
|
| m32r-* \
|
||||||
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
|
||||||
| m88110-* | m88k-* | maxq-* | mcore-* \
|
| m88110-* | m88k-* | mcore-* \
|
||||||
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
|
||||||
| mips16-* \
|
| mips16-* \
|
||||||
| mips64-* | mips64el-* \
|
| mips64-* | mips64el-* \
|
||||||
|
|
@ -340,36 +317,31 @@ case $basic_machine in
|
||||||
| mips64vr4100-* | mips64vr4100el-* \
|
| mips64vr4100-* | mips64vr4100el-* \
|
||||||
| mips64vr4300-* | mips64vr4300el-* \
|
| mips64vr4300-* | mips64vr4300el-* \
|
||||||
| mips64vr5000-* | mips64vr5000el-* \
|
| mips64vr5000-* | mips64vr5000el-* \
|
||||||
| mips64vr5900-* | mips64vr5900el-* \
|
|
||||||
| mipsisa32-* | mipsisa32el-* \
|
| mipsisa32-* | mipsisa32el-* \
|
||||||
| mipsisa32r2-* | mipsisa32r2el-* \
|
| mipsisa32r2-* | mipsisa32r2el-* \
|
||||||
| mipsisa64-* | mipsisa64el-* \
|
| mipsisa64-* | mipsisa64el-* \
|
||||||
| mipsisa64r2-* | mipsisa64r2el-* \
|
|
||||||
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
| mipsisa64sb1-* | mipsisa64sb1el-* \
|
||||||
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
|
||||||
| mipstx39-* | mipstx39el-* \
|
| mipstx39-* | mipstx39el-* \
|
||||||
| mmix-* \
|
|
||||||
| mt-* \
|
|
||||||
| msp430-* \
|
| msp430-* \
|
||||||
| nios-* | nios2-* \
|
| none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
|
||||||
| none-* | np1-* | ns16k-* | ns32k-* \
|
|
||||||
| orion-* \
|
| orion-* \
|
||||||
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
|
||||||
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
|
||||||
| pyramid-* \
|
| pyramid-* \
|
||||||
| romp-* | rs6000-* \
|
| romp-* | rs6000-* \
|
||||||
| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
|
| s390-* | s390x-* \
|
||||||
|
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
|
||||||
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
|
||||||
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
|
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
|
||||||
| sparclite-* \
|
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
|
||||||
| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
|
|
||||||
| tahoe-* | thumb-* \
|
| tahoe-* | thumb-* \
|
||||||
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
|
||||||
| tron-* \
|
| tron-* \
|
||||||
| v850-* | v850e-* | vax-* \
|
| v850-* | v850e-* | vax-* \
|
||||||
| we32k-* \
|
| we32k-* \
|
||||||
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
|
| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
|
||||||
| xstormy16-* | xtensa-* \
|
| xtensa-* \
|
||||||
| ymp-* \
|
| ymp-* \
|
||||||
| z8k-*)
|
| z8k-*)
|
||||||
;;
|
;;
|
||||||
|
|
@ -389,9 +361,6 @@ case $basic_machine in
|
||||||
basic_machine=a29k-amd
|
basic_machine=a29k-amd
|
||||||
os=-udi
|
os=-udi
|
||||||
;;
|
;;
|
||||||
abacus)
|
|
||||||
basic_machine=abacus-unknown
|
|
||||||
;;
|
|
||||||
adobe68k)
|
adobe68k)
|
||||||
basic_machine=m68010-adobe
|
basic_machine=m68010-adobe
|
||||||
os=-scout
|
os=-scout
|
||||||
|
|
@ -409,9 +378,6 @@ case $basic_machine in
|
||||||
amd64)
|
amd64)
|
||||||
basic_machine=x86_64-pc
|
basic_machine=x86_64-pc
|
||||||
;;
|
;;
|
||||||
amd64-*)
|
|
||||||
basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
||||||
;;
|
|
||||||
amdahl)
|
amdahl)
|
||||||
basic_machine=580-amdahl
|
basic_machine=580-amdahl
|
||||||
os=-sysv
|
os=-sysv
|
||||||
|
|
@ -471,27 +437,12 @@ case $basic_machine in
|
||||||
basic_machine=j90-cray
|
basic_machine=j90-cray
|
||||||
os=-unicos
|
os=-unicos
|
||||||
;;
|
;;
|
||||||
craynv)
|
|
||||||
basic_machine=craynv-cray
|
|
||||||
os=-unicosmp
|
|
||||||
;;
|
|
||||||
cr16c)
|
|
||||||
basic_machine=cr16c-unknown
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
crds | unos)
|
crds | unos)
|
||||||
basic_machine=m68k-crds
|
basic_machine=m68k-crds
|
||||||
;;
|
;;
|
||||||
crisv32 | crisv32-* | etraxfs*)
|
|
||||||
basic_machine=crisv32-axis
|
|
||||||
;;
|
|
||||||
cris | cris-* | etrax*)
|
cris | cris-* | etrax*)
|
||||||
basic_machine=cris-axis
|
basic_machine=cris-axis
|
||||||
;;
|
;;
|
||||||
crx)
|
|
||||||
basic_machine=crx-unknown
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
da30 | da30-*)
|
da30 | da30-*)
|
||||||
basic_machine=m68k-da30
|
basic_machine=m68k-da30
|
||||||
;;
|
;;
|
||||||
|
|
@ -514,10 +465,6 @@ case $basic_machine in
|
||||||
basic_machine=m88k-motorola
|
basic_machine=m88k-motorola
|
||||||
os=-sysv3
|
os=-sysv3
|
||||||
;;
|
;;
|
||||||
djgpp)
|
|
||||||
basic_machine=i586-pc
|
|
||||||
os=-msdosdjgpp
|
|
||||||
;;
|
|
||||||
dpx20 | dpx20-*)
|
dpx20 | dpx20-*)
|
||||||
basic_machine=rs6000-bull
|
basic_machine=rs6000-bull
|
||||||
os=-bosx
|
os=-bosx
|
||||||
|
|
@ -683,10 +630,6 @@ case $basic_machine in
|
||||||
basic_machine=i386-pc
|
basic_machine=i386-pc
|
||||||
os=-mingw32
|
os=-mingw32
|
||||||
;;
|
;;
|
||||||
mingw32ce)
|
|
||||||
basic_machine=arm-unknown
|
|
||||||
os=-mingw32ce
|
|
||||||
;;
|
|
||||||
miniframe)
|
miniframe)
|
||||||
basic_machine=m68000-convergent
|
basic_machine=m68000-convergent
|
||||||
;;
|
;;
|
||||||
|
|
@ -700,6 +643,10 @@ case $basic_machine in
|
||||||
mips3*)
|
mips3*)
|
||||||
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
|
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
|
||||||
;;
|
;;
|
||||||
|
mmix*)
|
||||||
|
basic_machine=mmix-knuth
|
||||||
|
os=-mmixware
|
||||||
|
;;
|
||||||
monitor)
|
monitor)
|
||||||
basic_machine=m68k-rom68k
|
basic_machine=m68k-rom68k
|
||||||
os=-coff
|
os=-coff
|
||||||
|
|
@ -712,9 +659,6 @@ case $basic_machine in
|
||||||
basic_machine=i386-pc
|
basic_machine=i386-pc
|
||||||
os=-msdos
|
os=-msdos
|
||||||
;;
|
;;
|
||||||
ms1-*)
|
|
||||||
basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
|
|
||||||
;;
|
|
||||||
mvs)
|
mvs)
|
||||||
basic_machine=i370-ibm
|
basic_machine=i370-ibm
|
||||||
os=-mvs
|
os=-mvs
|
||||||
|
|
@ -783,6 +727,10 @@ case $basic_machine in
|
||||||
np1)
|
np1)
|
||||||
basic_machine=np1-gould
|
basic_machine=np1-gould
|
||||||
;;
|
;;
|
||||||
|
nv1)
|
||||||
|
basic_machine=nv1-cray
|
||||||
|
os=-unicosmp
|
||||||
|
;;
|
||||||
nsr-tandem)
|
nsr-tandem)
|
||||||
basic_machine=nsr-tandem
|
basic_machine=nsr-tandem
|
||||||
;;
|
;;
|
||||||
|
|
@ -790,12 +738,9 @@ case $basic_machine in
|
||||||
basic_machine=hppa1.1-oki
|
basic_machine=hppa1.1-oki
|
||||||
os=-proelf
|
os=-proelf
|
||||||
;;
|
;;
|
||||||
openrisc | openrisc-*)
|
or32 | or32-*)
|
||||||
basic_machine=or32-unknown
|
basic_machine=or32-unknown
|
||||||
;;
|
os=-coff
|
||||||
os400)
|
|
||||||
basic_machine=powerpc-ibm
|
|
||||||
os=-os400
|
|
||||||
;;
|
;;
|
||||||
OSE68000 | ose68000)
|
OSE68000 | ose68000)
|
||||||
basic_machine=m68000-ericsson
|
basic_machine=m68000-ericsson
|
||||||
|
|
@ -822,12 +767,6 @@ case $basic_machine in
|
||||||
pc532 | pc532-*)
|
pc532 | pc532-*)
|
||||||
basic_machine=ns32k-pc532
|
basic_machine=ns32k-pc532
|
||||||
;;
|
;;
|
||||||
pc98)
|
|
||||||
basic_machine=i386-pc
|
|
||||||
;;
|
|
||||||
pc98-*)
|
|
||||||
basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
|
|
||||||
;;
|
|
||||||
pentium | p5 | k5 | k6 | nexgen | viac3)
|
pentium | p5 | k5 | k6 | nexgen | viac3)
|
||||||
basic_machine=i586-pc
|
basic_machine=i586-pc
|
||||||
;;
|
;;
|
||||||
|
|
@ -884,10 +823,6 @@ case $basic_machine in
|
||||||
basic_machine=i586-unknown
|
basic_machine=i586-unknown
|
||||||
os=-pw32
|
os=-pw32
|
||||||
;;
|
;;
|
||||||
rdos)
|
|
||||||
basic_machine=i386-pc
|
|
||||||
os=-rdos
|
|
||||||
;;
|
|
||||||
rom68k)
|
rom68k)
|
||||||
basic_machine=m68k-rom68k
|
basic_machine=m68k-rom68k
|
||||||
os=-coff
|
os=-coff
|
||||||
|
|
@ -898,12 +833,6 @@ case $basic_machine in
|
||||||
rtpc | rtpc-*)
|
rtpc | rtpc-*)
|
||||||
basic_machine=romp-ibm
|
basic_machine=romp-ibm
|
||||||
;;
|
;;
|
||||||
s390 | s390-*)
|
|
||||||
basic_machine=s390-ibm
|
|
||||||
;;
|
|
||||||
s390x | s390x-*)
|
|
||||||
basic_machine=s390x-ibm
|
|
||||||
;;
|
|
||||||
sa29200)
|
sa29200)
|
||||||
basic_machine=a29k-amd
|
basic_machine=a29k-amd
|
||||||
os=-udi
|
os=-udi
|
||||||
|
|
@ -914,10 +843,6 @@ case $basic_machine in
|
||||||
sb1el)
|
sb1el)
|
||||||
basic_machine=mipsisa64sb1el-unknown
|
basic_machine=mipsisa64sb1el-unknown
|
||||||
;;
|
;;
|
||||||
sde)
|
|
||||||
basic_machine=mipsisa32-sde
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
sei)
|
sei)
|
||||||
basic_machine=mips-sei
|
basic_machine=mips-sei
|
||||||
os=-seiux
|
os=-seiux
|
||||||
|
|
@ -929,9 +854,6 @@ case $basic_machine in
|
||||||
basic_machine=sh-hitachi
|
basic_machine=sh-hitachi
|
||||||
os=-hms
|
os=-hms
|
||||||
;;
|
;;
|
||||||
sh5el)
|
|
||||||
basic_machine=sh5le-unknown
|
|
||||||
;;
|
|
||||||
sh64)
|
sh64)
|
||||||
basic_machine=sh64-unknown
|
basic_machine=sh64-unknown
|
||||||
;;
|
;;
|
||||||
|
|
@ -1034,10 +956,6 @@ case $basic_machine in
|
||||||
tower | tower-32)
|
tower | tower-32)
|
||||||
basic_machine=m68k-ncr
|
basic_machine=m68k-ncr
|
||||||
;;
|
;;
|
||||||
tpf)
|
|
||||||
basic_machine=s390x-ibm
|
|
||||||
os=-tpf
|
|
||||||
;;
|
|
||||||
udi29k)
|
udi29k)
|
||||||
basic_machine=a29k-amd
|
basic_machine=a29k-amd
|
||||||
os=-udi
|
os=-udi
|
||||||
|
|
@ -1081,10 +999,6 @@ case $basic_machine in
|
||||||
basic_machine=hppa1.1-winbond
|
basic_machine=hppa1.1-winbond
|
||||||
os=-proelf
|
os=-proelf
|
||||||
;;
|
;;
|
||||||
xbox)
|
|
||||||
basic_machine=i686-pc
|
|
||||||
os=-mingw32
|
|
||||||
;;
|
|
||||||
xps | xps100)
|
xps | xps100)
|
||||||
basic_machine=xps100-honeywell
|
basic_machine=xps100-honeywell
|
||||||
;;
|
;;
|
||||||
|
|
@ -1115,9 +1029,6 @@ case $basic_machine in
|
||||||
romp)
|
romp)
|
||||||
basic_machine=romp-ibm
|
basic_machine=romp-ibm
|
||||||
;;
|
;;
|
||||||
mmix)
|
|
||||||
basic_machine=mmix-knuth
|
|
||||||
;;
|
|
||||||
rs6000)
|
rs6000)
|
||||||
basic_machine=rs6000-ibm
|
basic_machine=rs6000-ibm
|
||||||
;;
|
;;
|
||||||
|
|
@ -1134,10 +1045,13 @@ case $basic_machine in
|
||||||
we32k)
|
we32k)
|
||||||
basic_machine=we32k-att
|
basic_machine=we32k-att
|
||||||
;;
|
;;
|
||||||
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
|
sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
|
||||||
basic_machine=sh-unknown
|
basic_machine=sh-unknown
|
||||||
;;
|
;;
|
||||||
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
|
sh64)
|
||||||
|
basic_machine=sh64-unknown
|
||||||
|
;;
|
||||||
|
sparc | sparcv8 | sparcv9 | sparcv9b)
|
||||||
basic_machine=sparc-sun
|
basic_machine=sparc-sun
|
||||||
;;
|
;;
|
||||||
cydra)
|
cydra)
|
||||||
|
|
@ -1210,23 +1124,19 @@ case $os in
|
||||||
| -aos* \
|
| -aos* \
|
||||||
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
|
||||||
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
|
||||||
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
|
| -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
|
||||||
| -openbsd* | -solidbsd* \
|
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
||||||
| -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
|
|
||||||
| -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
|
|
||||||
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
|
||||||
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
|
||||||
| -chorusos* | -chorusrdb* \
|
| -chorusos* | -chorusrdb* \
|
||||||
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
|
||||||
| -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
|
| -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
|
||||||
| -uxpv* | -beos* | -mpeix* | -udk* \
|
|
||||||
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
|
||||||
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
|
||||||
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
|
||||||
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
|
||||||
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
|
||||||
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
|
| -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
|
||||||
| -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
|
|
||||||
# Remember, each alternative MUST END IN *, to match a version number.
|
# Remember, each alternative MUST END IN *, to match a version number.
|
||||||
;;
|
;;
|
||||||
-qnx*)
|
-qnx*)
|
||||||
|
|
@ -1244,15 +1154,12 @@ case $os in
|
||||||
os=`echo $os | sed -e 's|nto|nto-qnx|'`
|
os=`echo $os | sed -e 's|nto|nto-qnx|'`
|
||||||
;;
|
;;
|
||||||
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
|
||||||
| -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
|
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
|
||||||
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
|
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
|
||||||
;;
|
;;
|
||||||
-mac*)
|
-mac*)
|
||||||
os=`echo $os | sed -e 's|mac|macos|'`
|
os=`echo $os | sed -e 's|mac|macos|'`
|
||||||
;;
|
;;
|
||||||
-linux-dietlibc)
|
|
||||||
os=-linux-dietlibc
|
|
||||||
;;
|
|
||||||
-linux*)
|
-linux*)
|
||||||
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
os=`echo $os | sed -e 's|linux|linux-gnu|'`
|
||||||
;;
|
;;
|
||||||
|
|
@ -1265,9 +1172,6 @@ case $os in
|
||||||
-opened*)
|
-opened*)
|
||||||
os=-openedition
|
os=-openedition
|
||||||
;;
|
;;
|
||||||
-os400*)
|
|
||||||
os=-os400
|
|
||||||
;;
|
|
||||||
-wince*)
|
-wince*)
|
||||||
os=-wince
|
os=-wince
|
||||||
;;
|
;;
|
||||||
|
|
@ -1289,9 +1193,6 @@ case $os in
|
||||||
-atheos*)
|
-atheos*)
|
||||||
os=-atheos
|
os=-atheos
|
||||||
;;
|
;;
|
||||||
-syllable*)
|
|
||||||
os=-syllable
|
|
||||||
;;
|
|
||||||
-386bsd)
|
-386bsd)
|
||||||
os=-bsd
|
os=-bsd
|
||||||
;;
|
;;
|
||||||
|
|
@ -1314,9 +1215,6 @@ case $os in
|
||||||
-sinix*)
|
-sinix*)
|
||||||
os=-sysv4
|
os=-sysv4
|
||||||
;;
|
;;
|
||||||
-tpf*)
|
|
||||||
os=-tpf
|
|
||||||
;;
|
|
||||||
-triton*)
|
-triton*)
|
||||||
os=-sysv3
|
os=-sysv3
|
||||||
;;
|
;;
|
||||||
|
|
@ -1353,9 +1251,6 @@ case $os in
|
||||||
-kaos*)
|
-kaos*)
|
||||||
os=-kaos
|
os=-kaos
|
||||||
;;
|
;;
|
||||||
-zvmoe)
|
|
||||||
os=-zvmoe
|
|
||||||
;;
|
|
||||||
-none)
|
-none)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|
@ -1378,12 +1273,6 @@ else
|
||||||
# system, and we'll never get to this point.
|
# system, and we'll never get to this point.
|
||||||
|
|
||||||
case $basic_machine in
|
case $basic_machine in
|
||||||
score-*)
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
spu-*)
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
*-acorn)
|
*-acorn)
|
||||||
os=-riscix1.2
|
os=-riscix1.2
|
||||||
;;
|
;;
|
||||||
|
|
@ -1393,8 +1282,8 @@ case $basic_machine in
|
||||||
arm*-semi)
|
arm*-semi)
|
||||||
os=-aout
|
os=-aout
|
||||||
;;
|
;;
|
||||||
c4x-* | tic4x-*)
|
c4x-* | tic4x-*)
|
||||||
os=-coff
|
os=-coff
|
||||||
;;
|
;;
|
||||||
# This must come before the *-dec entry.
|
# This must come before the *-dec entry.
|
||||||
pdp10-*)
|
pdp10-*)
|
||||||
|
|
@ -1421,9 +1310,6 @@ case $basic_machine in
|
||||||
m68*-cisco)
|
m68*-cisco)
|
||||||
os=-aout
|
os=-aout
|
||||||
;;
|
;;
|
||||||
mep-*)
|
|
||||||
os=-elf
|
|
||||||
;;
|
|
||||||
mips*-cisco)
|
mips*-cisco)
|
||||||
os=-elf
|
os=-elf
|
||||||
;;
|
;;
|
||||||
|
|
@ -1442,15 +1328,9 @@ case $basic_machine in
|
||||||
*-be)
|
*-be)
|
||||||
os=-beos
|
os=-beos
|
||||||
;;
|
;;
|
||||||
*-haiku)
|
|
||||||
os=-haiku
|
|
||||||
;;
|
|
||||||
*-ibm)
|
*-ibm)
|
||||||
os=-aix
|
os=-aix
|
||||||
;;
|
;;
|
||||||
*-knuth)
|
|
||||||
os=-mmixware
|
|
||||||
;;
|
|
||||||
*-wec)
|
*-wec)
|
||||||
os=-proelf
|
os=-proelf
|
||||||
;;
|
;;
|
||||||
|
|
@ -1583,15 +1463,9 @@ case $basic_machine in
|
||||||
-mvs* | -opened*)
|
-mvs* | -opened*)
|
||||||
vendor=ibm
|
vendor=ibm
|
||||||
;;
|
;;
|
||||||
-os400*)
|
|
||||||
vendor=ibm
|
|
||||||
;;
|
|
||||||
-ptx*)
|
-ptx*)
|
||||||
vendor=sequent
|
vendor=sequent
|
||||||
;;
|
;;
|
||||||
-tpf*)
|
|
||||||
vendor=ibm
|
|
||||||
;;
|
|
||||||
-vxsim* | -vxworks* | -windiss*)
|
-vxsim* | -vxworks* | -windiss*)
|
||||||
vendor=wrs
|
vendor=wrs
|
||||||
;;
|
;;
|
||||||
|
|
@ -1616,7 +1490,7 @@ case $basic_machine in
|
||||||
esac
|
esac
|
||||||
|
|
||||||
echo $basic_machine$os
|
echo $basic_machine$os
|
||||||
exit
|
exit 0
|
||||||
|
|
||||||
# Local variables:
|
# Local variables:
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
# ltmain.sh - Provide generalized library-building support services.
|
# ltmain.sh - Provide generalized library-building support services.
|
||||||
# NOTE: Changing this file will not affect anything until you rerun configure.
|
# NOTE: Changing this file will not affect anything until you rerun configure.
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
|
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
|
||||||
# 2007 Free Software Foundation, Inc.
|
# Free Software Foundation, Inc.
|
||||||
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or modify
|
# This program is free software; you can redistribute it and/or modify
|
||||||
|
|
@ -43,8 +43,8 @@ EXIT_FAILURE=1
|
||||||
|
|
||||||
PROGRAM=ltmain.sh
|
PROGRAM=ltmain.sh
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=1.5.24
|
VERSION=1.5.22
|
||||||
TIMESTAMP=" (1.1220.2.455 2007/06/24 02:13:29)"
|
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
|
||||||
|
|
||||||
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
|
||||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
|
|
@ -57,8 +57,6 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||||
else
|
else
|
||||||
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||||
fi
|
fi
|
||||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
||||||
DUALCASE=1; export DUALCASE # for MKS sh
|
|
||||||
|
|
||||||
# Check that we have a working $echo.
|
# Check that we have a working $echo.
|
||||||
if test "X$1" = X--no-reexec; then
|
if test "X$1" = X--no-reexec; then
|
||||||
|
|
@ -116,10 +114,10 @@ esac
|
||||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
do
|
do
|
||||||
eval "if test \"\${$lt_var+set}\" = set; then
|
eval "if test \"\${$lt_var+set}\" = set; then
|
||||||
save_$lt_var=\$$lt_var
|
save_$lt_var=\$$lt_var
|
||||||
$lt_var=C
|
$lt_var=C
|
||||||
export $lt_var
|
export $lt_var
|
||||||
fi"
|
fi"
|
||||||
done
|
done
|
||||||
|
|
||||||
# Make sure IFS has a sensible default
|
# Make sure IFS has a sensible default
|
||||||
|
|
@ -208,13 +206,7 @@ func_win32_libid ()
|
||||||
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
|
||||||
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
|
||||||
win32_nmres=`eval $NM -f posix -A $1 | \
|
win32_nmres=`eval $NM -f posix -A $1 | \
|
||||||
$SED -n -e '1,100{
|
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
|
||||||
/ I /{
|
|
||||||
s,.*,import,
|
|
||||||
p
|
|
||||||
q
|
|
||||||
}
|
|
||||||
}'`
|
|
||||||
case $win32_nmres in
|
case $win32_nmres in
|
||||||
import*) win32_libid_type="x86 archive import";;
|
import*) win32_libid_type="x86 archive import";;
|
||||||
*) win32_libid_type="x86 archive static";;
|
*) win32_libid_type="x86 archive static";;
|
||||||
|
|
@ -348,11 +340,11 @@ func_extract_archives ()
|
||||||
my_xlib_u=$my_xlib
|
my_xlib_u=$my_xlib
|
||||||
while :; do
|
while :; do
|
||||||
case " $extracted_archives " in
|
case " $extracted_archives " in
|
||||||
*" $my_xlib_u "*)
|
*" $my_xlib_u "*)
|
||||||
extracted_serial=`expr $extracted_serial + 1`
|
extracted_serial=`expr $extracted_serial + 1`
|
||||||
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||||
*) break ;;
|
*) break ;;
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
extracted_archives="$extracted_archives $my_xlib_u"
|
extracted_archives="$extracted_archives $my_xlib_u"
|
||||||
my_xdir="$my_gentop/$my_xlib_u"
|
my_xdir="$my_gentop/$my_xlib_u"
|
||||||
|
|
@ -482,12 +474,11 @@ do
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--version)
|
--version)
|
||||||
echo "\
|
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
|
||||||
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
|
$echo
|
||||||
|
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc.
|
$echo "This is free software; see the source for copying conditions. There is NO"
|
||||||
This is free software; see the source for copying conditions. There is NO
|
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
||||||
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
|
|
||||||
exit $?
|
exit $?
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
@ -784,7 +775,7 @@ if test -z "$show_help"; then
|
||||||
*.class) xform=class ;;
|
*.class) xform=class ;;
|
||||||
*.cpp) xform=cpp ;;
|
*.cpp) xform=cpp ;;
|
||||||
*.cxx) xform=cxx ;;
|
*.cxx) xform=cxx ;;
|
||||||
*.[fF][09]?) xform=[fF][09]. ;;
|
*.f90) xform=f90 ;;
|
||||||
*.for) xform=for ;;
|
*.for) xform=for ;;
|
||||||
*.java) xform=java ;;
|
*.java) xform=java ;;
|
||||||
*.obj) xform=obj ;;
|
*.obj) xform=obj ;;
|
||||||
|
|
@ -1169,8 +1160,8 @@ EOF
|
||||||
do
|
do
|
||||||
case $arg in
|
case $arg in
|
||||||
-all-static | -static | -static-libtool-libs)
|
-all-static | -static | -static-libtool-libs)
|
||||||
case $arg in
|
case $arg in
|
||||||
-all-static)
|
-all-static)
|
||||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||||
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
|
||||||
fi
|
fi
|
||||||
|
|
@ -1179,19 +1170,19 @@ EOF
|
||||||
fi
|
fi
|
||||||
prefer_static_libs=yes
|
prefer_static_libs=yes
|
||||||
;;
|
;;
|
||||||
-static)
|
-static)
|
||||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||||
dlopen_self=$dlopen_self_static
|
dlopen_self=$dlopen_self_static
|
||||||
fi
|
fi
|
||||||
prefer_static_libs=built
|
prefer_static_libs=built
|
||||||
;;
|
;;
|
||||||
-static-libtool-libs)
|
-static-libtool-libs)
|
||||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||||
dlopen_self=$dlopen_self_static
|
dlopen_self=$dlopen_self_static
|
||||||
fi
|
fi
|
||||||
prefer_static_libs=yes
|
prefer_static_libs=yes
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
build_libtool_libs=no
|
build_libtool_libs=no
|
||||||
build_old_libs=yes
|
build_old_libs=yes
|
||||||
break
|
break
|
||||||
|
|
@ -1639,7 +1630,7 @@ EOF
|
||||||
continue
|
continue
|
||||||
;;
|
;;
|
||||||
|
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||||
compiler_flags="$compiler_flags $arg"
|
compiler_flags="$compiler_flags $arg"
|
||||||
compile_command="$compile_command $arg"
|
compile_command="$compile_command $arg"
|
||||||
finalize_command="$finalize_command $arg"
|
finalize_command="$finalize_command $arg"
|
||||||
|
|
@ -1659,11 +1650,10 @@ EOF
|
||||||
# -m* pass through architecture-specific compiler args for GCC
|
# -m* pass through architecture-specific compiler args for GCC
|
||||||
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
# -m*, -t[45]*, -txscale* pass through architecture-specific
|
||||||
# compiler args for GCC
|
# compiler args for GCC
|
||||||
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
|
# -pg pass through profiling flag for GCC
|
||||||
# -F/path gives path to uninstalled frameworks, gcc on darwin
|
|
||||||
# @file GCC response files
|
# @file GCC response files
|
||||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
|
||||||
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
|
-t[45]*|-txscale*|@*)
|
||||||
|
|
||||||
# Unknown arguments in both finalize_command and compile_command need
|
# Unknown arguments in both finalize_command and compile_command need
|
||||||
# to be aesthetically quoted because they are evaled later.
|
# to be aesthetically quoted because they are evaled later.
|
||||||
|
|
@ -1691,9 +1681,9 @@ EOF
|
||||||
|
|
||||||
-no-install)
|
-no-install)
|
||||||
case $host in
|
case $host in
|
||||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
|
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
|
||||||
# The PATH hackery in wrapper scripts is required on Windows
|
# The PATH hackery in wrapper scripts is required on Windows
|
||||||
# and Darwin in order for the loader to find any dlls it needs.
|
# in order for the loader to find any dlls it needs.
|
||||||
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
|
||||||
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
|
||||||
fast_install=no
|
fast_install=no
|
||||||
|
|
@ -2134,7 +2124,7 @@ EOF
|
||||||
lib=
|
lib=
|
||||||
found=no
|
found=no
|
||||||
case $deplib in
|
case $deplib in
|
||||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
if test "$linkmode,$pass" = "prog,link"; then
|
||||||
compile_deplibs="$deplib $compile_deplibs"
|
compile_deplibs="$deplib $compile_deplibs"
|
||||||
finalize_deplibs="$deplib $finalize_deplibs"
|
finalize_deplibs="$deplib $finalize_deplibs"
|
||||||
|
|
@ -2530,9 +2520,9 @@ EOF
|
||||||
|
|
||||||
if test "$linkmode,$pass" = "prog,link"; then
|
if test "$linkmode,$pass" = "prog,link"; then
|
||||||
if test -n "$library_names" &&
|
if test -n "$library_names" &&
|
||||||
{ { test "$prefer_static_libs" = no ||
|
{ { test "$prefer_static_libs" = no ||
|
||||||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
test "$prefer_static_libs,$installed" = "built,yes"; } ||
|
||||||
test -z "$old_library"; }; then
|
test -z "$old_library"; }; then
|
||||||
# We need to hardcode the library path
|
# We need to hardcode the library path
|
||||||
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
|
||||||
# Make sure the rpath contains only unique directories.
|
# Make sure the rpath contains only unique directories.
|
||||||
|
|
@ -3239,10 +3229,9 @@ EOF
|
||||||
age="0"
|
age="0"
|
||||||
;;
|
;;
|
||||||
irix|nonstopux)
|
irix|nonstopux)
|
||||||
current=`expr $number_major + $number_minor`
|
current=`expr $number_major + $number_minor - 1`
|
||||||
age="$number_minor"
|
age="$number_minor"
|
||||||
revision="$number_minor"
|
revision="$number_minor"
|
||||||
lt_irix_increment=no
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
@ -3301,8 +3290,7 @@ EOF
|
||||||
versuffix="$major.$age.$revision"
|
versuffix="$major.$age.$revision"
|
||||||
# Darwin ld doesn't like 0 for these options...
|
# Darwin ld doesn't like 0 for these options...
|
||||||
minor_current=`expr $current + 1`
|
minor_current=`expr $current + 1`
|
||||||
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||||
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
freebsd-aout)
|
freebsd-aout)
|
||||||
|
|
@ -3316,11 +3304,8 @@ EOF
|
||||||
;;
|
;;
|
||||||
|
|
||||||
irix | nonstopux)
|
irix | nonstopux)
|
||||||
if test "X$lt_irix_increment" = "Xno"; then
|
major=`expr $current - $age + 1`
|
||||||
major=`expr $current - $age`
|
|
||||||
else
|
|
||||||
major=`expr $current - $age + 1`
|
|
||||||
fi
|
|
||||||
case $version_type in
|
case $version_type in
|
||||||
nonstopux) verstring_prefix=nonstopux ;;
|
nonstopux) verstring_prefix=nonstopux ;;
|
||||||
*) verstring_prefix=sgi ;;
|
*) verstring_prefix=sgi ;;
|
||||||
|
|
@ -3457,11 +3442,11 @@ EOF
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Eliminate all temporary directories.
|
# Eliminate all temporary directories.
|
||||||
#for path in $notinst_path; do
|
# for path in $notinst_path; do
|
||||||
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
|
||||||
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
|
||||||
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
|
||||||
#done
|
# done
|
||||||
|
|
||||||
if test -n "$xrpath"; then
|
if test -n "$xrpath"; then
|
||||||
# If the user specified any rpath flags, then add them.
|
# If the user specified any rpath flags, then add them.
|
||||||
|
|
@ -3562,7 +3547,7 @@ EOF
|
||||||
int main() { return 0; }
|
int main() { return 0; }
|
||||||
EOF
|
EOF
|
||||||
$rm conftest
|
$rm conftest
|
||||||
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||||
ldd_output=`ldd conftest`
|
ldd_output=`ldd conftest`
|
||||||
for i in $deplibs; do
|
for i in $deplibs; do
|
||||||
name=`expr $i : '-l\(.*\)'`
|
name=`expr $i : '-l\(.*\)'`
|
||||||
|
|
@ -3924,10 +3909,7 @@ EOF
|
||||||
test -n "$hardcode_libdirs"; then
|
test -n "$hardcode_libdirs"; then
|
||||||
libdir="$hardcode_libdirs"
|
libdir="$hardcode_libdirs"
|
||||||
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
if test -n "$hardcode_libdir_flag_spec_ld"; then
|
||||||
case $archive_cmds in
|
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
|
||||||
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
|
|
||||||
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
|
|
||||||
esac
|
|
||||||
else
|
else
|
||||||
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
|
||||||
fi
|
fi
|
||||||
|
|
@ -4293,7 +4275,7 @@ EOF
|
||||||
if test -n "$convenience"; then
|
if test -n "$convenience"; then
|
||||||
if test -n "$whole_archive_flag_spec"; then
|
if test -n "$whole_archive_flag_spec"; then
|
||||||
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||||
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
||||||
else
|
else
|
||||||
gentop="$output_objdir/${obj}x"
|
gentop="$output_objdir/${obj}x"
|
||||||
generated="$generated $gentop"
|
generated="$generated $gentop"
|
||||||
|
|
@ -5313,8 +5295,6 @@ if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||||
else
|
else
|
||||||
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
||||||
fi
|
fi
|
||||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
|
||||||
DUALCASE=1; export DUALCASE # for MKS sh
|
|
||||||
|
|
||||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||||
# if CDPATH is set.
|
# if CDPATH is set.
|
||||||
|
|
@ -6411,10 +6391,8 @@ relink_command=\"$relink_command\""
|
||||||
if test -f "$dir/$objdir/$dlname"; then
|
if test -f "$dir/$objdir/$dlname"; then
|
||||||
dir="$dir/$objdir"
|
dir="$dir/$objdir"
|
||||||
else
|
else
|
||||||
if test ! -f "$dir/$dlname"; then
|
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
||||||
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
|
exit $EXIT_FAILURE
|
||||||
exit $EXIT_FAILURE
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
@ -6480,11 +6458,14 @@ relink_command=\"$relink_command\""
|
||||||
# Restore saved environment variables
|
# Restore saved environment variables
|
||||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||||
do
|
do
|
||||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||||
$lt_var=\$save_$lt_var; export $lt_var
|
$lt_var=\$save_$lt_var; export $lt_var
|
||||||
fi"
|
else
|
||||||
|
$lt_unset $lt_var
|
||||||
|
fi"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
||||||
# Now prepare to actually exec the command.
|
# Now prepare to actually exec the command.
|
||||||
exec_cmd="\$cmd$args"
|
exec_cmd="\$cmd$args"
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,7 @@ int teletone_mux_tones(teletone_generation_session_t *ts, teletone_tone_map_t *m
|
||||||
/*teletone_process_t period = (1.0 / ts->rate) / ts->channels;*/
|
/*teletone_process_t period = (1.0 / ts->rate) / ts->channels;*/
|
||||||
int i, c;
|
int i, c;
|
||||||
int freqlen = 0;
|
int freqlen = 0;
|
||||||
teletone_dds_state_t tones[TELETONE_MAX_TONES];
|
teletone_dds_state_t tones[TELETONE_MAX_TONES+1];
|
||||||
//int decay = 0;
|
//int decay = 0;
|
||||||
int duration;
|
int duration;
|
||||||
int wait = 0;
|
int wait = 0;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue