[SCM] libgeotiff-dfsg branch, master, updated. debian/1.2.5-3-21-g7ef7302

Francesco Paolo Lovergine frankie at debian.org
Tue Dec 17 09:10:41 UTC 2013


The following commit has been merged in the master branch:
commit 0051567afd12addf5ca54fcad6bdf8f3a89ae8b1
Merge: f2bd3ad19e81cfb77d3309df7c4f33140b55b16d 5d8800f95b37cafe931e74169901292817fe3b50
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Dec 16 16:19:20 2013 +0100

    Merge tag 'upstream/1.4.0'
    
    Upstream version 1.4.0

diff --combined config.guess
index 0f0fe71,e3a2116..e3a2116
mode 100644,100755..100644
--- a/config.guess
+++ b/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 Free Software Foundation,
- #   Inc.
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ #   Free Software Foundation, Inc.
  
- timestamp='2007-03-06'
+ timestamp='2009-06-10'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
@@@ -56,8 -56,8 +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
- 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."
@@@ -170,7 -170,7 +170,7 @@@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- 			| grep __ELF__ >/dev/null
+ 			| grep -q __ELF__
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
@@@ -324,14 -324,30 +324,30 @@@
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
+     s390x:SunOS:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit ;;
      sun4H:SunOS:5.*:*)
  	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
-     i86pc:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ 	eval $set_cc_for_build
+ 	SUN_ARCH="i386"
+ 	# If there is a compiler, see if it is configured for 64-bit objects.
+ 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ 	# This test works for both compilers.
+ 	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ 		grep IS_64BIT_ARCH >/dev/null
+ 	    then
+ 		SUN_ARCH="x86_64"
+ 	    fi
+ 	fi
+ 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
@@@ -532,7 -548,7 +548,7 @@@ EO
  		echo rs6000-ibm-aix3.2
  	fi
  	exit ;;
-     *:AIX:*:[45])
+     *: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
@@@ -640,7 -656,7 +656,7 @@@ EO
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
- 		grep __LP64__ >/dev/null
+ 		grep -q __LP64__
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
@@@ -793,16 -809,22 +809,22 @@@ EO
  	exit ;;
      *:Interix*:[3456]*)
      	case ${UNAME_MACHINE} in
- 	    x86) 
+ 	    x86)
  		echo i586-pc-interix${UNAME_RELEASE}
  		exit ;;
- 	    EM64T | authenticamd)
+ 	    EM64T | authenticamd | genuineintel)
  		echo x86_64-unknown-interix${UNAME_RELEASE}
  		exit ;;
+ 	    IA64)
+ 		echo ia64-unknown-interix${UNAME_RELEASE}
+ 		exit ;;
  	esac ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
  	echo i${UNAME_MACHINE}-pc-mks
  	exit ;;
+     8664:Windows_NT:*)
+ 	echo x86_64-pc-mks
+ 	exit ;;
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@@ -833,7 -855,14 +855,14 @@@
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
      arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	eval $set_cc_for_build
+ 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 	    | grep -q __ARM_EABI__
+ 	then
+ 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	else
+ 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ 	fi
  	exit ;;
      avr32*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@@ -856,40 -885,17 +885,17 @@@
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
-     mips:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
- 	#undef mips
- 	#undef mipsel
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- 	CPU=mipsel
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- 	CPU=mips
- 	#else
- 	CPU=
- 	#endif
- 	#endif
- EOF
- 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- 	    /^CPU/{
- 		s: ::g
- 		p
- 	    }'`"
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
+     mips:Linux:*:* | mips64:Linux:*:*)
  	eval $set_cc_for_build
  	sed 's/^	//' << EOF >$dummy.c
  	#undef CPU
- 	#undef mips64
- 	#undef mips64el
+ 	#undef ${UNAME_MACHINE}
+ 	#undef ${UNAME_MACHINE}el
  	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
- 	CPU=mips64el
+ 	CPU=${UNAME_MACHINE}el
  	#else
  	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- 	CPU=mips64
+ 	CPU=${UNAME_MACHINE}
  	#else
  	CPU=
  	#endif
@@@ -921,10 -927,13 +927,13 @@@ EO
  	  EV67)  UNAME_MACHINE=alphaev67 ;;
  	  EV68*) UNAME_MACHINE=alphaev68 ;;
          esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ 	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}
  	exit ;;
+     padre:Linux:*:*)
+ 	echo sparc-unknown-linux-gnu
+ 	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@@ -954,8 -963,8 +963,8 @@@
      x86_64:Linux:*:*)
  	echo x86_64-unknown-linux-gnu
  	exit ;;
-     xtensa:Linux:*:*)
-     	echo xtensa-unknown-linux-gnu
+     xtensa*:Linux:*:*)
+     	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
@@@ -972,17 -981,6 +981,6 @@@
  	  elf32-i386)
  		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
  		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- 		exit ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- 		exit ;;
- 	  "")
- 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
- 		# one that does not give us useful --help.
- 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- 		exit ;;
  	esac
  	# Determine whether the default compiler is a.out or elf
  	eval $set_cc_for_build
@@@ -1048,7 -1046,7 +1046,7 @@@ EO
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
-     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
@@@ -1092,8 -1090,11 +1090,11 @@@
      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 i386.
- 	echo i386-pc-msdosdjgpp
+         # 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 ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
@@@ -1131,6 -1132,16 +1132,16 @@@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /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 \
+ 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ 	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@@ -1143,7 -1154,7 +1154,7 @@@
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+     PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
@@@ -1206,6 -1217,9 +1217,9 @@@
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
+     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+ 	echo i586-pc-haiku
+ 	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
@@@ -1314,6 -1328,9 +1328,9 @@@
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
+     i*86:AROS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-aros
+ 	exit ;;
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
@@@ -1474,9 -1491,9 +1491,9 @@@ This script, last modified $timestamp, 
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
-   http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
  and
-   http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
diff --combined config.sub
index 5defff6,eb0389a..eb0389a
mode 100644,100755..100644
--- a/config.sub
+++ b/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 Free Software Foundation,
- #   Inc.
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ #   Free Software Foundation, Inc.
  
- timestamp='2007-01-18'
+ timestamp='2009-06-11'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@@ -72,8 -72,8 +72,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
- 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,6 -122,7 +122,7 @@@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^
  case $maybe_os in
    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/'`
@@@ -152,6 -153,9 +153,9 @@@ case $os i
  		os=
  		basic_machine=$1
  		;;
+         -bluegene*)
+ 	        os=-cnk
+ 		;;
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
@@@ -249,13 -253,16 +253,16 @@@ case $basic_machine i
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
+ 	| lm32 \
  	| m32c | m32r | m32rle | m68000 | m68k | m88k \
- 	| maxq | mb | microblaze | mcore | mep \
+ 	| maxq | mb | microblaze | mcore | mep | metag \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
- 	| mips64vr | mips64vrel \
+ 	| mips64octeon | mips64octeonel \
  	| mips64orion | mips64orionel \
+ 	| mips64r5900 | mips64r5900el \
+ 	| mips64vr | mips64vrel \
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
@@@ -268,6 -275,7 +275,7 @@@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
+ 	| moxie \
  	| mt \
  	| msp430 \
  	| nios | nios2 \
@@@ -277,7 -285,7 +285,7 @@@
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
  	| score \
- 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| 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 \
@@@ -286,7 -294,7 +294,7 @@@
  	| v850 | v850e \
  	| we32k \
  	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
- 	| z8k)
+ 	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
  	m6811 | m68hc11 | m6812 | m68hc12)
@@@ -329,14 -337,17 +337,17 @@@
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
+ 	| lm32-* \
  	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
- 	| mips64vr-* | mips64vrel-* \
+ 	| mips64octeon-* | mips64octeonel-* \
  	| mips64orion-* | mips64orionel-* \
+ 	| mips64r5900-* | mips64r5900el-* \
+ 	| mips64vr-* | mips64vrel-* \
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
@@@ -358,20 -369,24 +369,24 @@@
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
  	| romp-* | rs6000-* \
- 	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| 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-* | strongarm-* | sv1-* | sx?-* \
  	| tahoe-* | thumb-* \
