--- gtkboard-0.11pre0.orig/config.sub +++ gtkboard-0.11pre0/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2001-09-07' +timestamp='2008-01-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,15 +22,17 @@ # # 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 . + +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -69,8 +72,8 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -82,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. @@ -98,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -117,7 +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* | storm-chaos* | os2-emx* | windows32-*) + 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/'` ;; @@ -143,7 +148,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -168,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/'` @@ -184,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/'` @@ -226,32 +239,53 @@ 1750a | 580 \ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ | c4x | clipper \ - | d10v | d30v | dsp16xx \ - | fr30 \ + | d10v | d30v | dlx | dsp16xx \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | m32r | m68000 | m68k | m88k | mcore \ - | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el | mips64vr4300 \ - | mips64vr4300el | mips64vr5000 | mips64vr5000el \ - | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \ - | mipsisa32 \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64vr | mips64vrel \ + | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | s390 | s390x \ - | sh | sh[34] | sh[34]eb | shbe | shle \ - | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | stormy16 | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ + | v850 | v850e \ | we32k \ - | x86 | xscale \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -262,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 @@ -278,41 +315,68 @@ 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alphapca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armv*-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ - | clipper-* | cray2-* | cydra-* \ - | d10v-* | d30v-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | m32r-* \ - | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ - | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \ - | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | 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-* \ - | s390-* | s390x-* \ - | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \ - | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ - | v850-* | vax-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ + | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-*) ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -329,6 +393,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -343,6 +410,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -374,6 +447,18 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -394,30 +479,45 @@ basic_machine=c38-convex os=-bsd ;; - cray | ymp) - basic_machine=ymp-cray + cray | j90) + basic_machine=j90-cray os=-unicos ;; - cray2) - basic_machine=cray2-cray - os=-unicos + craynv) + basic_machine=craynv-cray + os=-unicosmp ;; - [cjt]90) - basic_machine=${basic_machine}-cray - os=-unicos + cr16) + basic_machine=cr16-unknown + os=-elf ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -426,6 +526,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -576,6 +680,14 @@ basic_machine=m68k-isi os=-sysv ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; m88k-omron*) basic_machine=m88k-omron ;; @@ -591,6 +703,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -598,32 +714,27 @@ basic_machine=m68k-atari os=-mint ;; - mipsel*-linux*) - basic_machine=mipsel-unknown - os=-linux-gnu - ;; - mips*-linux*) - basic_machine=mips-unknown - os=-linux-gnu - ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; - mmix*) - basic_machine=mmix-knuth - os=-mmixware - ;; monitor) basic_machine=m68k-rom68k os=-coff ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; msdos) basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -699,6 +810,13 @@ basic_machine=hppa1.1-oki os=-proelf ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -715,55 +833,75 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | k6 | nexgen) + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; - pentiumpro | p6 | 6x86 | athlon) + pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-*) + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -774,6 +912,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -784,10 +926,30 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; sa29200) basic_machine=a29k-amd os=-udi ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -795,7 +957,13 @@ basic_machine=sh-hitachi os=-hms ;; - sparclite-wrs) + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; + sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -862,22 +1030,46 @@ os=-dynix ;; t3e) - basic_machine=t3e-cray + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray os=-unicos ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; + tile*) + basic_machine=tile-unknown + os=-linux-gnu + ;; tx39) basic_machine=mipstx39-unknown ;; tx39el) basic_machine=mipstx39el-unknown ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -899,8 +1091,8 @@ os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -921,17 +1113,17 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xmp) - basic_machine=xmp-cray - os=-unicos + xbox) + basic_machine=i686-pc + os=-mingw32 ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -952,16 +1144,12 @@ op60c) basic_machine=hppa1.1-oki ;; - mips) - if [ x$os = x-linux-gnu ]; then - basic_machine=mips-unknown - else - basic_machine=mips-mips - fi - ;; romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -978,13 +1166,13 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -999,10 +1187,6 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1058,17 +1242,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -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* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -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*) + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1080,16 +1270,21 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + 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*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1102,6 +1297,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1120,14 +1318,23 @@ -acis*) os=-aos ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; + -nova*) + os=-rtmk-nova + ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1139,6 +1346,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1166,8 +1376,17 @@ -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe ;; -none) ;; @@ -1191,6 +1410,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1200,10 +1425,14 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1224,12 +1453,18 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; mips*-*) os=-elf ;; + or32-*) + os=-coff + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1239,9 +1474,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1293,19 +1534,19 @@ *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) @@ -1374,10 +1615,16 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; - -vxsim* | -vxworks*) + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) @@ -1401,7 +1648,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- gtkboard-0.11pre0.orig/.gitignore +++ gtkboard-0.11pre0/.gitignore @@ -0,0 +1,17 @@ +*.o +*~ +/Makefile +/config.h +/config.log +/config.status +/debian/*.debhelper +/debian/*.log +/debian/*.substvars +/debian/files +/debian/gtkboard/ +/doc/Makefile +/pixmaps/Makefile +/sounds/Makefile +/src/Makefile +/src/gtkboard +/stamp-h1 --- gtkboard-0.11pre0.orig/config.guess +++ gtkboard-0.11pre0/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 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2001-09-04' +timestamp='2008-01-23' # 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,15 +18,18 @@ # # 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. -# Written by Per Bothner . -# Please send patches to . + +# Originally written by Per Bothner . +# Please send patches to . Submit a context +# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -52,8 +56,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 -Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -65,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. @@ -87,30 +91,42 @@ exit 1 fi +trap 'exit 1' 1 2 15 -dummy=dummy-$$ -trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. Note that the use of a +# compiler to aid in system detection is discouraged as it requires +# temporary files to be created and, as you can see below, it is a +# headache to deal with in a portable fashion. -# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int dummy(){}" > $dummy.c ; - for c in cc gcc c89 ; do - ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; - if test $? = 0 ; then +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +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 "$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 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) 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) @@ -127,29 +143,31 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # Netbsd (nbsd) targets should (where applicable) match one or + # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # Determine the machine/vendor (is the vendor relevant). - case "${UNAME_MACHINE}" in - amiga) machine=m68k-unknown ;; - arm32) machine=arm-unknown ;; - atari*) machine=m68k-atari ;; - sun3*) machine=m68k-sun ;; - mac68k) machine=m68k-apple ;; - macppc) machine=powerpc-apple ;; - hp3[0-9][05]) machine=m68k-hp ;; - ibmrt|romp-ibm) machine=romp-ibm ;; - *) machine=${UNAME_MACHINE}-unknown ;; + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE}" in - i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) + case "${UNAME_MACHINE_ARCH}" in + arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -166,120 +184,128 @@ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; + exit ;; + *:OpenBSD:*:*) + 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 ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - eval $set_cc_for_build - $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - if test "$?" = 0 ; then - case `./$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - esac - fi - rm -f $dummy.s $dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + 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;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - arc64:OpenBSD:*:*) - echo mips64el-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hkmips:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + 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 @@ -287,25 +313,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 ;; + 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 ;; + 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 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen: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*) @@ -314,12 +347,12 @@ 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=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -329,16 +362,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - sparc*:NetBSD:*) - echo `uname -p`-unknown-netbsd${UNAME_RELEASE} - exit 0 ;; - atari*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + 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 @@ -349,49 +376,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 ;; - sun3*:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + 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 @@ -415,27 +433,33 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $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 ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + 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` @@ -451,29 +475,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` @@ -481,7 +505,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 @@ -496,17 +520,20 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - 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 ;; - *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` + exit ;; + *:AIX:*:[456]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -518,38 +545,36 @@ 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 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - case "${HPUX_REV}" in - 11.[0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -558,13 +583,13 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi ;; - esac - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -597,17 +622,37 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy - fi ;; + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + 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 + HP_ARCH="hppa64" + 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 @@ -635,158 +680,247 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy + $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 ;; - hppa*:OpenBSD:*:*) - echo hppa-unknown-openbsd - 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 ;; - CRAY*X-MP:*:*:*) - echo xmp-cray-unicos - 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 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${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 ;; - CRAY-2:*:*:*) - echo cray2-cray-unicos - exit 0 ;; + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + 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 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - 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 ;; 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 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd`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 ;; - i*:MINGW*:*) + exit ;; + *: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 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + IA64) + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; 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 i386-pc-interix - exit 0 ;; + echo i586-pc-interix + 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 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) + eval $set_cc_for_build + if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_EABI__ + then + echo ${UNAME_MACHINE}-unknown-linux-gnu + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux - exit 0 ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) - case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in - big) echo mips-unknown-linux-gnu && exit 0 ;; - little) echo mipsel-unknown-linux-gnu && exit 0 ;; - esac + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + 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 ;; @@ -800,7 +934,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 @@ -808,27 +942,37 @@ 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 ;; 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 ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + 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 # problems with other programs or directories called `ld' in the path. - ld_supported_targets=`cd /; ld --help 2>&1 \ + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -840,52 +984,58 @@ ;; 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 - cat >$dummy.c < -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif -#ifdef __ELF__ -# ifdef __GLIBC__ -# if __GLIBC__ >= 2 - printf ("%s-pc-linux-gnu\n", argv[1]); -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -# else - printf ("%s-pc-linux-gnulibc1\n", argv[1]); -# endif -#else - printf ("%s-pc-linux-gnuaout\n", argv[1]); -#endif - return 0; -} + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 - rm -f $dummy.c $dummy - 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... @@ -893,7 +1043,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 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + 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 @@ -901,99 +1071,100 @@ 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 >/dev/null ; then - UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` - (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit 0 ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit 0 ;; + exit ;; paragon:*:*:*) echo i860-intel-osf1 - exit 0 ;; + exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/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 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + 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 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - 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` @@ -1001,82 +1172,107 @@ 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 ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo `uname -p`-${UNAME_MACHINE}-nto-qnx - exit 0 ;; + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[KW]:NONSTOP_KERNEL:*:*) + 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 @@ -1087,36 +1283,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - 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 ;; *: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 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + 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 @@ -1148,7 +1355,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) @@ -1237,12 +1444,12 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 -rm -f $dummy.c $dummy +$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) @@ -1251,22 +1458,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 @@ -1277,7 +1484,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://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +and + http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD If the version you run ($0) is already up to date, please send the following data and any information you think might be --- gtkboard-0.11pre0.orig/debian/gtkboard.doc-base +++ gtkboard-0.11pre0/debian/gtkboard.doc-base @@ -0,0 +1,10 @@ +Document: gtkboard +Title: gtkboard Manual +Author: Arvind Narayanan +Abstract: This manual describes what gtkboard is + and how it can be used to play games. +Section: Games/Board + +Format: HTML +Index: /usr/share/doc/gtkboard/html/index.html +Files: /usr/share/doc/gtkboard/html/*.html --- gtkboard-0.11pre0.orig/debian/watch +++ gtkboard-0.11pre0/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/gtkboard/gtkboard-(.*)\.tar\.gz --- gtkboard-0.11pre0.orig/debian/gtkboard.doc-base.gtkboard-dev +++ gtkboard-0.11pre0/debian/gtkboard.doc-base.gtkboard-dev @@ -0,0 +1,9 @@ +Document: gtkboard-dev +Title: gtkboard Dev Manual +Author: Arvind Narayanan +Abstract: This manual describes how to add new games to gtkboard. +Section: Games/Board + +Format: HTML +Index: /usr/share/doc/gtkboard/html/devel/index.html +Files: /usr/share/doc/gtkboard/html/devel/*.html --- gtkboard-0.11pre0.orig/debian/gtkboard.desktop +++ gtkboard-0.11pre0/debian/gtkboard.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=Gtkboard Board Games +GenericName=Board Games +Comment=Play various and sundry board games +Version=1.0 +Encoding=UTF-8 +Exec=gtkboard +Icon=gtkboard +Terminal=false +Type=Application +Categories=GNOME;GTK;Application;Game;LogicGame;BoardGame; +StartupNotify=true --- gtkboard-0.11pre0.orig/debian/compat +++ gtkboard-0.11pre0/debian/compat @@ -0,0 +1 @@ +7 --- gtkboard-0.11pre0.orig/debian/gtkboard.6 +++ gtkboard-0.11pre0/debian/gtkboard.6 @@ -0,0 +1,44 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH GTKBOARD "6" "December 2007" "gtkboard 0.11pre0" "Games" +.SH NAME +gtkboard \- play a variety of board games +.SH SYNOPSIS +.B gtkboard +[\fI-qvhV\fR] [\fI-g game\fR] [\fI-G file\fR] [\fI-f file\fR] [\fI-l logfile\fR] [\fI-d msec\fR] [\fI-p XX\fR] [\fI-w wheur -b bheur\fR] +.SH DESCRIPTION +.TP +\fB\-g\fR, \fB\-\-game\fR +name of the game +.TP +\fB\-G\fR, \fB\-\-plugin\fR +plugin file to load game from +.TP +\fB\-f\fR, \fB\-\-file\fR +file to load game from +.TP +\fB\-l\fR, \fB\-\-log\fR +log file to record game +.TP +\fB\-q\fR, \fB\-\-hide\-board\fR +don't show board +.TP +\fB\-d\fR, \fB\-\-delay\fR +delay in milliseconds +.TP +\fB\-p\fR, \fB\-\-players\fR +human or machine players. Each X must be 'h' or 'm' +.TP +\fB\-w\fR, \fB\-\-w\-heuristic\fR +name of heuristic function for white +.TP +\fB\-b\fR, \fB\-\-b\-heuristic\fR +name of heuristic function for black +.TP +\fB\-v\fR, \fB\-\-verbose\fR +be verbose +.TP +\fB\-V\fR, \fB\-\-version\fR +print version and exit +.TP +\fB\-h\fR, \fB\-\-help\fR +print this help and exit --- gtkboard-0.11pre0.orig/debian/gtkboard.docs +++ gtkboard-0.11pre0/debian/gtkboard.docs @@ -0,0 +1 @@ +TODO --- gtkboard-0.11pre0.orig/debian/rules +++ gtkboard-0.11pre0/debian/rules @@ -0,0 +1,32 @@ +#!/usr/bin/make -f + +%: + dh $@ + +override_dh_auto_configure: + dh_auto_configure -- --bindir=\$${prefix}/games + +override_dh_auto_install: + install -d debian/gtkboard/usr/share/doc/gtkboard/html/devel + install doc/index.html \ + debian/gtkboard/usr/share/doc/gtkboard/html/ + install doc/devel/devel/index.html \ + debian/gtkboard/usr/share/doc/gtkboard/html/devel/ + install -d debian/gtkboard/usr/share/applications + install debian/gtkboard.desktop \ + debian/gtkboard/usr/share/applications + dh_auto_install + +## This will re-generate the man page. +## Not used during normal build; just a convenient place to keep this info. + +#install-stamp: manpage + +manpage: debian/gtkboard.6 + +debian/gtkboard.6: build + help2man --name="play a variety of board games" \ + --section=6 --no-info --output=$@ \ + src/gtkboard + +.PHONY: manpage --- gtkboard-0.11pre0.orig/debian/changelog +++ gtkboard-0.11pre0/debian/changelog @@ -0,0 +1,85 @@ +gtkboard (0.11pre0-11) unstable; urgency=low + + * move sources into git/collab-maint + * debian/control pointer to project home page / monument + + -- Barak A. Pearlmutter Tue, 20 Oct 2009 16:43:53 -0400 + +gtkboard (0.11pre0-10) unstable; urgency=low + + * treat circular undo buffer as circular undo buffer (closes: #229993) + using patch from Alexander Gordeev + + -- Barak A. Pearlmutter Tue, 20 Oct 2009 13:34:48 -0400 + +gtkboard (0.11pre0-9) unstable; urgency=low + + * shrink/modernize debian/rules + * versioned ref in debian/copyright + * rev deb std + + -- Barak A. Pearlmutter Tue, 29 Sep 2009 15:08:42 -0400 + +gtkboard (0.11pre0-8) unstable; urgency=low + + * Move gtkboard executable from /usr/bin to /usr/games + * Minor Debian packaging updates, dh 7, rev policy + + -- Barak A. Pearlmutter Sat, 30 Aug 2008 19:44:22 +0100 + +gtkboard (0.11pre0-7) unstable; urgency=low + + * lintian issues, policy-related revs + + -- Barak A. Pearlmutter Tue, 19 Aug 2008 12:42:11 +0100 + +gtkboard (0.11pre0-6) unstable; urgency=low + + * Break doc-base out into two files (closes: #262913, #422923) + * Add gtkboard.desktop file from Ubuntu 0.11pre0-5ubuntu2 + * Modify gtkboard.desktop by adding ;BoardGame; category (closes: #478913) + + -- Barak A. Pearlmutter Tue, 6 May 2008 14:01:59 +0100 + +gtkboard (0.11pre0-5) unstable; urgency=low + + * Accept patch; thanks to Steve Langasek and Matej Vela! (closes: #333118) + + -- Barak A. Pearlmutter Mon, 20 Feb 2006 10:30:45 +0000 + +gtkboard (0.11pre0-4.1) unstable; urgency=medium + + * NMU. + * src/menu.c (menu_start_game): Fix array size. Closes: #333118. + + -- Matej Vela Sun, 19 Feb 2006 23:28:33 +0100 + +gtkboard (0.11pre0-4) unstable; urgency=low + + * Address doc-base format issues (closes: #287788) + + -- Barak A. Pearlmutter Mon, 24 Jan 2005 01:19:26 +0000 + +gtkboard (0.11pre0-3) unstable; urgency=low + + * GCC 4.0 issue, inconsistent "static" declaration removed (closes: #286918) + + -- Barak A. Pearlmutter Fri, 24 Dec 2004 19:34:19 +0000 + +gtkboard (0.11pre0-2) unstable; urgency=low + + * fix doc-base bug by consolidating multiple Files: (closes: #232279) + + -- Barak A. Pearlmutter Mon, 14 Jun 2004 08:12:41 -0600 + +gtkboard (0.11pre0-1) unstable; urgency=low + + * New upstream release + + -- Barak A. Pearlmutter Tue, 27 Jan 2004 15:02:50 -0700 + +gtkboard (0.10.7-1) unstable; urgency=low + + * Initial Release. + + -- Barak A. Pearlmutter Mon, 29 Sep 2003 22:51:58 +0100 --- gtkboard-0.11pre0.orig/debian/gtkboard.menu +++ gtkboard-0.11pre0/debian/gtkboard.menu @@ -0,0 +1,2 @@ +?package(gtkboard):needs="X11" section="Games/Board"\ + title="GTK Board" command="/usr/games/gtkboard" --- gtkboard-0.11pre0.orig/debian/gtkboard.manpages +++ gtkboard-0.11pre0/debian/gtkboard.manpages @@ -0,0 +1 @@ +debian/gtkboard.6 --- gtkboard-0.11pre0.orig/debian/copyright +++ gtkboard-0.11pre0/debian/copyright @@ -0,0 +1,29 @@ +This package was debianized by Barak A. Pearlmutter on +Mon, 29 Sep 2003 22:51:58 +0100. + +It was downloaded from + http://prdownloads.sourceforge.net/gtkboard/gtkboard-0.10.7.tar.gz?download + untarred, CVS directories removed, and retarred + +Upstream Author: Arvind Narayanan + +Copyright: + + Copyright (C) 2003, Arvind Narayanan + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- gtkboard-0.11pre0.orig/debian/control +++ gtkboard-0.11pre0/debian/control @@ -0,0 +1,23 @@ +Source: gtkboard +Section: games +Priority: optional +Maintainer: Barak A. Pearlmutter +Build-Depends: debhelper (>= 7.2.5), libgtk2.0-dev | libgtk1.3-dev | libgtk1.2-dev, libsdl-mixer1.2-dev +Standards-Version: 3.8.3 +Vcs-Git: git://git.debian.org/git/collab-maint/gtkboard.git +Vcs-Browser: http://git.debian.org/?p=collab-maint/gtkboard.git +Homepage: http://gtkboard.sourceforge.net/ + +Package: gtkboard +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: many board games in one program + Gtkboard aims to provide a common platform for all board games. All + games have a common interface. The first thing you do on starting + gtkboard is to select a game from the menu. Currently 18 games are + implemented. Of these, Antichess, Ataxx, Fifteen puzzle, Hiq, + Memory, Othello, Pentaline, Plot4, Rgb and Samegame are fully + implemented. Checkers, Infiltrate, Hypermaze, Mastermind, Maze, and + Tetris are partially implemented but playable. Chess, and Pacman are + partially implemented and currently unplayable. Some are single + player and some are two player games. --- gtkboard-0.11pre0.orig/src/dirmaze.c +++ gtkboard-0.11pre0/src/dirmaze.c @@ -275,3 +275,6 @@ } } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/othello.c +++ gtkboard-0.11pre0/src/othello.c @@ -564,3 +564,7 @@ // TODO: use different threshold for Othello6x6 return pos->num_moves > 50 ? TRUE : FALSE; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/stopgate.c +++ gtkboard-0.11pre0/src/stopgate.c @@ -527,5 +527,6 @@ return 1; } - - +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/mastermind.c +++ gtkboard-0.11pre0/src/mastermind.c @@ -470,3 +470,6 @@ return 1; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/flw.c +++ gtkboard-0.11pre0/src/flw.c @@ -342,3 +342,6 @@ flw_curx = flw_cury = -1; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/dotsandboxes.c +++ gtkboard-0.11pre0/src/dotsandboxes.c @@ -447,3 +447,7 @@ return; } } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/breakthrough.c +++ gtkboard-0.11pre0/src/breakthrough.c @@ -362,3 +362,6 @@ return 1; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/board.c +++ gtkboard-0.11pre0/src/board.c @@ -74,7 +74,7 @@ //! default background char board_default_colors [9] = {215, 215, 215, 215, 215, 215, 0, 0, 0}; -static int cell_size, num_pieces; +int cell_size, num_pieces; extern void ui_make_human_move (byte *move, int *rmove); @@ -676,4 +676,6 @@ gdk_gc_destroy (def_gc); } - +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/infiltrate.c +++ gtkboard-0.11pre0/src/infiltrate.c @@ -205,3 +205,7 @@ 8, 24); } */ + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/ninemm.c +++ gtkboard-0.11pre0/src/ninemm.c @@ -263,3 +263,7 @@ { curx = cury = -1; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/checkers.c +++ gtkboard-0.11pre0/src/checkers.c @@ -300,3 +300,7 @@ CHECKERS_ISWHITE(idx) ? 0xffffff : 0x0000ff, bg, (idx == CHECKERS_WP || idx == CHECKERS_BP) ? 8 : 12, 24); } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/engine.h +++ gtkboard-0.11pre0/src/engine.h @@ -42,3 +42,7 @@ #endif + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/blet.c +++ gtkboard-0.11pre0/src/blet.c @@ -152,3 +152,6 @@ return rgbbuf; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/towers.c +++ gtkboard-0.11pre0/src/towers.c @@ -412,3 +412,7 @@ *rp++ = -1; *rmovp = rmove; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/ui.c +++ gtkboard-0.11pre0/src/ui.c @@ -27,6 +27,7 @@ #include #include #include +#include #include @@ -667,7 +668,25 @@ { char *wheur = NULL, *bheur = NULL; int c, i; - while ((c = getopt (argc, argv, "g:G:d:f:l:p:w:b:Hqvh")) != -1) + int option_index = 0; + static struct option long_options[] = { + {"game",1,0,'g'}, + {"plugin",1,0,'G'}, + {"delay",1,0,'d'}, + {"file",1,0,'f'}, + {"log",1,0,'l'}, + {"players",1,0,'p'}, + {"w-heuristic",1,0,'w'}, + {"b-heuristic",1,0,'b'}, + {"html-help",0,0,'H'}, + {"hide-board",0,0,'q'}, + {"verbose",0,0,'v'}, + {"help",0,0,'h'}, + {"version",0,0,'V'}, + {0, 0, 0, 0} + }; + while ((c = getopt_long (argc, argv, "g:G:d:f:l:p:w:b:HqvhV", + long_options, &option_index)) != -1) { switch (c) { @@ -787,22 +806,27 @@ case 'v': opt_verbose = 1; break; + case 'V': + printf("gtkboard %s\n", GTKBOARD_VERSION); + exit(0); case 'h': - printf ("Usage: gtkboard \t[-qvh] " - "[-g game] [-G file] [-f file] [-l logfile] [-d msec]\n" - "\t\t\t[-p XX] [-w wheur -b bheur] " + printf ("Usage: gtkboard \t[-qvhV]" + " [-g game] [-G file] [-f file] [-l logfile] [-d msec]" + " [-p XX] [-w wheur -b bheur]" + "\n" "\n" - "\t-g\tname of the game\n" - "\t-G\tplugin file to load game from\n" - "\t-f\tfile to load game from\n" - "\t-l\tlog file to record game\n" - "\t-q\tdon't show board\n" - "\t-d\tdelay in milliseconds\n" - "\t-p\thuman or machine players. Each X must be 'h' or 'm'\n" - "\t-w\tname of heuristic function for white\n" - "\t-b\tname of heuristic function for black\n" - "\t-v\tbe verbose\n" - "\t-h\tprint this help\n" + "\t-g, --game\tname of the game\n" + "\t-G, --plugin\tplugin file to load game from\n" + "\t-f, --file\tfile to load game from\n" + "\t-l, --log\tlog file to record game\n" + "\t-q, --hide-board\tdon't show board\n" + "\t-d, --delay\tdelay in milliseconds\n" + "\t-p, --players\thuman or machine players. Each X must be 'h' or 'm'\n" + "\t-w, --w-heuristic\tname of heuristic function for white\n" + "\t-b, --b-heuristic\tname of heuristic function for black\n" + "\t-v, --verbose\tbe verbose\n" + "\t-V, --version\tprint version and exit\n" + "\t-h, --help\tprint this help and exit\n" ); exit (0); default: @@ -1378,3 +1402,7 @@ } return 0; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/ataxx.c +++ gtkboard-0.11pre0/src/ataxx.c @@ -401,3 +401,6 @@ return rgbbuf; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/pacman.c +++ gtkboard-0.11pre0/src/pacman.c @@ -500,3 +500,6 @@ return NULL; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/stack.c +++ gtkboard-0.11pre0/src/stack.c @@ -34,6 +34,9 @@ movstack_ptr ---> movstack_max : "forward" list */ +//! Start offset of the stack in the circular buffer +static int movstack_start = 0; + //! Current position in the stack static int movstack_ptr = 0; @@ -67,31 +70,38 @@ void movstack_push (byte *board, byte *move) { - assert (movstack_ptr < STACK_SIZE - 1); - movstack[movstack_ptr] = movdup (move); - movinvstack[movstack_ptr] = mov_getinv (board, move); - movstack_ptr++; - if (movstack_ptr > movstack_max) - movstack_max = movstack_ptr; + movstack[(movstack_start + movstack_ptr) % STACK_SIZE] = movdup (move); + movinvstack[(movstack_start + movstack_ptr) % STACK_SIZE] = mov_getinv (board, move); + if (movstack_ptr < STACK_SIZE - 1) { + movstack_ptr++; + if (movstack_ptr > movstack_max) + movstack_max = movstack_ptr; + } else { + free (movstack[movstack_start]); + free (movinvstack[movstack_start]); + movstack_start = (movstack_start + 1) % STACK_SIZE; + } } byte *movstack_pop () { if (movstack_ptr == 0) return NULL; - return movstack[--movstack_ptr]; + movstack_ptr--; + return movstack[(movstack_start + movstack_ptr) % STACK_SIZE]; } -//! Truncates a stack to the current poisition. -/** This will be called when the user makes a move when it is not the final poisition. */ +//! Truncates a stack to the current position. +/** This will be called when the user makes a move when it is not the final position. */ void movstack_trunc () { int i; assert (movstack_ptr <= movstack_max); for (i = movstack_ptr; i < movstack_max; i++) { - free (movstack[i]); - free (movinvstack[i]); + int j = (movstack_start + i) % STACK_SIZE; + free (movstack[j]); + free (movinvstack[j]); } movstack_max = movstack_ptr; } @@ -101,7 +111,7 @@ if (movstack_ptr < movstack_max) movstack_ptr++; else return NULL; - return movstack[movstack_ptr-1]; + return movstack[(movstack_start + movstack_ptr - 1) % STACK_SIZE]; } byte * movstack_back () @@ -109,7 +119,7 @@ if (movstack_ptr > 0) movstack_ptr--; else return NULL; - return movinvstack[movstack_ptr]; + return movinvstack[(movstack_start + movstack_ptr) % STACK_SIZE]; } void movstack_free () @@ -117,8 +127,9 @@ int i; for (i=0; i statestack_max) - statestack_max = statestack_ptr; + + statestack[(statestack_start + statestack_ptr) % STACK_SIZE] = newstate; + + if (statestack_ptr < STACK_SIZE - 1) { + statestack_ptr++; + if (statestack_ptr > statestack_max) + statestack_max = statestack_ptr; + } else { + free (statestack[statestack_start]); + statestack_start = (statestack_start + 1) % STACK_SIZE; + } } void *statestack_peek () { if (statestack_ptr == 0) return NULL; - return statestack[statestack_ptr-1]; + return statestack[(statestack_start + statestack_ptr - 1) % STACK_SIZE]; } void *statestack_pop () { if (statestack_ptr == 0) return NULL; - return statestack[--statestack_ptr]; + statestack_ptr--; + return statestack[(statestack_start + statestack_ptr) % STACK_SIZE]; } void statestack_trunc () @@ -165,7 +183,7 @@ int i; assert (statestack_ptr <= statestack_max); for (i = statestack_ptr; i < statestack_max; i++) - free (statestack[i]); + free (statestack[(statestack_start + i) % STACK_SIZE]); statestack_max = statestack_ptr; } @@ -174,7 +192,7 @@ if (statestack_ptr < statestack_max) statestack_ptr++; else return NULL; - return statestack[statestack_ptr-1]; + return statestack[(statestack_start + statestack_ptr - 1) % STACK_SIZE]; } void * statestack_back () @@ -182,13 +200,17 @@ if (statestack_ptr > 0) statestack_ptr--; else return NULL; - return statestack[statestack_ptr-1]; + return statestack[(statestack_start + statestack_ptr - 1) % STACK_SIZE]; } void statestack_free () { int i; for (i=0; ibytes #ifndef byte #define byte gint8 @@ -518,3 +520,7 @@ extern int (*game_scorecmp_def_time) (gchar *, int, gchar*, int); #endif + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/prefs.c +++ gtkboard-0.11pre0/src/prefs.c @@ -563,3 +563,7 @@ fclose (in); } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/ab.c +++ gtkboard-0.11pre0/src/ab.c @@ -88,7 +88,7 @@ // origmove is the owning pointer and move is the aliasing pointer else orig_move = move = movdup (move); - newpos.board = (char *) malloc (board_wid * board_heit); + newpos.board = malloc (board_wid * board_heit); assert (newpos.board); if (game_stateful) { @@ -367,3 +367,7 @@ } return found ? best_move : NULL; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/cpento.c +++ gtkboard-0.11pre0/src/cpento.c @@ -576,3 +576,6 @@ } } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/samegame.c +++ gtkboard-0.11pre0/src/samegame.c @@ -409,3 +409,7 @@ } } } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/aaball.c +++ gtkboard-0.11pre0/src/aaball.c @@ -297,3 +297,6 @@ return map; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/maze.c +++ gtkboard-0.11pre0/src/maze.c @@ -289,3 +289,6 @@ //else return pixmap_ball_gen(MAZE_CELL_SIZE, 0xc0c040, bg, 2, 50); } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/plot4.c +++ gtkboard-0.11pre0/src/plot4.c @@ -302,3 +302,6 @@ return pixmap_ball_gen(55, pixbuf, fg, bg, 17.0, 30.0); } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/move.c +++ gtkboard-0.11pre0/src/move.c @@ -180,4 +180,6 @@ return inv; } - +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/tetris.c +++ gtkboard-0.11pre0/src/tetris.c @@ -505,3 +505,6 @@ return pixmap; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/fifteen.c +++ gtkboard-0.11pre0/src/fifteen.c @@ -284,3 +284,7 @@ } return buf; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/hiq.c +++ gtkboard-0.11pre0/src/hiq.c @@ -286,3 +286,6 @@ return INPUT_LEGAL; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/knights.c +++ gtkboard-0.11pre0/src/knights.c @@ -367,3 +367,7 @@ { return knights_eval_real (pos, player, eval, FALSE); } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/hash.c +++ gtkboard-0.11pre0/src/hash.c @@ -236,3 +236,7 @@ } if (opt_verbose) printf ("stale=%d\n", stale); } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/engine.c +++ gtkboard-0.11pre0/src/engine.c @@ -433,3 +433,6 @@ return move; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/kttour.c +++ gtkboard-0.11pre0/src/kttour.c @@ -266,3 +266,6 @@ return 1; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/pentaline.c +++ gtkboard-0.11pre0/src/pentaline.c @@ -495,3 +495,7 @@ pos->board [move[1] * board_wid + move[0]] = 0; return &state; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/sound.c +++ gtkboard-0.11pre0/src/sound.c @@ -169,3 +169,7 @@ sound_play_real (sound_file); g_free (sound_file); } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/rgb.c +++ gtkboard-0.11pre0/src/rgb.c @@ -224,3 +224,7 @@ *eval = 0; return RESULT_NOTYET; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/menu.c +++ gtkboard-0.11pre0/src/menu.c @@ -51,7 +51,7 @@ void sb_messagebar_message (gchar *); void menu_cleanup_var_menus (); -static char * menu_paths_sens_machine_thinking[] = +static char * menu_paths_sens_machine_thinking[] = { // "/File/Load game", // "/File/Save game", @@ -63,7 +63,7 @@ "/Move/Forward", }; -static char * menu_paths_sens_no_game[] = +static char * menu_paths_sens_no_game[] = { "/Game/Start", "/Game/Pause", @@ -77,7 +77,7 @@ "/Settings/Player", }; -static char * menu_paths_sens_no_back_forw[] = +static char * menu_paths_sens_no_back_forw[] = { "/Move/Back", "/Move/Forward", @@ -96,17 +96,17 @@ "/Game/Zap Highscores", }; -static char *menu_paths_sens_ui_stopped[] = +static char *menu_paths_sens_ui_stopped[] = { "/Game/Pause", }; -static char *menu_paths_sens_machine_not_thinking[] = +static char *menu_paths_sens_machine_not_thinking[] = { "/Move/Move Now", }; -static char *menu_paths_sens_eval_function[] = +static char *menu_paths_sens_eval_function[] = { // "/Settings/Eval function", }; @@ -124,51 +124,51 @@ if (!state_gui_active) return; switch (which) { - case MENU_SENS_MACHINE_THINKING: + case MENU_SENS_MACHINE_THINKING: menu_des_paths = menu_paths_sens_machine_thinking; - num_paths = sizeof (menu_paths_sens_machine_thinking) / + num_paths = sizeof (menu_paths_sens_machine_thinking) / sizeof (menu_paths_sens_machine_thinking[0]); break; - case MENU_SENS_MACHINE_NOT_THINKING: + case MENU_SENS_MACHINE_NOT_THINKING: menu_des_paths = menu_paths_sens_machine_not_thinking; - num_paths = sizeof (menu_paths_sens_machine_not_thinking) / + num_paths = sizeof (menu_paths_sens_machine_not_thinking) / sizeof (menu_paths_sens_machine_not_thinking[0]); break; - case MENU_SENS_NO_GAME: + case MENU_SENS_NO_GAME: menu_des_paths = menu_paths_sens_no_game; - num_paths = sizeof (menu_paths_sens_no_game) / + num_paths = sizeof (menu_paths_sens_no_game) / sizeof (menu_paths_sens_no_game[0]); break; - case MENU_SENS_NO_BACK_FORW: + case MENU_SENS_NO_BACK_FORW: menu_des_paths = menu_paths_sens_no_back_forw; - num_paths = sizeof (menu_paths_sens_no_back_forw) / + num_paths = sizeof (menu_paths_sens_no_back_forw) / sizeof (menu_paths_sens_no_back_forw[0]); break; - case MENU_SENS_SINGLE_PLAYER: + case MENU_SENS_SINGLE_PLAYER: menu_des_paths = menu_paths_sens_single_player; - num_paths = sizeof (menu_paths_sens_single_player) / + num_paths = sizeof (menu_paths_sens_single_player) / sizeof (menu_paths_sens_single_player[0]); break; case MENU_SENS_TWO_PLAYERS: menu_des_paths = menu_paths_sens_two_players; - num_paths = sizeof (menu_paths_sens_two_players) / + num_paths = sizeof (menu_paths_sens_two_players) / sizeof (menu_paths_sens_two_players[0]); break; - case MENU_SENS_UI_STOPPED: + case MENU_SENS_UI_STOPPED: menu_des_paths = menu_paths_sens_ui_stopped; - num_paths = sizeof (menu_paths_sens_ui_stopped) / + num_paths = sizeof (menu_paths_sens_ui_stopped) / sizeof (menu_paths_sens_ui_stopped[0]); break; case MENU_SENS_EVAL_FUNCTION: menu_des_paths = menu_paths_sens_eval_function; - num_paths = sizeof (menu_paths_sens_eval_function) / + num_paths = sizeof (menu_paths_sens_eval_function) / sizeof (menu_paths_sens_eval_function[0]); break; default: g_assert_not_reached (); } for (i=0; iwindow, NULL, NULL, pixmap_data); } - gtk_image_set_from_pixmap (GTK_IMAGE (sb_turn_image), + gtk_image_set_from_pixmap (GTK_IMAGE (sb_turn_image), pixmaps[previndex = 6], NULL); first = 0; } if (opt_infile || !opt_game) index = 6; - else + else { if (!game_single_player && ui_white == HUMAN && ui_black == HUMAN && cur_pos.player == BLACK) index = 4; @@ -211,14 +211,14 @@ } g_assert (index >= 0 && index <= 6); if (index == previndex) return; - gtk_image_set_from_pixmap (GTK_IMAGE (sb_turn_image), + gtk_image_set_from_pixmap (GTK_IMAGE (sb_turn_image), pixmaps[previndex = index], NULL); #endif } static void sb_set_cursor () { - static GdkCursor *cursor_normal = NULL, *cursor_busy = NULL, + static GdkCursor *cursor_normal = NULL, *cursor_busy = NULL, *cursor_inactive = NULL; // FIXME: is it ok to hard code the shape of the normal cursor? if (!cursor_normal) cursor_normal = gdk_cursor_new (GDK_LEFT_PTR); @@ -272,9 +272,9 @@ dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (main_window), GTK_DIALOG_MODAL, NULL); gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 100); - okay_button = gtk_dialog_add_button (GTK_DIALOG (dialog), + okay_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_NONE); - g_signal_connect_swapped (GTK_OBJECT (dialog), + g_signal_connect_swapped (GTK_OBJECT (dialog), "response", G_CALLBACK (gtk_widget_destroy), GTK_OBJECT (dialog)); gtk_label_set_selectable (GTK_LABEL (label), TRUE); #endif @@ -294,7 +294,7 @@ { menu_show_dialog_real (title, message, TRUE); } - + void menu_pause_cb (GtkWidget *dialog) { @@ -336,7 +336,7 @@ /* dialog = gtk_dialog_new_with_buttons (title, GTK_WINDOW (main_window), GTK_DIALOG_MODAL, NULL); gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 100); - okay_button = gtk_dialog_add_button (GTK_DIALOG (dialog), + okay_button = gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_OK, GTK_RESPONSE_NONE); gtk_label_set_selectable (GTK_LABEL (label), TRUE); */ @@ -375,13 +375,11 @@ menu_show_dialog ("About gtkboard", "gtkboard " VERSION "\n" "http://gtkboard.sourceforge.net/\n" - "Maintainer: Arvind Narayanan \n" + "Author: Arvind Narayanan \n" "Released under the GNU General Public License\n" "See the file COPYING for details\n" "\n" - "The documentation is available in the doc/ directory\n" - "of the source distribution or in the directory\n" - "/usr/local/doc/gtkboard-" VERSION "/ if you installed from binary rpm.\n" + "The documentation is available locally in /usr/share/doc/gtkboard/.\n" "The latest documentation will always be available at\n" "http://gtkboard.sourceforge.net/doc/" ); @@ -425,8 +423,8 @@ sb_error ("Game over", FALSE); break; } - if (!impl_check()) - { + if (!impl_check()) + { sb_error ("Not yet implemented", TRUE); break; } @@ -470,19 +468,19 @@ // if first is TRUE use opt_white and opt_black void menu_put_player (gboolean first) { - gchar *path, *paths[4] = { + gchar *path, *paths[4] = { "/Settings/Player/Human-Human", "/Settings/Player/Human-Machine", "/Settings/Player/Machine-Human", "/Settings/Player/Machine-Machine"}; if (!state_gui_active) return; if (first) {ui_white = opt_white; ui_black = opt_black;} if (opt_infile) { - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM - (gtk_item_factory_get_widget (menu_factory, "/Settings/Player/File")), + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM + (gtk_item_factory_get_widget (menu_factory, "/Settings/Player/File")), TRUE); - + return; - } + } else if (ui_white == HUMAN && ui_black == HUMAN) path = paths[0]; else if (ui_white == HUMAN && ui_black == MACHINE) @@ -493,7 +491,7 @@ path = paths[3]; else return; - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget (menu_factory, path)), TRUE); } @@ -506,21 +504,21 @@ strcat (path, "/"); } strcat (path, opt_game->name); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (gtk_item_factory_get_widget (menu_factory, path)), TRUE); } GtkWidget *menu_selector; - -void menu_load_file (GtkFileSelection *selector, gpointer user_data) + +void menu_load_file (GtkFileSelection *selector, gpointer user_data) { gchar const *filename; static FILE *in; - filename = gtk_file_selection_get_filename + filename = gtk_file_selection_get_filename (GTK_FILE_SELECTION(menu_selector)); if (!(in = fopen (filename, "r"))) { - gchar *tempstr = g_strdup_printf + gchar *tempstr = g_strdup_printf ("Could not open file \"%s\" for reading", filename); sb_error (tempstr, TRUE); g_free (tempstr); @@ -543,7 +541,7 @@ /* the callback for a radio button appears to be called TWICE, once when selected and once when something else is selected. */ - + if (!GTK_CHECK_MENU_ITEM(widget)->active) return; @@ -600,12 +598,12 @@ g_assert (menu_selector); /*gtk_file_selection_complete ( GTK_FILE_SELECTION (menu_selector), "*.cbgf");*/ - - gtk_signal_connect (GTK_OBJECT + + gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(menu_selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (menu_load_file), NULL); - - gtk_signal_connect_object (GTK_OBJECT + + gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION(menu_selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), (gpointer) menu_selector); @@ -614,7 +612,7 @@ GTK_OBJECT (GTK_FILE_SELECTION(menu_selector)->cancel_button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), (gpointer) menu_selector); - + gtk_widget_show (menu_selector); } @@ -670,7 +668,7 @@ dialog = gtk_dialog_new(); gtk_window_set_title (GTK_WINDOW (dialog), titlestr); hbox = gtk_hbox_new (FALSE, 0); - msgarea = gtk_text_new (NULL, + msgarea = gtk_text_new (NULL, gtk_range_get_adjustment (GTK_RANGE (vbar))); gtk_text_set_word_wrap (GTK_TEXT (msgarea), TRUE); gtk_text_insert (GTK_TEXT (msgarea), NULL, NULL, NULL, msgstr, -1); @@ -679,7 +677,7 @@ okay_button = gtk_button_new_with_label(" OK "); gtk_signal_connect_object (GTK_OBJECT (okay_button), "clicked", GTK_SIGNAL_FUNC (gtk_widget_destroy), (gpointer) dialog); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), + gtk_box_pack_start (GTK_BOX (GTK_DIALOG(dialog)->action_area), okay_button, FALSE, FALSE, 0); gtk_widget_grab_focus (okay_button); // contributed by Paddu gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), hbox); @@ -695,7 +693,7 @@ gtk_text_view_set_editable (GTK_TEXT_VIEW (msgarea), FALSE); gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (msgarea), GTK_WRAP_WORD); gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (msgarea), FALSE); - gtk_text_buffer_set_text (gtk_text_view_get_buffer + gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (msgarea)), msgstr, -1); scrwin = gtk_scrolled_window_new (NULL, gtk_range_get_adjustment (GTK_RANGE(vbar))); @@ -826,21 +824,21 @@ void menu_start_game () { ui_start_game (); - + { int i; - GtkItemFactoryEntry help_items [3]; + GtkItemFactoryEntry help_items [4]; help_items[0].path = g_strdup_printf ("/Help/%s", opt_game->name); help_items[0].accelerator = NULL; help_items[0].callback = NULL; help_items[0].item_type = ""; gtk_item_factory_create_item (menu_factory, help_items, NULL, 1); - - help_items[0].path = g_strdup_printf ("/Help/%s/_About", opt_game->name); + + help_items[0].path = g_strdup_printf ("/Help/%s/_About", opt_game->name); help_items[0].callback_action = MENU_DOC_ABOUT; - help_items[1].path = g_strdup_printf ("/Help/%s/_Rules", opt_game->name); + help_items[1].path = g_strdup_printf ("/Help/%s/_Rules", opt_game->name); help_items[1].callback_action = MENU_DOC_RULES; - help_items[2].path = g_strdup_printf ("/Help/%s/_Strategy", opt_game->name); + help_items[2].path = g_strdup_printf ("/Help/%s/_Strategy", opt_game->name); help_items[2].callback_action = MENU_DOC_STRATEGY; help_items[3].path = g_strdup_printf ("/Help/%s/_History", opt_game->name); help_items[3].callback_action = MENU_DOC_HISTORY; @@ -979,7 +977,7 @@ sb_message ("You cheated! No highscore for this game.", FALSE); ui_cheated = TRUE; } - // FIXME: there should be only one round of communication + // FIXME: there should be only one round of communication // in which client gets both the move and who_won ui_check_who_won (); if (game_reset_uistate) game_reset_uistate(); @@ -1036,7 +1034,7 @@ if (game_htab) for (i=0; game_htab[i].name; i++) { - heur_item.path = g_strdup_printf ("/Settings/Eval function/%s/%s", + heur_item.path = g_strdup_printf ("/Settings/Eval function/%s/%s", *color, game_htab[i].name); if (i == 0) strncpy (pathbuf, heur_item.path, 63); heur_item.accelerator = NULL; @@ -1260,9 +1258,9 @@ if (ui_white == MACHINE) player[0] = 'M'; if (ui_black == HUMAN) player[2] = 'H'; if (ui_black == MACHINE) player[2] = 'M'; - gtk_label_set_text (GTK_LABEL(sb_player_label), + gtk_label_set_text (GTK_LABEL(sb_player_label), ui_white != NONE ? player : "File"); - gtk_label_set_text (GTK_LABEL(sb_who_label), cur_pos.player == WHITE ? + gtk_label_set_text (GTK_LABEL(sb_who_label), cur_pos.player == WHITE ? game_white_string : game_black_string); } gtk_label_set_text (GTK_LABEL(sb_score_label), sb_score_str); @@ -1294,3 +1292,7 @@ first = FALSE; return TRUE; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/chess.c +++ gtkboard-0.11pre0/src/chess.c @@ -895,3 +895,7 @@ *eval = sum; return RESULT_NOTYET; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/eightqueens.c +++ gtkboard-0.11pre0/src/eightqueens.c @@ -43,7 +43,7 @@ void eightqueens_init (); -char ** eightqueens_pixmaps [] = +char ** eightqueens_pixmaps [] = { chess_wq_54_xpm, grey_square_54_xpm, @@ -126,10 +126,13 @@ *mp++ = x, *mp++ = y, *mp++ = EIGHTQUEENS_QUEEN; for (i=0; iboard[j * board_wid + i] == EIGHTQUEENS_EMPTY + if (!(i==x && j==y) && pos->board[j * board_wid + i] == EIGHTQUEENS_EMPTY && ATTACKS (i, j, x, y)) *mp++ = i, *mp++ = j, *mp++ = EIGHTQUEENS_CONTROLLED; *mp++ = -1; return 1; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/antichess.c +++ gtkboard-0.11pre0/src/antichess.c @@ -731,3 +731,7 @@ } return RESULT_NOTYET; } + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/memory.c +++ gtkboard-0.11pre0/src/memory.c @@ -302,3 +302,6 @@ return 1; } +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/prefs.h +++ gtkboard-0.11pre0/src/prefs.h @@ -80,3 +80,7 @@ gboolean prefs_get_bool_val (gchar *value); extern int (*game_scorecmp) (gchar *, int, gchar*, int); #endif + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/flwords.h +++ gtkboard-0.11pre0/src/flwords.h @@ -4360,3 +4360,7 @@ #endif + +// Local Variables: +// tab-width: 4 +// End: --- gtkboard-0.11pre0.orig/src/sound.h +++ gtkboard-0.11pre0/src/sound.h @@ -25,3 +25,7 @@ void sound_enable_pref_cb (gchar *key, gchar *value); #endif + +// Local Variables: +// tab-width: 4 +// End: