--- flightgear-0.9.10.orig/utils/GPSsmooth/Makefile.am +++ flightgear-0.9.10/utils/GPSsmooth/Makefile.am @@ -5,7 +5,9 @@ gps_main.cxx GPSsmooth_LDADD = \ - -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul \ + -lsgtiming -lsgmisc -lsgdebug \ + -lsgstructure -lsgprops -lsgxml \ + -lplibnet -lplibul \ $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz MIDGsmooth_SOURCES = \ @@ -14,6 +16,7 @@ MIDGsmooth_LDADD = \ -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \ + -lsgstructure -lsgprops -lsgxml \ -lplibnet -lplibul \ $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz --- flightgear-0.9.10.orig/utils/GPSsmooth/Makefile.in +++ flightgear-0.9.10/utils/GPSsmooth/Makefile.in @@ -195,7 +195,9 @@ gps_main.cxx GPSsmooth_LDADD = \ - -lsgtiming -lsgmisc -lsgdebug -lplibnet -lplibul \ + -lsgtiming -lsgmisc -lsgdebug \ + -lsgstructure -lsgprops -lsgxml \ + -lplibnet -lplibul \ $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz MIDGsmooth_SOURCES = \ @@ -204,6 +206,7 @@ MIDGsmooth_LDADD = \ -lsgio -lsgserial -lsgtiming -lsgmath -lsgbucket -lsgmisc -lsgdebug \ + -lsgstructure -lsgprops -lsgxml \ -lplibnet -lplibul \ $(joystick_LIBS) $(network_LIBS) $(base_LIBS) -lz --- flightgear-0.9.10.orig/utils/Modeller/Makefile.am +++ flightgear-0.9.10/utils/Modeller/Makefile.am @@ -8,4 +8,4 @@ animassist_LDADD = $(base_LIBS) normalmap_SOURCES = normalmap.cxx -normalmap_LDADD = -lsgscreen $(opengl_LIBS) $(base_LIBS) -lz +normalmap_LDADD = -lsgscreen -lsgdebug -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(base_LIBS) -lz --- flightgear-0.9.10.orig/utils/Modeller/Makefile.in +++ flightgear-0.9.10/utils/Modeller/Makefile.in @@ -202,7 +202,7 @@ animassist_SOURCES = animassist.c animassist_LDADD = $(base_LIBS) normalmap_SOURCES = normalmap.cxx -normalmap_LDADD = -lsgscreen $(opengl_LIBS) $(base_LIBS) -lz +normalmap_LDADD = -lsgscreen -lsgdebug -lplibssg -lplibsg -lplibul $(opengl_LIBS) $(base_LIBS) -lz all: all-am .SUFFIXES: --- flightgear-0.9.10.orig/src/Airports/Makefile.am +++ flightgear-0.9.10/src/Airports/Makefile.am @@ -12,6 +12,6 @@ dynamics.cxx dynamics.hxx calc_loc_SOURCES = calc_loc.cxx -calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) +calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lsgprops -lsgstructure -lsgxml -lz $(base_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --- flightgear-0.9.10.orig/src/Airports/Makefile.in +++ flightgear-0.9.10/src/Airports/Makefile.in @@ -204,7 +204,7 @@ dynamics.cxx dynamics.hxx calc_loc_SOURCES = calc_loc.cxx -calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lz $(base_LIBS) +calc_loc_LDADD = -lsgmath -lsgdebug -lsgmisc -lsgprops -lsgstructure -lsgxml -lz $(base_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src all: all-am --- flightgear-0.9.10.orig/src/FDM/YASim/Makefile.am +++ flightgear-0.9.10/src/FDM/YASim/Makefile.am @@ -46,9 +46,9 @@ yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES) -yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) +yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg -lz $(opengl_LIBS) $(base_LIBS) proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES) -proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) +proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg -lz $(opengl_LIBS) $(base_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src --- flightgear-0.9.10.orig/src/FDM/YASim/Makefile.in +++ flightgear-0.9.10/src/FDM/YASim/Makefile.in @@ -251,9 +251,9 @@ noinst_LIBRARIES = libYASim.a libYASim_a_SOURCES = YASim.cxx YASim.hxx FGGround.cpp FGGround.hpp $(SHARED_SOURCE_FILES) yasim_SOURCES = yasim-test.cpp $(SHARED_SOURCE_FILES) -yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) +yasim_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg -lz $(opengl_LIBS) $(base_LIBS) proptest_SOURCES = proptest.cpp $(SHARED_SOURCE_FILES) -proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg $(opengl_LIBS) $(base_LIBS) +proptest_LDADD = -lsgxml -lsgprops -lsgdebug -lsgmisc -lsgstructure -lplibssg -lplibul -lplibsg -lz $(opengl_LIBS) $(base_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src all: all-am --- flightgear-0.9.10.orig/src/Main/Makefile.am +++ flightgear-0.9.10/src/Main/Makefile.am @@ -106,8 +106,9 @@ metar_SOURCES = metar_main.cxx metar_LDADD = \ - -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \ + -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug -lsgprops -lsgserial -lsgxml \ + -lsgsky -lsgscreen -lsgmath -lsgsound -lplibsg -lplibssg \ -lplibnet -lplibul $(network_LIBS) \ - -lz $(base_LIBS) + -lz $(opengl_LIBS) $(openal_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim --- flightgear-0.9.10.orig/src/Main/metar_main.cxx +++ flightgear-0.9.10/src/Main/metar_main.cxx @@ -28,6 +28,13 @@ #include #include +// hack to allow dynamic linking; +// I can't seem to get static linkage to work properly (without causing segfaults) +// in the current Debian packaging for some reason (and I don't want to +// do a repackaging at the moment), and dynamic linkage fails without this. +#include +SGSky *thesky; + using namespace std; // text color --- flightgear-0.9.10.orig/src/Main/Makefile.in +++ flightgear-0.9.10/src/Main/Makefile.in @@ -343,9 +343,10 @@ metar_SOURCES = metar_main.cxx metar_LDADD = \ - -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug \ + -lsgenvironment -lsgio -lsgbucket -lsgmisc -lsgstructure -lsgdebug -lsgprops -lsgserial -lsgxml \ + -lsgsky -lsgscreen -lsgmath -lsgsound -lplibsg -lplibssg \ -lplibnet -lplibul $(network_LIBS) \ - -lz $(base_LIBS) + -lz $(opengl_LIBS) $(openal_LIBS) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/src/FDM/JSBSim all: all-am --- flightgear-0.9.10.orig/src/Main/options.cxx +++ flightgear-0.9.10/src/Main/options.cxx @@ -179,7 +179,7 @@ fgSetString("/sim/startup/browser-app", "launchWebJumper"); #else envp = ::getenv( "WEBBROWSER" ); - if (!envp) envp = "netscape"; + if (!envp) envp = "sensible-browser"; fgSetString("/sim/startup/browser-app", envp); #endif fgSetString("/sim/logging/priority", "alert"); --- flightgear-0.9.10.orig/src/Include/stamp-h +++ flightgear-0.9.10/src/Include/stamp-h @@ -0,0 +1 @@ +timestamp --- flightgear-0.9.10.orig/src/GUI/Makefile.am +++ flightgear-0.9.10/src/GUI/Makefile.am @@ -22,4 +22,4 @@ layout_test_LDADD = libGUI.a \ -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \ - -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) + -lplibpw -lplibpu -lplibfnt -lplibul -lz $(opengl_LIBS) --- flightgear-0.9.10.orig/src/GUI/Makefile.in +++ flightgear-0.9.10/src/GUI/Makefile.in @@ -216,7 +216,7 @@ layout_test_SOURCES = layout-test.cxx layout_test_LDADD = libGUI.a \ -lsgprops -lsgdebug -lsgstructure -lsgmisc -lsgxml \ - -lplibpw -lplibpu -lplibfnt -lplibul $(opengl_LIBS) + -lplibpw -lplibpu -lplibfnt -lplibul -lz $(opengl_LIBS) all: all-am --- flightgear-0.9.10.orig/config.guess +++ flightgear-0.9.10/config.guess @@ -1,9 +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 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2004-09-07' +timestamp='2006-07-02' # 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,13 +18,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 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 # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +56,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,7 +107,7 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; @@ -123,7 +126,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -196,55 +199,23 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,37 +268,43 @@ # 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'` - exit 0 ;; + 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 # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -335,32 +312,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -369,10 +346,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -384,10 +361,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -398,40 +375,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -455,32 +432,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -496,29 +474,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -526,7 +504,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -541,14 +519,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) 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 @@ -562,28 +544,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -645,9 +627,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -655,11 +647,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -687,158 +679,179 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + 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 0 ;; + 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}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + 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_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; + x86:Interix*:[3456]*) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T:Interix*:[3456]*) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + 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 # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -855,8 +868,12 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + 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:*:*) eval $set_cc_for_build @@ -874,15 +891,22 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + 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; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -896,7 +920,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -904,25 +928,28 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -940,15 +967,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + 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 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -965,7 +992,7 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout @@ -975,16 +1002,23 @@ LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + 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... @@ -992,27 +1026,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1020,15 +1054,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' 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 0 + && { 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 0 ;; + && { 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 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1120,69 +1155,72 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1190,22 +1228,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1216,38 +1257,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; - esac + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1279,7 +1329,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1368,11 +1418,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1381,22 +1432,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1407,7 +1458,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- flightgear-0.9.10.orig/config.sub +++ flightgear-0.9.10/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2004-08-29' +timestamp='2006-09-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,14 +22,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# 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 # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +72,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,8 +120,9 @@ # 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-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -170,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -186,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. 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*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -230,14 +241,16 @@ | 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 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +259,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,20 +268,24 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -278,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -297,8 +318,8 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -308,9 +329,9 @@ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +340,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,24 +349,27 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | mt-* \ | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -489,6 +514,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -679,6 +708,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -754,9 +786,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -787,6 +818,12 @@ pc532 | 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) basic_machine=i586-pc ;; @@ -843,6 +880,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -869,6 +910,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; sei) basic_machine=mips-sei os=-seiux @@ -1029,6 +1074,10 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; @@ -1078,13 +1127,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1157,20 +1203,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1188,7 +1237,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1297,6 +1346,9 @@ -kaos*) os=-kaos ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1319,6 +1371,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1328,9 +1386,9 @@ arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff - ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1374,6 +1432,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1545,7 +1606,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- flightgear-0.9.10.orig/tests/Makefile.am +++ flightgear-0.9.10/tests/Makefile.am @@ -21,4 +21,4 @@ test_text_SOURCES = test-text.cxx test_up_SOURCES = test-up.cxx -test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) +test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lsgprops -lplibsg -lplibul -lz $(base_LIBS) --- flightgear-0.9.10.orig/tests/Makefile.in +++ flightgear-0.9.10/tests/Makefile.in @@ -227,7 +227,7 @@ test_mktime_SOURCES = test-mktime.cxx test_text_SOURCES = test-text.cxx test_up_SOURCES = test-up.cxx -test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lplibsg -lplibul -lz $(base_LIBS) +test_up_LDADD = -lsgmath -lsgxml -lsgmisc -lsgdebug -lsgstructure -lsgtiming -lsgprops -lplibsg -lplibul -lz $(base_LIBS) all: all-am .SUFFIXES: --- flightgear-0.9.10.orig/debian/dirs +++ flightgear-0.9.10/debian/dirs @@ -0,0 +1 @@ +usr/games --- flightgear-0.9.10.orig/debian/flightgear.xpm +++ flightgear-0.9.10/debian/flightgear.xpm @@ -0,0 +1,1421 @@ +/* XPM */ +static char * flightgear_xpm[] = { +"48 48 1370 2", +" c None", +". c #FEFF47", +"+ c #000000", +"@ c #FEF9EA", +"# c #FDFCF0", +"$ c #F5F4E9", +"% c #FBFAEC", +"& c #FEFDED", +"* c #FEFEF3", +"= c #FFFDFA", +"- c #FFFBFE", +"; c #FFFCFE", +"> c #FEFCFC", +", c #FEFCFD", +"' c #FEFDFF", +") c #FFFDFF", +"! c #FEFEFF", +"~ c #FEFFFF", +"{ c #FDFEFF", +"] c #FDFEFE", +"^ c #FDFEFC", +"/ c #FEFEFC", +"( c #FFFDFD", +"_ c #FEFDFE", +": c #F8FCFE", +"< c #F1FAFD", +"[ c #EEFCFE", +"} c #ECFEFE", +"| c #DCFAFA", +"1 c #CEF4F4", +"2 c #FDF8ED", +"3 c #FBF8F3", +"4 c #FAFAF8", +"5 c #FBFAF6", +"6 c #FBFBF6", +"7 c #FCFCF9", +"8 c #FEFBFD", +"9 c #FEF8FF", +"0 c #FEF9FF", +"a c #FDF8FD", +"b c #FBF8FE", +"c c #FCF8FF", +"d c #FEFBFF", +"e c #FCFAFF", +"f c #FCFBFF", +"g c #FDFDFF", +"h c #FCFEFE", +"i c #FCFDFE", +"j c #FAFDFC", +"k c #FAFDFA", +"l c #FBFBF9", +"m c #FCFAFA", +"n c #FEF9FA", +"o c #FDF7FA", +"p c #FBF7FA", +"q c #F8F8FB", +"r c #F5F7FA", +"s c #F8FBFC", +"t c #E7F0F2", +"u c #B0C8C9", +"v c #FEFBEE", +"w c #FBF9F7", +"x c #FAF8FA", +"y c #FBFAFE", +"z c #FCFBFE", +"A c #FBFBFD", +"B c #FEFBFE", +"C c #FCF7FD", +"D c #FCF9FD", +"E c #FDFBFF", +"F c #FBFBFF", +"G c #F7F9FB", +"H c #F4F8F7", +"I c #F8FCF8", +"J c #F9FCF8", +"K c #F8FBF8", +"L c #FAFAF9", +"M c #FBF9FA", +"N c #FDF9FA", +"O c #FEF8FA", +"P c #FAF5F7", +"Q c #FCF8FA", +"R c #F7F4F4", +"S c #F0ECEB", +"T c #D4CBCF", +"U c #ABABB1", +"V c #FCFBE7", +"W c #F9F8F3", +"X c #F7F6FB", +"Y c #FDFCFF", +"Z c #FBF9FC", +"` c #F8F4F6", +" . c #F8F5F4", +".. c #FBFAF8", +"+. c #FDFBFB", +"@. c #FCFCFD", +"#. c #FAFAFD", +"$. c #F4F7F3", +"%. c #EAEFE7", +"&. c #E8EEE4", +"*. c #F3F4EE", +"=. c #F7F5F4", +"-. c #F7F4F5", +";. c #F6F4F5", +">. c #F7F5F5", +",. c #F9F9F7", +"'. c #F5F6F2", +"). c #E6E8E3", +"!. c #D7D8D2", +"~. c #C4BDBD", +"{. c #A9ACAF", +"]. c #FDFCED", +"^. c #FAFAF7", +"/. c #FCF8FB", +"(. c #FBF7F9", +"_. c #F4F8FA", +":. c #F2F4F6", +"<. c #F4F1EF", +"[. c #F6F2EC", +"}. c #FCF8F2", +"|. c #FDF9F5", +"1. c #FCFAF7", +"2. c #F8F8F7", +"3. c #F6F6F5", +"4. c #F6F8F5", +"5. c #F5F8F2", +"6. c #EBF0E7", +"7. c #E5EBE1", +"8. c #F0F1EB", +"9. c #F8F5F5", +"0. c #F7F0F6", +"a. c #F5EAF4", +"b. c #F1E8EF", +"c. c #EFEAEB", +"d. c #F0EFE9", +"e. c #F7F7F0", +"f. c #E0DFDB", +"g. c #C8C5C4", +"h. c #B9B7B6", +"i. c #A3ADAD", +"j. c #F8FDF7", +"k. c #F8F9FB", +"l. c #FDF6F6", +"m. c #FEF6F4", +"n. c #EDF9FB", +"o. c #E0ECF2", +"p. c #EDEFEF", +"q. c #F7F6F2", +"r. c #FDFBF8", +"s. c #F3F7F7", +"t. c #EFF4F5", +"u. c #EFF6F6", +"v. c #E7EFED", +"w. c #E2EAE8", +"x. c #E5EEEC", +"y. c #EEF4F8", +"z. c #F2EFFC", +"A. c #F6EBFC", +"B. c #F5EBF8", +"C. c #EDE9EF", +"D. c #E9EBE6", +"E. c #E5E8E3", +"F. c #DFDEDE", +"G. c #D5CCD2", +"H. c #BFBBBB", +"I. c #A0A8A6", +"J. c #F5FDFE", +"K. c #F4FBFE", +"L. c #FAF7F8", +"M. c #F9F5F3", +"N. c #DEEAED", +"O. c #C0DBE5", +"P. c #BFDCEA", +"Q. c #C6DAE7", +"R. c #C1D4E5", +"S. c #C0D8E8", +"T. c #C2D9E8", +"U. c #C5DBE8", +"V. c #C6DBE8", +"W. c #C7DCE8", +"X. c #C5DAE7", +"Y. c #C6D9E6", +"Z. c #C1D4E2", +"`. c #BED2E0", +" + c #B6D6E3", +".+ c #B3D5E4", +"++ c #B8D5E5", +"@+ c #BAD3E4", +"#+ c #BCD6E5", +"$+ c #BAD9E5", +"%+ c #BADCE5", +"&+ c #B4D2D8", +"*+ c #B7CFD2", +"=+ c #CAD7D6", +"-+ c #C1C6BF", +";+ c #B1B6AD", +">+ c #EFFDFE", +",+ c #EBF8FC", +"'+ c #EDF3F2", +")+ c #F0F7F6", +"!+ c #A7BFC9", +"~+ c #527D98", +"{+ c #507EA6", +"]+ c #547AA5", +"^+ c #4F7AA5", +"/+ c #4F80AD", +"(+ c #4F7FAA", +"_+ c #527FA9", +":+ c #537DA6", +"<+ c #557DA6", +"[+ c #577DA4", +"}+ c #597EA2", +"|+ c #5A7DA0", +"1+ c #5C7EA2", +"2+ c #5483A6", +"3+ c #4F81A4", +"4+ c #5383A3", +"5+ c #5182A0", +"6+ c #4C80A0", +"7+ c #4A80A5", +"8+ c #4B81A5", +"9+ c #4F7E98", +"0+ c #587F8A", +"a+ c #AAC3BE", +"b+ c #C6D0C4", +"c+ c #B6BAAD", +"d+ c #F0FDFE", +"e+ c #ECFAFC", +"f+ c #EEF7F3", +"g+ c #E2F2EE", +"h+ c #95B7C3", +"i+ c #3A6F93", +"j+ c #336EA6", +"k+ c #386DA9", +"l+ c #356FAB", +"m+ c #3575B1", +"n+ c #3876B1", +"o+ c #3D79B3", +"p+ c #4079B2", +"q+ c #3F76AE", +"r+ c #4177AE", +"s+ c #4377AE", +"t+ c #4477AE", +"u+ c #4578B0", +"v+ c #4578B5", +"w+ c #4678B1", +"x+ c #4479A7", +"y+ c #437CA5", +"z+ c #3D7AA9", +"A+ c #3574AE", +"B+ c #3A75B3", +"C+ c #4374A4", +"D+ c #486D84", +"E+ c #A5BCB7", +"F+ c #C4CEC1", +"G+ c #B6BCAF", +"H+ c #F5FDFB", +"I+ c #F0FAF7", +"J+ c #F3F9EF", +"K+ c #EAF8F1", +"L+ c #99B9C5", +"M+ c #37719A", +"N+ c #3275B7", +"O+ c #3773BC", +"P+ c #3A78BD", +"Q+ c #3E81C1", +"R+ c #4384C4", +"S+ c #4888C6", +"T+ c #4D8AC8", +"U+ c #4784C2", +"V+ c #4885C5", +"W+ c #4988CB", +"X+ c #4789CD", +"Y+ c #498AD2", +"Z+ c #5386D5", +"`+ c #5987D0", +" @ c #4F82B9", +".@ c #4F88B8", +"+@ c #4B88C2", +"@@ c #4281CA", +"#@ c #4880CE", +"$@ c #507DBB", +"%@ c #5D7C9D", +"&@ c #AEC0BC", +"*@ c #BCC9BF", +"=@ c #ADB9B1", +"-@ c #F8FCF3", +";@ c #F3F8F0", +">@ c #EDEEE0", +",@ c #EFF9F0", +"'@ c #9CBCC8", +")@ c #377099", +"!@ c #3376B9", +"~@ c #3D79C4", +"{@ c #457FC2", +"]@ c #4C87C2", +"^@ c #5690CB", +"/@ c #5991CB", +"(@ c #6299D3", +"_@ c #5790CA", +":@ c #5590CC", +"<@ c #5797D7", +"[@ c #5294D8", +"}@ c #5598DF", +"|@ c #5D94DD", +"1@ c #6395D8", +"2@ c #5F93C8", +"3@ c #5994C0", +"4@ c #5998CC", +"5@ c #5393D6", +"6@ c #4F8AD2", +"7@ c #5E8DC7", +"8@ c #6588A4", +"9@ c #B1C7C2", +"0@ c #B6C7C2", +"a@ c #A1B1AF", +"b@ c #FDFEF2", +"c@ c #F7F8EF", +"d@ c #F0ECDF", +"e@ c #F0F6ED", +"f@ c #A1BCC8", +"g@ c #3B7299", +"h@ c #3576B8", +"i@ c #417DC3", +"j@ c #4F88C8", +"k@ c #578EC7", +"l@ c #669AD1", +"m@ c #6A9CCE", +"n@ c #75A5D5", +"o@ c #70A0D0", +"p@ c #689ACA", +"q@ c #679DD1", +"r@ c #659FD5", +"s@ c #64A0D7", +"t@ c #6AA5DA", +"u@ c #6BA4D3", +"v@ c #70A9CF", +"w@ c #66A2C3", +"x@ c #64A4CB", +"y@ c #64A5D5", +"z@ c #5897C9", +"A@ c #69A0C5", +"B@ c #6B96A5", +"C@ c #AFCDC5", +"D@ c #B4C8C7", +"E@ c #A2B3B6", +"F@ c #FDFFF5", +"G@ c #F8FAF4", +"H@ c #F2EDE7", +"I@ c #EDEFED", +"J@ c #A1BBCB", +"K@ c #40739C", +"L@ c #3A79B6", +"M@ c #4581C1", +"N@ c #528FD0", +"O@ c #5693D0", +"P@ c #6AA1D9", +"Q@ c #78A8D8", +"R@ c #7DA8CE", +"S@ c #8CB1D1", +"T@ c #82A6C3", +"U@ c #7B9FBB", +"V@ c #7DA3BC", +"W@ c #7AA2BB", +"X@ c #80B0C5", +"Y@ c #76A8BA", +"Z@ c #80AEC0", +"`@ c #7DA9BD", +" # c #73A1B5", +".# c #75A7BB", +"+# c #6C9FAE", +"@# c #78A6AF", +"## c #7DA4A2", +"$# c #B4CEC8", +"%# c #B7C4C8", +"&# c #A4B0B5", +"*# c #F6FEF7", +"=# c #F4FAFA", +"-# c #F2F0F1", +";# c #E7EAEF", +"># c #9DB6CC", +",# c #4274A0", +"'# c #3F7FBA", +")# c #4482C0", +"!# c #4B8FD4", +"~# c #519ADF", +"{# c #64A3E1", +"]# c #7AAFE1", +"^# c #88B0D1", +"/# c #B5D4E8", +"(# c #BAD3DF", +"_# c #C0D5DC", +":# c #C5D8DC", +"<# c #BFD4D5", +"[# c #BEDAD9", +"}# c #B8D5D6", +"|# c #C2D6DF", +"1# c #C9D8E3", +"2# c #BDCDD9", +"3# c #B7CCD0", +"4# c #BAD3CD", +"5# c #B6CFC5", +"6# c #B7C9C2", +"7# c #C8D1D0", +"8# c #C2C0C9", +"9# c #ABADB4", +"0# c #F6FEFD", +"a# c #F4FAFE", +"b# c #F1EFF6", +"c# c #E1E5F0", +"d# c #98B3CB", +"e# c #4075A2", +"f# c #4182BD", +"g# c #4382BE", +"h# c #4890D2", +"i# c #56A4EB", +"j# c #5DA4E6", +"k# c #6FACE1", +"l# c #89B4D2", +"m# c #D0EBF6", +"n# c #DCEBEC", +"o# c #E6EEE9", +"p# c #EAF2EB", +"q# c #E8F3EA", +"r# c #E5EEE8", +"s# c #EAEFEF", +"t# c #ECECF2", +"u# c #F0EBF4", +"v# c #E8E3EA", +"w# c #DCDBD9", +"x# c #E5E9DD", +"y# c #D3D7CA", +"z# c #D6D7CF", +"A# c #D6D1D3", +"B# c #CDC4CC", +"C# c #B1AFB4", +"D# c #F9FBFE", +"E# c #F8F8FF", +"F# c #F6F1F8", +"G# c #E7E9F5", +"H# c #9AB4CC", +"I# c #4679A5", +"J# c #3F80B9", +"K# c #4987C1", +"L# c #4D8CC2", +"M# c #559BDA", +"N# c #5EA6EF", +"O# c #64A7E6", +"P# c #83B3CE", +"Q# c #D0E8EA", +"R# c #E9EDE6", +"S# c #EDE8E8", +"T# c #E4E9ED", +"U# c #E2F1F4", +"V# c #EAEBF6", +"W# c #ECE4F3", +"X# c #EFEEF4", +"Y# c #E9ECEB", +"Z# c #E3E6E3", +"`# c #E4E5E3", +" $ c #DEDCDD", +".$ c #D9D6D7", +"+$ c #D4D4D2", +"@$ c #CFD3CD", +"#$ c #C3C5C5", +"$$ c #A6ADAB", +"%$ c #F9FBF8", +"&$ c #F4F5F7", +"*$ c #F7F2F5", +"=$ c #F0F3F8", +"-$ c #9EB8CD", +";$ c #4377A3", +">$ c #407FBB", +",$ c #4E8AC9", +"'$ c #508BCA", +")$ c #5798E3", +"!$ c #63A7FA", +"~$ c #61A1EC", +"{$ c #80ADD0", +"]$ c #D7E9F0", +"^$ c #EFE9E9", +"/$ c #EEDEE5", +"($ c #EBE5EF", +"_$ c #E7EDF4", +":$ c #ECE9F0", +"<$ c #F4ECF2", +"[$ c #F0F0ED", +"}$ c #E2E7DD", +"|$ c #E1E6DC", +"1$ c #E5E6E4", +"2$ c #E5E0E6", +"3$ c #DFDAE2", +"4$ c #D6D4D8", +"5$ c #C9CAC9", +"6$ c #BDC0C0", +"7$ c #A4ADAA", +"8$ c #F9FCEE", +"9$ c #F5F7F0", +"0$ c #F9F7F1", +"a$ c #F5F8F7", +"b$ c #A2BBCD", +"c$ c #4375A2", +"d$ c #4380BF", +"e$ c #4F8ACD", +"f$ c #5692D8", +"g$ c #5999ED", +"h$ c #68A8FE", +"i$ c #6BA6F6", +"j$ c #85ACD3", +"k$ c #D9E7F2", +"l$ c #EFE4E6", +"m$ c #F8E2E9", +"n$ c #F2E2EB", +"o$ c #ECE7E8", +"p$ c #EFEBE7", +"q$ c #EFECE3", +"r$ c #EEF0E1", +"s$ c #E5EBDA", +"t$ c #E1E6DA", +"u$ c #E0E0E0", +"v$ c #E2DDE7", +"w$ c #DDD7E4", +"x$ c #DAD4DE", +"y$ c #D0CBD2", +"z$ c #C1C0C4", +"A$ c #A8AFAC", +"B$ c #F7FDEA", +"C$ c #F6F8EE", +"D$ c #F6F4EA", +"E$ c #F1F4F2", +"F$ c #A1BACC", +"G$ c #42749F", +"H$ c #4583C2", +"I$ c #4F8ACB", +"J$ c #5F9ADA", +"K$ c #609FE7", +"L$ c #6CA9F8", +"M$ c #7CB3F7", +"N$ c #8EB4D2", +"O$ c #D1E2E5", +"P$ c #E5E2DD", +"Q$ c #F6E7E7", +"R$ c #EFE4E2", +"S$ c #E5E4D8", +"T$ c #EEF4E8", +"U$ c #EDF5EA", +"V$ c #EBF5E6", +"W$ c #EBF6EA", +"X$ c #E4EFE9", +"Y$ c #E0E9EE", +"Z$ c #E1E6F3", +"`$ c #D7D8E9", +" % c #D3D0DF", +".% c #CCC5D0", +"+% c #BFBCC2", +"@% c #A9B0AE", +"#% c #F5FCEF", +"$% c #F3F6F2", +"%% c #F9F6F1", +"&% c #F4F6F6", +"*% c #A0B9C9", +"=% c #40739A", +"-% c #4784BF", +";% c #548ECA", +">% c #67A0D2", +",% c #6EA7DC", +"'% c #73ACEA", +")% c #85BBED", +"!% c #97C2D1", +"~% c #CAE6E1", +"{% c #DCEAE3", +"]% c #E0E6E6", +"^% c #E1E9E7", +"/% c #D7E7DB", +"(% c #D3E7E3", +"_% c #D4E9EC", +":% c #CEE3E4", +"<% c #D4E8E9", +"[% c #D5E9ED", +"}% c #CCE2ED", +"|% c #CEE1EF", +"1% c #C9D5E7", +"2% c #D1D6E4", +"3% c #CECCD3", +"4% c #BEBCC1", +"5% c #A8AFAE", +"6% c #F6FBFC", +"7% c #F5F8FB", +"8% c #FAF5F8", +"9% c #F2F3F8", +"0% c #9DB5C7", +"a% c #42749A", +"b% c #4683B7", +"c% c #5A92C7", +"d% c #6EA2CD", +"e% c #77A9D8", +"f% c #7BACE3", +"g% c #86B7E6", +"h% c #97C5D7", +"i% c #A1C8CD", +"j% c #9EBFC7", +"k% c #9AB7CA", +"l% c #8AABBC", +"m% c #789FA6", +"n% c #6F97AA", +"o% c #6B90AB", +"p% c #6888A1", +"q% c #6C89A1", +"r% c #5D819C", +"s% c #6588A1", +"t% c #708C9F", +"u% c #B5C6D1", +"v% c #CCD0D2", +"w% c #C2C2C5", +"x% c #A9B1B0", +"y% c #F5FAFE", +"z% c #F7FAFE", +"A% c #F9F3FA", +"B% c #F1F2F8", +"C% c #A0B8CA", +"D% c #47789C", +"E% c #4682B2", +"F% c #5D94C4", +"G% c #76A7D5", +"H% c #84AFE8", +"I% c #86AFF2", +"J% c #89B4F1", +"K% c #90C1E8", +"L% c #8CBEDF", +"M% c #7DAFD9", +"N% c #6D9FD9", +"O% c #679CD4", +"P% c #558FBB", +"Q% c #4884B2", +"R% c #497FB3", +"S% c #4774A7", +"T% c #4C72A4", +"U% c #4974A3", +"V% c #3E709A", +"W% c #407496", +"X% c #517D91", +"Y% c #A8C4CB", +"Z% c #C7D0CE", +"`% c #BCBFC0", +" & c #A2ABAC", +".& c #F2F8FD", +"+& c #F5F9FE", +"@& c #F8F3F8", +"#& c #F0F2F6", +"$& c #A3BBCB", +"%& c #4D7DA0", +"&& c #4883B3", +"*& c #5B90C2", +"=& c #78A7DA", +"-& c #8BB6F5", +";& c #8CB4FB", +">& c #8BB5F9", +",& c #92C3F6", +"'& c #93C9F9", +")& c #83BCF9", +"!& c #6BA3F2", +"~& c #6CA6F3", +"{& c #5F9BDB", +"]& c #4B8DC7", +"^& c #4C8AC5", +"/& c #4E82BD", +"(& c #527DB9", +"_& c #5180B9", +":& c #4A82B6", +"<& c #4682A8", +"[& c #5788A1", +"}& c #ACC9D4", +"|& c #C9CFCF", +"1& c #BFC1C4", +"2& c #A0ABAD", +"3& c #F4FDF8", +"4& c #F7FDFB", +"5& c #FAF8F5", +"6& c #ECEFEF", +"7& c #9CB4C3", +"8& c #4A799B", +"9& c #4A84B6", +"0& c #5A8FC2", +"a& c #79AADC", +"b& c #91C1F9", +"c& c #93BDFD", +"d& c #8CB7F6", +"e& c #8FC1F0", +"f& c #94CBF8", +"g& c #8CC6FE", +"h& c #73ABF9", +"i& c #72A8F4", +"j& c #6DA3E0", +"k& c #589BD1", +"l& c #5799D1", +"m& c #6095D0", +"n& c #628DCB", +"o& c #608ECC", +"p& c #5A93CC", +"q& c #5591BD", +"r& c #6798B6", +"s& c #B4CFE0", +"t& c #CECFD4", +"u& c #C3C3C9", +"v& c #A2ADB0", +"w& c #F4FBEE", +"x& c #ECF4E8", +"y& c #F4F4E7", +"z& c #F4F7F2", +"A& c #A1B9C7", +"B& c #49789D", +"C& c #4D86BC", +"D& c #5C90C6", +"E& c #71A6D1", +"F& c #92C6F1", +"G& c #9CCCFC", +"H& c #92C1F0", +"I& c #8DBFDF", +"J& c #91C6E4", +"K& c #95CBF6", +"L& c #86B8F4", +"M& c #79A9E2", +"N& c #7EAED9", +"O& c #6FADD5", +"P& c #6AA8D6", +"Q& c #77A9DC", +"R& c #78A1DB", +"S& c #729EDB", +"T& c #72A5DF", +"U& c #6FA4D3", +"V& c #7DA6C9", +"W& c #BDCFE4", +"X& c #CBC8D3", +"Y& c #C1C0C9", +"Z& c #A2AFB2", +"`& c #F8FDEC", +" * c #F1F7E8", +".* c #F0EFE1", +"+* c #EDF1ED", +"@* c #A4BCCC", +"#* c #4977A1", +"$* c #4F87BF", +"%* c #5D90C4", +"&* c #6FA1C6", +"** c #91C4E8", +"=* c #9FCFFB", +"-* c #99CAF7", +";* c #90BFDC", +">* c #92BFD6", +",* c #98C2E2", +"'* c #93BCED", +")* c #80ADDE", +"!* c #7CB0D6", +"~* c #81B7D4", +"{* c #7DAFCE", +"]* c #85B2D7", +"^* c #86AFDE", +"/* c #81AADE", +"(* c #86AEE1", +"_* c #89ACD7", +":* c #94ADCC", +"<* c #CCD7E8", +"[* c #D4D3DC", +"}* c #C5C7CC", +"|* c #A6B3B3", +"1* c #F9FDF0", +"2* c #F1F5E8", +"3* c #EDEBDF", +"4* c #E6EAE9", +"5* c #9EB7CC", +"6* c #4573A0", +"7* c #4B83BB", +"8* c #5E91C4", +"9* c #72A4C7", +"0* c #8EC1E6", +"a* c #9ED0FC", +"b* c #A2D2FD", +"c* c #97C1DA", +"d* c #B2D4E4", +"e* c #B6D1E7", +"f* c #B4CEF2", +"g* c #AACCEF", +"h* c #A1CCE7", +"i* c #A8D0E2", +"j* c #A6C9DD", +"k* c #A8CBE4", +"l* c #A6C9EC", +"m* c #A6C7ED", +"n* c #AAC6EE", +"o* c #B7CAEB", +"p* c #BFCAE2", +"q* c #D2D5E2", +"r* c #D1D0D5", +"s* c #CACDD0", +"t* c #A9B7B6", +"u* c #F6FCF2", +"v* c #F6F9F2", +"w* c #F6F4EC", +"x* c #EEF2F2", +"y* c #A1BACE", +"z* c #4674A2", +"A* c #4981B9", +"B* c #6094C7", +"C* c #71A6CC", +"D* c #84B9E2", +"E* c #99CBFB", +"F* c #AFDBFE", +"G* c #AACCDD", +"H* c #E2F6F9", +"I* c #E5EEF5", +"J* c #E1E6F7", +"K* c #DEE7F7", +"L* c #D8E7EF", +"M* c #D6E9EF", +"N* c #D6E8F2", +"O* c #D6EAF6", +"P* c #D4E8F7", +"Q* c #D9EDF9", +"R* c #DDEEFB", +"S* c #EAF5FB", +"T* c #F0F2F8", +"U* c #EAE5EB", +"V* c #CBC2C5", +"W* c #B6B6B8", +"X* c #A0AEAC", +"Y* c #FAFEF9", +"Z* c #FAFCF9", +"`* c #F8F6F0", +" = c #F3F6F8", +".= c #A4BBCD", +"+= c #477FB7", +"@= c #5C90C2", +"#= c #72A8D0", +"$= c #83B9E5", +"%= c #95C6F9", +"&= c #AFD8FE", +"*= c #B7D2DE", +"== c #E2EFEB", +"-= c #EBEAE6", +";= c #F3EAF0", +">= c #EEE6EB", +",= c #DFDED8", +"'= c #DADEDB", +")= c #DCE1E3", +"!= c #DAE2E4", +"~= c #D8E2E4", +"{= c #DCE7E8", +"]= c #E0EAEA", +"^= c #EBEFF0", +"/= c #E5E4E5", +"(= c #E1D9DB", +"_= c #DCD1D4", +":= c #BCBBBD", +"<= c #A1AEAD", +"[= c #FAFEFC", +"}= c #FCF9F5", +"|= c #F7F9FC", +"1= c #A2B8CB", +"2= c #4574A0", +"3= c #4880B7", +"4= c #5A8EBF", +"5= c #74A8D0", +"6= c #85B9E6", +"7= c #92C1F5", +"8= c #A9CFF8", +"9= c #C0D9E2", +"0= c #DBE5DC", +"a= c #E3DED6", +"b= c #EEE1E2", +"c= c #EFE3E4", +"d= c #E4DED5", +"e= c #DCD9D3", +"f= c #DEDCDA", +"g= c #E0E0DC", +"h= c #E3E8DF", +"i= c #E7ECE2", +"j= c #E9EEE2", +"k= c #E5E7E0", +"l= c #E4E1DE", +"m= c #DDD5D6", +"n= c #E0D7DB", +"o= c #C5C4C8", +"p= c #A0ADAD", +"q= c #FBFFFE", +"r= c #FAFCFC", +"s= c #FAF6F3", +"t= c #A4BCCF", +"u= c #4976A3", +"v= c #4780B7", +"w= c #5A8EBE", +"x= c #71A2C8", +"y= c #85B4E0", +"z= c #92BDF1", +"A= c #A9CEF7", +"B= c #C0DAE2", +"C= c #E0EDE4", +"D= c #EEEFE8", +"E= c #EAE4EA", +"F= c #E4E1E7", +"G= c #DFE3DF", +"H= c #DEDDDC", +"I= c #E0DCDC", +"J= c #E2E0DD", +"K= c #EAEDE2", +"L= c #E8EDDF", +"M= c #E4EADB", +"N= c #DFE1DC", +"O= c #DCDBDD", +"P= c #DEDBE2", +"Q= c #CED0D6", +"R= c #A7B4B5", +"S= c #F9FEFA", +"T= c #F8FAF8", +"U= c #FAF8F4", +"V= c #F4F9FB", +"W= c #A2BACE", +"X= c #4A78A5", +"Y= c #477FB6", +"Z= c #5B8EBF", +"`= c #71A0C7", +" - c #87B4E1", +".- c #94BEF2", +"+- c #A1C6EF", +"@- c #B5D2DA", +"#- c #D7E8E0", +"$- c #F1F7F3", +"%- c #EFF1FB", +"&- c #E6EDF8", +"*- c #E0ECF0", +"=- c #E0E5E6", +"-- c #E3E2E4", +";- c #E0E0DF", +">- c #E4E7E0", +",- c #E0E6DC", +"'- c #E0E6DF", +")- c #D9DEDB", +"!- c #D8DCDF", +"~- c #D7D9E0", +"{- c #CDD1D8", +"]- c #ABB8B9", +"^- c #FAFFF7", +"/- c #FAFDF8", +"(- c #FBF9F3", +"_- c #F3F7F9", +":- c #9EB6CC", +"<- c #4B79A6", +"[- c #4881B8", +"}- c #5B8FC2", +"|- c #71A0CC", +"1- c #86B3E4", +"2- c #94BFF4", +"3- c #9AC0EB", +"4- c #ADCBD4", +"5- c #D3E6DE", +"6- c #E0E8E3", +"7- c #E7EBF4", +"8- c #EFF8FE", +"9- c #E7F6F9", +"0- c #E4ECED", +"a- c #E8E9EB", +"b- c #E2E4E3", +"c- c #DFE2DF", +"d- c #E4E7E3", +"e- c #E4E7E5", +"f- c #E0E3E2", +"g- c #D9DDDE", +"h- c #D5DADD", +"i- c #CFD3D7", +"j- c #C6CCD1", +"k- c #AEBBBC", +"l- c #F8FEF2", +"m- c #FAFDF4", +"n- c #FBF9F0", +"o- c #F4F9F8", +"p- c #9EB6CB", +"q- c #4978A5", +"r- c #4A82BA", +"s- c #5C8FC4", +"t- c #70A2D3", +"u- c #82B3EA", +"v- c #8EBCF7", +"w- c #9CC5F1", +"x- c #ADCAD2", +"y- c #E0F0E5", +"z- c #E3E7DC", +"A- c #E7E3E7", +"B- c #EAEAEF", +"C- c #EEF4F1", +"D- c #F2F5F1", +"E- c #EFF1EE", +"F- c #ECEDEB", +"G- c #E1E1E3", +"H- c #E1E0E4", +"I- c #E2E1E4", +"J- c #DEDDE0", +"K- c #E1E0E1", +"L- c #DADCD8", +"M- c #D0D2CF", +"N- c #C5CACC", +"O- c #B1BDBF", +"P- c #FAFFF1", +"Q- c #FBFDF3", +"R- c #F7F5E9", +"S- c #F4F7F4", +"T- c #A1B9CB", +"U- c #4776A0", +"V- c #4B83BA", +"W- c #5B90C4", +"X- c #6CA1D3", +"Y- c #84BAF3", +"Z- c #8ABBF7", +"`- c #99C4F0", +" ; c #AAC7CE", +".; c #E2F0E1", +"+; c #EDECDC", +"@; c #EADFDB", +"#; c #E4DCDA", +"$; c #E4E2D8", +"%; c #E7E7DE", +"&; c #E9E9E3", +"*; c #F0EFEC", +"=; c #ECE8EC", +"-; c #E5E2E7", +";; c #E5DFE6", +">; c #DEDADD", +",; c #E2DFDC", +"'; c #E0DED6", +"); c #D2D3C9", +"!; c #C5C9C7", +"~; c #AAB6B8", +"{; c #F9FEF8", +"]; c #FCFDFA", +"^; c #FCF8F1", +"/; c #F7F9F5", +"(; c #A4BCC8", +"_; c #467696", +":; c #4985B1", +"<; c #5A93BE", +"[; c #6AA3CA", +"}; c #86C0EB", +"|; c #8BBFF0", +"1; c #99C4ED", +"2; c #A8C5D1", +"3; c #DCE9E0", +"4; c #EEEFDC", +"5; c #EAE4D7", +"6; c #E1DDD8", +"7; c #DCDCDE", +"8; c #DBDBDA", +"9; c #DDDDDA", +"0; c #EBEBE9", +"a; c #EFECEE", +"b; c #E8E5E9", +"c; c #E6E3E7", +"d; c #DEDADC", +"e; c #DDDBD9", +"f; c #DDDCD7", +"g; c #D4D3CC", +"h; c #CACFC8", +"i; c #AFBBB4", +"j; c #F5F9F9", +"k; c #F4F4F8", +"l; c #F1E8E8", +"m; c #F5F3F2", +"n; c #A9BDC8", +"o; c #4B7B99", +"p; c #4C89B6", +"q; c #5A93C1", +"r; c #68A1C8", +"s; c #85BDE5", +"t; c #8EC2EF", +"u; c #92BCE8", +"v; c #A3C0D8", +"w; c #E1EEF1", +"x; c #F1F6E5", +"y; c #E9EBD8", +"z; c #E5E9E4", +"A; c #D8DEEA", +"B; c #D9D9D9", +"C; c #DEDEDE", +"D; c #E4E4E4", +"E; c #EBEBEB", +"F; c #E8E8E8", +"G; c #DCDCDC", +"H; c #DADADA", +"I; c #D6D6D6", +"J; c #CBCCCA", +"K; c #C1C5BD", +"L; c #ABB7AD", +"M; c #FBFCFC", +"N; c #F6EEEF", +"O; c #F0EEF2", +"P; c #A2B7CA", +"Q; c #46749F", +"R; c #4B84C2", +"S; c #5C90D0", +"T; c #6A9ED8", +"U; c #80B5ED", +"V; c #91C2FA", +"W; c #91BAEF", +"X; c #9BB7D6", +"Y; c #D2E0E6", +"Z; c #DEE2D6", +"`; c #E0E2CF", +" > c #E9EBE4", +".> c #DEE4EA", +"+> c #D7DADE", +"@> c #DADADB", +"#> c #DEDEDD", +"$> c #DDDDDD", +"%> c #E1E1E1", +"&> c #E6E6E6", +"*> c #D8D8D8", +"=> c #D1D1D1", +"-> c #C7C7C7", +";> c #BBBFBB", +">> c #A7B2AE", +",> c #F9FEF4", +"'> c #FBFDFB", +")> c #FBF5F6", +"!> c #F9F8FB", +"~> c #A8BBCF", +"{> c #4773A6", +"]> c #497FC7", +"^> c #5C8DD7", +"/> c #6E9EE3", +"(> c #7DAEEF", +"_> c #93BFFE", +":> c #9AC1F9", +"<> c #99B4D7", +"[> c #CDDCE7", +"}> c #DDE1DA", +"|> c #DCDCCD", +"1> c #DFE1D9", +"2> c #E7ECED", +"3> c #E0E2E4", +"4> c #DFDFDF", +"5> c #D5D5D5", +"6> c #CECECE", +"7> c #CACACB", +"8> c #C0C2C4", +"9> c #A8B2B4", +"0> c #F5FBEE", +"a> c #F2F6F0", +"b> c #F9F5F2", +"c> c #F8F8FA", +"d> c #A7B9CB", +"e> c #47719E", +"f> c #4C7EBD", +"g> c #608CCD", +"h> c #77A1DD", +"i> c #81ABE5", +"j> c #8EB7EF", +"k> c #9EC2F2", +"l> c #A0BAD7", +"m> c #D7E5F0", +"n> c #E1E5E1", +"o> c #DFDDD3", +"p> c #DBDCD6", +"q> c #E5E9EA", +"r> c #F0F1F3", +"s> c #E3E3E3", +"t> c #CFCFCF", +"u> c #C7C8C9", +"v> c #BFC1C5", +"w> c #A6AFB2", +"x> c #F6FCF3", +"y> c #F5F0E9", +"z> c #F4F2ED", +"A> c #A8BAC2", +"B> c #49708B", +"C> c #4E7BA4", +"D> c #5F86B0", +"E> c #789BC1", +"F> c #88ADD1", +"G> c #8DB2D3", +"H> c #98BBD6", +"I> c #A9C1D1", +"J> c #DAE6EB", +"K> c #E7EAE7", +"L> c #EBE9E4", +"M> c #E2E2E0", +"N> c #DEE1E4", +"O> c #E9EAEC", +"P> c #C7C7C9", +"Q> c #BEC0C4", +"R> c #A4AEAF", +"S> c #F6FEF9", +"T> c #F7FAF8", +"U> c #F6F2EA", +"V> c #ECE8DD", +"W> c #B4C4C0", +"X> c #6F929A", +"Y> c #739BAD", +"Z> c #85A4B4", +"`> c #92ACBA", +" , c #A2BECA", +"., c #A4C2CC", +"+, c #A8C5CB", +"@, c #BBD1D1", +"#, c #DCE7E6", +"$, c #E8E8E6", +"%, c #E9E6E6", +"&, c #E5E3E8", +"*, c #DEE1E8", +"=, c #DFDFE3", +"-, c #E2E2E2", +";, c #D2D2D2", +">, c #CCCCCD", +",, c #C2C4C8", +"', c #A4AEAE", +"), c #F7FEFE", +"!, c #FAFDFD", +"~, c #FEFAF4", +"{, c #FBF7E8", +"], c #E4EDE1", +"^, c #CFE8E5", +"/, c #CAE5E7", +"(, c #D9EAE8", +"_, c #E3EEEB", +":, c #E0EDE9", +"<, c #D4E7DF", +"[, c #CADFD4", +"}, c #D4E3D9", +"|, c #E0E7E2", +"1, c #D6D5D4", +"2, c #D7D2D8", +"3, c #DEDDE4", +"4, c #D9DDE4", +"5, c #D0D3D5", +"6, c #DEDFDF", +"7, c #DBDBDB", +"8, c #D1D1D2", +"9, c #C1C4CA", +"0, c #A3AEAE", +"a, c #F7FEFF", +"b, c #F6F9FD", +"c, c #FBF2F1", +"d, c #F9F4E9", +"e, c #E4E6DD", +"f, c #D2E0E0", +"g, c #C5D4D6", +"h, c #CBCECC", +"i, c #D7D5D4", +"j, c #D9D9D7", +"k, c #D8DFD7", +"l, c #D0DBD0", +"m, c #D3DCD2", +"n, c #DADCD9", +"o, c #D3D0D3", +"p, c #D2CDD4", +"q, c #D4D4D9", +"r, c #D3D8DA", +"s, c #D5D8D9", +"t, c #D5D6D6", +"u, c #D3D3D3", +"v, c #D7D7D7", +"w, c #CFD0D2", +"x, c #BDC0C9", +"y, c #A4AEB4", +"z, c #F7FDFF", +"A, c #F3F5FC", +"B, c #F6EAED", +"C, c #F9EDE9", +"D, c #E7E2E1", +"E, c #D5DAE3", +"F, c #D0D3DF", +"G, c #CFC6CE", +"H, c #D2C2CC", +"I, c #D1C6CD", +"J, c #DAD7D6", +"K, c #D4D7D0", +"L, c #D2D5D0", +"M, c #D6D5D6", +"N, c #DAD4DA", +"O, c #D4CFD6", +"P, c #CDCED1", +"Q, c #CAD1CF", +"R, c #CACECC", +"S, c #D5D4D5", +"T, c #D7D6D7", +"U, c #D4D4D4", +"V, c #D3D4D3", +"W, c #CFCED1", +"X, c #C1C3D0", +"Y, c #A9B1BD", +"Z, c #F9FBFA", +"`, c #FAF1FB", +" ' c #DED3DA", +".' c #CECACD", +"+' c #CFD4D8", +"@' c #D7DAE6", +"#' c #D2CBDD", +"$' c #CFBED0", +"%' c #C7B5C2", +"&' c #C8BEC5", +"*' c #C6C2C3", +"=' c #CAC8C8", +"-' c #C8C6CA", +";' c #CCC8CE", +">' c #C9C6CC", +",' c #C4C3C7", +"'' c #C2C4C4", +")' c #C0BFBF", +"!' c #BFBCBC", +"~' c #C7C5C5", +"{' c #D2CFD0", +"]' c #CDCACA", +"^' c #CBC8C8", +"/' c #C7C4C4", +"(' c #CFCBCE", +"_' c #CEC4D3", +":' c #B3B4BF", +"<' c #FAF9F0", +"[' c #F1EBF2", +"}' c #DCD6E7", +"|' c #BBB8C3", +"1' c #B6B9B6", +"2' c #C0C7C0", +"3' c #C0C7CB", +"4' c #BABDCD", +"5' c #C2BCC9", +"6' c #C1B4BB", +"7' c #BBB2B8", +"8' c #BAB6B9", +"9' c #B9B9BB", +"0' c #B4B5B8", +"a' c #B5B6BA", +"b' c #B1B1B6", +"c' c #B3B4B7", +"d' c #B7B6B7", +"e' c #B5B5B3", +"f' c #B6B5B4", +"g' c #BCBBBA", +"h' c #C0BFBD", +"i' c #C2C1C0", +"j' c #BFBEBC", +"k' c #BCBCBA", +"l' c #BDBDBB", +"m' c #C1BDBE", +"n' c #CDBEC6", +"o' c #BDBABF", +"p' c #F3F1DC", +"q' c #C2BFBB", +"r' c #A8A6AA", +"s' c #A0A09F", +"t' c #9FA49A", +"u' c #A3AC9F", +"v' c #97A09C", +"w' c #91989C", +"x' c #989A9E", +"y' c #9C9B9D", +"z' c #9C9E9F", +"A' c #989F9F", +"B' c #909B99", +"C' c #899593", +"D' c #899796", +"E' c #8D9A9A", +"F' c #8E999A", +"G' c #939D9E", +"H' c #929B99", +"I' c #939D9A", +"J' c #919A98", +"K' c #97A19D", +"L' c #9BA5A2", +"M' c #9AA3A0", +"N' c #9AA4A0", +"O' c #9BA1A0", +"P' c #A8A4A8", +"Q' c #A7AAAD", +". . . . . . + + + + + + . . . . . . @ # $ % & * = - ; > , ' ) ' ' ! ~ { ] ^ / / ( _ : < [ } | 1 ", +". . . . . . + + + + + + . . . . . . 2 3 4 5 6 7 8 9 0 a b c d e f g h i j k l m n o p q r s t u ", +". . . . . . + + + + + + . . . . . . v w x y z A B C a D b c E f F G H I J K L M N O P Q R S T U ", +". . . . . . + + + + + + . . . . . . V W X y Y A Z ` ...+.@.y #.i $.%.&.*.=.-.;.;.>.,.'.).!.~.{.", +". . . . . . + + + + + + . . . . . . ].^./.(.x _.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.", +". . . . . . + + + + + + . . . . . . j.k.l.m.L n.o.p.q.r...L H s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.", +"+ + + + + + . . . . . . + + + + + + J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+", +"+ + + + + + . . . . . . + + + + + + >+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+9+0+a+b+c+", +"+ + + + + + . . . . . . + + + + + + d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+", +"+ + + + + + . . . . . . + + + + + + H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@", +"+ + + + + + . . . . . . + + + + + + -@;@>@,@'@)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@", +"+ + + + + + . . . . . . + + + + + + b@c@d@e@f@g@h@i@j@k@l@m@n@o@p@q@r@s@t@u@v@w@x@y@z@A@B@C@D@E@", +". . . . . . + + + + + + . . . . . . F@G@H@I@J@K@L@M@N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#", +". . . . . . + + + + + + . . . . . . *#=#-#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#4#5#6#7#8#9#", +". . . . . . + + + + + + . . . . . . 0#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z#A#B#C#", +". . . . . . + + + + + + . . . . . . D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`# $.$+$@$#$$$", +". . . . . . + + + + + + . . . . . . %$&$*$=$-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$", +". . . . . . + + + + + + . . . . . . 8$9$0$a$b$c$d$e$f$g$h$i$j$k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$", +"+ + + + + + . . . . . . + + + + + + B$C$D$E$F$G$H$I$J$K$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%", +"+ + + + + + . . . . . . + + + + + + #%$%%%&%*%=%-%;%>%,%'%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3%4%5%", +"+ + + + + + . . . . . . + + + + + + 6%7%8%9%0%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%p%r%s%t%u%v%w%x%", +"+ + + + + + . . . . . . + + + + + + y%z%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &", +"+ + + + + + . . . . . . + + + + + + .&+&@&#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&1&2&", +"+ + + + + + . . . . . . + + + + + + 3&4&5&6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&m&n&o&p&q&r&s&t&u&v&", +". . . . . . + + + + + + . . . . . . w&x&y&z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&W&X&Y&Z&", +". . . . . . + + + + + + . . . . . . `& *.*+*@*#*$*%*&***=*-*;*>*,*'*)*!*~*{*]*^*/*(*_*:*<*[*}*|*", +". . . . . . + + + + + + . . . . . . 1*2*3*4*5*6*7*8*9*0*a*b*c*d*e*f*g*h*i*j*k*l*m*n*o*p*q*r*s*t*", +". . . . . . + + + + + + . . . . . . u*v*w*x*y*z*A*B*C*D*E*F*G*H*I*J*K*L*M*N*O*P*Q*R*S*T*U*V*W*X*", +". . . . . . + + + + + + . . . . . . Y*Z*`* =.=z*+=@=#=$=%=&=*===-=;=>=,='=)=!=~={=]=^=/=(=_=:=<=", +". . . . . . + + + + + + . . . . . . [=j }=|=1=2=3=4=5=6=7=8=9=0=a=b=c=d=e=f=g=h=i=j=k=l=m=n=o=p=", +"+ + + + + + . . . . . . + + + + + + q=r=s=7%t=u=v=w=x=y=z=A=B=C=D=E=F=G=H=I=J=K=L=M=t$N=O=P=Q=R=", +"+ + + + + + . . . . . . + + + + + + S=T=U=V=W=X=Y=Z=`= -.-+-@-#-$-%-&-*-=---;->-h=,-'-)-!-~-{-]-", +"+ + + + + + . . . . . . + + + + + + ^-/-(-_-:-<-[-}-|-1-2-3-4-5-6-7-8-9-0-a-b-c-d-e-f-g-h-i-j-k-", +"+ + + + + + . . . . . . + + + + + + l-m-n-o-p-q-r-s-t-u-v-w-x-y-z-A-B-C-D-E-F-G-H-I-J-K-L-M-N-O-", +"+ + + + + + . . . . . . + + + + + + P-Q-R-S-T-U-V-W-X-Y-Z-`- ;.;+;@;#;$;%;&;*;=;-;;;>;,;';);!;~;", +"+ + + + + + . . . . . . + + + + + + {;];^;/;(;_;:;<;[;};|;1;2;3;4;5;6;7;8;9;0;a;b;c;d;e;f;g;h;i;", +". . . . . . + + + + + + . . . . . . j;k;l;m;n;o;p;q;r;s;t;u;v;w;x;y;z;A;~-B;C;D;E;F;G;H;I;J;K;L;", +". . . . . . + + + + + + . . . . . . j.M;N;O;P;Q;R;S;T;U;V;W;X;Y;Z;`; >.>+>@>#>$>%>&>$>*>=>->;>>>", +". . . . . . + + + + + + . . . . . . ,>'>)>!>~>{>]>^>/>(>_>:><>[>}>|>1>2>3>G;4>u$%>&>$>5>6>7>8>9>", +". . . . . . + + + + + + . . . . . . 0>a>b>c>d>e>f>g>h>i>j>k>l>m>n>o>p>q>r>D;$>4>%>s>$>B;t>u>v>w>", +". . . . . . + + + + + + . . . . . . x>$.y>z>A>B>C>D>E>F>G>H>I>J>K>L>M>N>O>D;C;%>s>s>4>H;t>P>Q>R>", +". . . . . . + + + + + + . . . . . . S>T>U>V>W>X>Y>Z>`> ,.,+,@,#,$,%,&,*,=,D;G;-,s>s>-,G;;,>,,,',", +"+ + + + + + . . . . . . + + + + + + ),!,~,{,],^,/,(,_,:,<,[,},|,1,2,3,4,5,6,%>H;4>4>B;7,7,8,9,0,", +"+ + + + + + . . . . . . + + + + + + a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,v,H;*>H;7,w,x,y,", +"+ + + + + + . . . . . . + + + + + + z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,5>t>S,I;T,U,V,5>W,X,Y,", +"+ + + + + + . . . . . . + + + + + + Z,e `, '.'+'@'#'$'%'&'*'='-';'>',''')'!'~'{']'^'~'/'^'('_':'", +"+ + + + + + . . . . . . + + + + + + <'['}'|'1'2'3'4'5'6'7'8'9'0'a'a'b'c'd'e'f'g'h'i'j'k'l'm'n'o'", +"+ + + + + + . . . . . . + + + + + + p'q'r's't'u'v'w'x'y'z'A'B'C'D'E'F'G'H'I'I'J'K'L'M'M'N'O'P'Q'"}; --- flightgear-0.9.10.orig/debian/flightgear.desktop +++ flightgear-0.9.10/debian/flightgear.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Encoding=UTF-8 +Type=Application +Version=1.4 +Name=FlightGear +Exec=fgfs +Terminal=false +Categories=Game;Simulation; +Comment=A flight simulator +Comment[pt]=Simulação de Vôo +Icon=flightgear --- flightgear-0.9.10.orig/debian/rules +++ flightgear-0.9.10/debian/rules @@ -0,0 +1,103 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=3 + +CFLAGS=-O2 $(DEBUGFLAGS) +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +CFLAGS+=-g +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \ + --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games \ + --with-simgear=/usr --with-multiplayer --with-threads + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # try standard build options first; if that fails, + # clean up and then try again without optimization + $(MAKE) CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" || \ + $(MAKE) clean && $(MAKE) CFLAGS="" CXXFLAGS="" + #/usr/bin/docbook-to-man debian/flightgear.sgml > flightgear.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + -$(MAKE) -i clean + -$(MAKE) -i distclean + # distclean seems to not always be thorough + -find -name Makefile -type f -exec rm -f {} \; + -find -name .deps -type d -exec rm -rf {} \; + + dh_clean + + # update from autotools-dev + cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub . + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install prefix=$(CURDIR)/debian/flightgear/usr + + mkdir -p debian/flightgear/usr/share/applications + install -m 0644 debian/flightgear.desktop $(CURDIR)debian/flightgear/usr/share/applications + install -m 0644 debian/flightgear.png $(CURDIR)/debian/flightgear/usr/share/pixmaps/ + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testversion 2 + dh_testdir + dh_testroot +# dh_installdebconf + dh_installdocs + cp docs-mini/* debian/flightgear/usr/share/doc/flightgear || true + cp utils/TerraSync/README.txt debian/flightgear/usr/share/doc/flightgear/README.TerraSync + dh_installexamples + dh_installmenu +# dh_installemacsen +# dh_installpam +# dh_installinit + dh_installcron + dh_installmanpages + dh_installinfo +# dh_undocumented + dh_installchangelogs ChangeLog + dh_link + dh_desktop + dh_strip + dh_compress + dh_fixperms + # You may want to make some executables suid here. +# dh_suidregister +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- flightgear-0.9.10.orig/debian/control +++ flightgear-0.9.10/debian/control @@ -0,0 +1,20 @@ +Source: flightgear +Section: games +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Ove Kaaven +Build-Depends: debhelper (>> 3.0.0), + libx11-dev, libxext-dev, libxi-dev, libice-dev, libsm-dev, libxt-dev, libxmu-dev, + libgl1-mesa-dev | xlibmesa-gl-dev | libgl-dev, + libglu1-mesa-dev | libglu1-xorg-dev | xlibmesa-glu-dev | libglu-dev, + libglut3-dev, zlib1g-dev, libjpeg62-dev | libjpeg-dev, plib1.8.4-dev, + libopenal-dev, libalut-dev, autotools-dev, simgear-dev (>= 0.3.10) +Standards-Version: 3.5.5 + +Package: flightgear +Architecture: any +Depends: ${shlibs:Depends}, fgfs-base (>= 0.9.10) +Description: Flight Gear Flight Simulator + Flight Gear is a free and highly sophisticated flight simulator. + . + This package contains the runtime binaries. --- flightgear-0.9.10.orig/debian/README.Debian +++ flightgear-0.9.10/debian/README.Debian @@ -0,0 +1,9 @@ +Flight Gear for Debian +---------------------- + +Start Flight Gear with fgfs. + +Additional scenery is available at http://www.flightgear.org/. +They should be unpacked into /usr/share/games/FlightGear/Scenery. + + -- Ove Kaaven --- flightgear-0.9.10.orig/debian/changelog +++ flightgear-0.9.10/debian/changelog @@ -0,0 +1,266 @@ +flightgear (0.9.10-2ubuntu2) gutsy; urgency=low + + * Addition of an icon to use the Application Menu debian/flightgear.xpm + * Modification of debian/flightgear.desktop to use the icon + + -- Christophe Sauthier Wed, 22 Aug 2007 17:03:56 +0200 + +flightgear (0.9.10-2ubuntu1) feisty; urgency=low + + * Added debian/flightgear.desktop. + + -- Lukas Fittl Sun, 4 Feb 2007 17:27:14 +0100 + +flightgear (0.9.10-2) unstable; urgency=low + + * Updated the build dependencies for xorg 7.0. Apparently the + amd64 autobuilder doesn't use Provides. + + -- Ove Kaaven Wed, 17 May 2006 17:12:09 -0400 + +flightgear (0.9.10-1) unstable; urgency=low + + * New upstream release. + + -- Ove Kaaven Fri, 5 May 2006 20:02:30 -0400 + +flightgear (0.9.9-2) unstable; urgency=low + + * Apply patch from Martin Michlmayr and upstream CVS for + g++ 4.1 build failure. Closes: #356598. + (Martin also reported a link failure, but I see no reason + that should happen in a clean build, and upstream doesn't + seem to have had that kind of issue either, so he probably + just got a misbuild from his experimentations.) + * Build-Depend on libalut-dev, and simgear 0.3.9-3. + + -- Ove Kaaven Sun, 19 Mar 2006 06:47:39 -0500 + +flightgear (0.9.9-1) unstable; urgency=low + + * New upstream release. Closes: #341727. + Includes completely rewritten 3D clouds. Closes: #330861. + (Other stuff: a working aircraft carrier, new aircraft, + high-G blackouts, better weather, improved multiplayer, + and much more.) + + -- Ove Kaaven Mon, 2 Jan 2006 15:49:28 -0500 + +flightgear (0.9.8-3) unstable; urgency=low + + * Built with gcc-4.0-compiled simgear. + + -- Ove Kaaven Mon, 25 Jul 2005 03:30:24 -0400 + +flightgear (0.9.8-2) unstable; urgency=low + + * Applied patch for gcc-4.0/amd64 compilation. Closes: #293392. + + -- Ove Kaaven Fri, 15 Jul 2005 19:16:35 -0400 + +flightgear (0.9.8-1) unstable; urgency=low + + * New upstream release. Closes: #283575. + * Changed Build-Depends to depend on plib1.8.4-dev. + + -- Ove Kaaven Sun, 27 Mar 2005 21:56:19 -0500 + +flightgear (0.9.6-1) unstable; urgency=low + + * New upstream release. + + -- Ove Kaaven Sun, 30 Jan 2005 17:49:39 -0500 + +flightgear (0.9.5-1) unstable; urgency=low + + * New upstream release. Closes: #264625. + * Upstream seem to have switched to OpenAL. + Added build-dependency on libopenal-dev. + + -- Ove Kaaven Mon, 16 Aug 2004 19:57:03 +0200 + +flightgear (0.9.4-1) unstable; urgency=low + + * New upstream release. + Should (hopefully) fix current GCC issues. + Closes: #243226. + * Changed Build-Depends for new xlibs package layout. + * Changed Build-Depends to depend on plib1.8.3-dev. + Closes: #242336. + * Removed MetaKit build-dependency, flightgear apparently + stopped using it in 0.9.3. + + -- Ove Kaaven Wed, 7 Apr 2004 10:48:30 +0200 + +flightgear (0.9.3-1) unstable; urgency=low + + * New upstream release. Yay, helicopters! + * Install TerraSync README file into /usr/share/doc/flightgear. + Closes: #201256. + + -- Ove Kaaven Sun, 9 Nov 2003 23:07:41 +0100 + +flightgear (0.9.2-1) unstable; urgency=low + + * New upstream release. + + -- Ove Kaaven Fri, 6 Jun 2003 02:06:36 +0200 + +flightgear (0.9.1-2) unstable; urgency=low + + * Rebuilt with metakit 2.4.9.2. Closes: #179391. + + -- Ove Kaaven Thu, 17 Apr 2003 12:18:36 +0200 + +flightgear (0.9.1-1) unstable; urgency=low + + * New upstream release. + + -- Ove Kaaven Wed, 11 Dec 2002 14:50:48 +0100 + +flightgear (0.8.0-1) unstable; urgency=low + + * New upstream release. + * This release compiles against plib 1.6.0. Closes: #160191. + + -- Ove Kaaven Mon, 9 Sep 2002 19:47:56 +0200 + +flightgear (0.7.10-2) unstable; urgency=low + + * Forgot to update the version of that simgear build-dep + again, needs 0.0.18. Closes: #146788. + + -- Ove Kaaven Mon, 13 May 2002 05:32:34 +0200 + +flightgear (0.7.10-1) unstable; urgency=low + + * New upstream release + + -- Ove Kaaven Sat, 27 Apr 2002 19:45:50 +0200 + +flightgear (0.7.9-3) unstable; urgency=low + + * Rebuilt with metakit 2.4.3. + + -- Ove Kaaven Wed, 27 Mar 2002 21:50:15 +0100 + +flightgear (0.7.9-2) unstable; urgency=low + + * Made debian/rules try hard to get this compiled; if compiling + with optimization fails, then it'll try again without. + + -- Ove Kaaven Thu, 7 Mar 2002 13:46:58 +0100 + +flightgear (0.7.9-1) unstable; urgency=low + + * New upstream release. + * Yes, I'm subscribed to flightgear-announce, so I knew about 0.7.9 + already, but packaging new releases of this stuff takes some time. + Closes: #134302. + * Playing the intro music doesn't seem to hang fgfs in this release, + and it's no longer played by default anyway. Closes: #104168. + * Man pages seem to be available now. Closes: #87556, #87557, #87560, #87561. + * Some binaries without manpages are no longer installed. + (This includes runfgfs.) Closes: #87558, #87559, #87562. + + -- Ove Kaaven Sun, 17 Feb 2002 12:35:41 +0100 + +flightgear (0.7.8-1) unstable; urgency=low + + * New upstream release. + * Build-depend on plib >= 1.4.1. + + -- Ove Kaaven Sat, 14 Jul 2001 21:55:05 +0200 + +flightgear (0.7.7-3) unstable; urgency=low + + * Grr... if the plib maintainer keeps insisting on keeping + an "=" dependency on stable releases so I have to keep rebuilding + this stuff all the time, I'll soon be in the mood to hijack plib. + Well, this rebuild closes: #102769. + + -- Ove Kaaven Tue, 3 Jul 2001 03:41:31 +0200 + +flightgear (0.7.7-2) unstable; urgency=low + + * I realized I ought to do a versioned simgear-dev build-dep a few + hours after the last upload, but this stuff takes a while to + rebuild and I thought the autobuilders might be able to get it + right this one time anyway, but they don't, it seems, so I + guess I have to. It build-depends on simgear-dev >= 0.0.15, + and plib-dev >= 1.4.0 while I'm at it. Closes: #102364. + + -- Ove Kaaven Tue, 26 Jun 2001 19:56:30 +0200 + +flightgear (0.7.7-1) unstable; urgency=low + + * New upstream release. + * This release has support for multithreaded tile loading. + Since Debian can do multithreading, I added --with-threads + to the configure command. + * Build-depend on autotools-dev. + Update config.guess and config.sub from it. + * Build-depend on debhelper v3. + * Standards-Version updated to 3.5.5. + + -- Ove Kaaven Fri, 22 Jun 2001 17:27:20 +0200 + +flightgear (0.7.6-6) unstable; urgency=low + + * I can't believe I put the wrong bug number in my previos + changelog entry (I managed to try to close one of my + already-closed bugs)... Oh well, for the "install binaries + into /usr/games" change, I meant: Closes: #90569. So there! + + -- Ove Kaaven Mon, 2 Apr 2001 02:18:47 +0200 + +flightgear (0.7.6-5) unstable; urgency=low + + * Install binaries into /usr/games. Closes: #87269. + * Data directory moved from /usr/share/FlightGear to + /usr/share/games/FlightGear. + Depends on fgfs-base (>= 0.7.6-4) to do this move. + * Handle DEB_BUILD_OPTIONS. Upgrade Standars-Version to 3.5.2. + (it's a cleaner way to "build without -g on sparc" anyway) + + -- Ove Kaaven Thu, 29 Mar 2001 21:26:36 +0200 + +flightgear (0.7.6-4) unstable; urgency=low + + * Build without -g, to work around a g++ bug on sparc. + + -- Ove Kaaven Sun, 18 Mar 2001 17:12:08 +0100 + +flightgear (0.7.6-3) unstable; urgency=low + + * The plib maintainer keeps on making the lives of + plib users miserable with his shlibs file. Despite being + completely equivalent with the previous build, the new plib + package still has incompatible shlibs, forcing me to recompile. + Closes: #87269. + * Added --with-network-olk (networking support) to configure options + since I had to recompile anyway, so not completely for naught. + + -- Ove Kaaven Sat, 3 Mar 2001 19:23:00 +0100 + +flightgear (0.7.6-2) unstable; urgency=low + + * For some reason the plib maintainer use shlibs depending + on the exact debian revision, so everything using plib has + to be rebuilt whenever he uploads a bugfix or something. + * Well, now built with debhelper v3, at least. + + -- Ove Kaaven Wed, 21 Feb 2001 15:58:38 +0100 + +flightgear (0.7.6-1) unstable; urgency=low + + * Initial Release. Closes: #85060. + * Patched for FHS conformance. + * Added missing libs to a few link command lines. + + -- Ove Kaaven Tue, 13 Feb 2001 16:05:02 +0100 + +Local variables: +mode: debian-changelog +add-log-mailing-address "ovek@arcticnet.no" +End: --- flightgear-0.9.10.orig/debian/copyright +++ flightgear-0.9.10/debian/copyright @@ -0,0 +1,18 @@ +This package was debianized by Ove Kaaven on +Tue, 6 Feb 2001 15:46:57 +0100. + +It was downloaded from ftp://ftp.flightgear.org/pub/fgfs/Source/ + +Upstream Authors: Curtis L. Olson +and the rest of the FlightGear team (see the Thanks file). + +Copyright (C) 1999-2000 Curtis L. Olson + +You are free to distribute this software under the terms of +the GNU General Public License. +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + +The icon flightgear.xpm is (C), Josh Babcock, 2005 and +is licensed under the GPL, see above. + --- flightgear-0.9.10.orig/debian/docs +++ flightgear-0.9.10/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +NEWS +README +Thanks --- flightgear-0.9.10.orig/debian/menu +++ flightgear-0.9.10/debian/menu @@ -0,0 +1,2 @@ +?package(flightgear):needs=X11 section=Games/Simulation\ + title="Flight Gear" command="/usr/games/fgfs" --- flightgear-0.9.10.orig/debian/watch +++ flightgear-0.9.10/debian/watch @@ -0,0 +1,3 @@ +# Site Directory Pattern Version Script +#ftp.flightgear.org /pub/fgfs/Source FlightGear-(.*)\.tar\.gz debian uupdate +ftp.ihg.uni-duisburg.de /Mirrors/ftp.flightgear.org/Source FlightGear-(.*)\.tar\.gz debian uupdate