- 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
  	| tron-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
  	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- 	| xstormy16-* | xtensa-* \
+ 	| xstormy16-* | xtensa*-* \
  	| ymp-* \
- 	| z8k-*)
+ 	| z8k-* | z80-*)
+ 		;;
+ 	# Recognize the basic CPU types without company name, with glob match.
+ 	xtensa*)
+ 		basic_machine=$basic_machine-unknown
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
@@@ -435,6 -450,10 +450,10 @@@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
+ 	aros)
+ 		basic_machine=i386-pc
+ 		os=-aros
+ 		;;
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
@@@ -443,10 -462,26 +462,26 @@@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
+ 	blackfin)
+ 		basic_machine=bfin-unknown
+ 		os=-linux
+ 		;;
+ 	blackfin-*)
+ 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
+ 	bluegene*)
+ 		basic_machine=powerpc-ibm
+ 		os=-cnk
+ 		;;
  	c90)
  		basic_machine=c90-cray
  		os=-unicos
  		;;
+         cegcc)
+ 		basic_machine=arm-unknown
+ 		os=-cegcc
+ 		;;
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
@@@ -475,8 -510,8 +510,8 @@@
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
- 	cr16c)
- 		basic_machine=cr16c-unknown
+ 	cr16)
+ 		basic_machine=cr16-unknown
  		os=-elf
  		;;
  	crds | unos)
@@@ -514,6 -549,10 +549,10 @@@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
+ 	dicos)
+ 		basic_machine=i686-pc
+ 		os=-dicos
+ 		;;
  	djgpp)
  		basic_machine=i586-pc
  		os=-msdosdjgpp
@@@ -668,6 -707,14 +707,14 @@@
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
+ 	m68knommu)
+ 		basic_machine=m68k-unknown
+ 		os=-linux
+ 		;;
+ 	m68knommu-*)
+ 		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
@@@ -683,6 -730,10 +730,10 @@@
  		basic_machine=i386-pc
  		os=-mingw32
  		;;
+ 	mingw32ce)
+ 		basic_machine=arm-unknown
+ 		os=-mingw32ce
+ 		;;
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
@@@ -809,6 -860,14 +860,14 @@@
  		basic_machine=i860-intel
  		os=-osf
  		;;
+ 	parisc)
+ 		basic_machine=hppa-unknown
+ 		os=-linux
+ 		;;
+ 	parisc-*)
+ 		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		os=-linux
+ 		;;
  	pbd)
  		basic_machine=sparc-tti
  		;;
@@@ -1017,6 -1076,10 +1076,10 @@@
  		basic_machine=tic6x-unknown
  		os=-coff
  		;;
+ 	tile*)
+ 		basic_machine=tile-unknown
+ 		os=-linux-gnu
+ 		;;
  	tx39)
  		basic_machine=mipstx39-unknown
  		;;
@@@ -1092,6 -1155,10 +1155,10 @@@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
+ 	z80-*-coff)
+ 		basic_machine=z80-unknown
+ 		os=-sim
+ 		;;
  	none)
  		basic_machine=none-none
  		os=-none
@@@ -1130,7 -1197,7 +1197,7 @@@
  	we32k)
  		basic_machine=we32k-att
  		;;
- 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ 	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
  		basic_machine=sh-unknown
  		;;
  	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@@ -1200,10 -1267,11 +1267,11 @@@ case $os i
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
  	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ 	      | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- 	      | -aos* \
+ 	      | -aos* | -aros* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@@ -1212,7 -1280,7 +1280,7 @@@
  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@@ -1352,6 -1420,9 +1420,9 @@@
  	-zvmoe)
  		os=-zvmoe
  		;;
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
  	-none)
  		;;
  	*)
@@@ -1549,7 -1620,7 +1620,7 @@@ case $basic_machine i
  			-sunos*)
  				vendor=sun
  				;;
- 			-aix*)
+ 			-cnk*|-aix*)
  				vendor=ibm
  				;;
  			-beos*)

-- 
The GeoTIFF library



More information about the Pkg-grass-devel mailing list