--- aplus-fsf-4.22.1.orig/config/config.sub +++ aplus-fsf-4.22.1/config/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2003-01-03' +timestamp='2012-04-18' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -20,23 +21,25 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# along with this program; if not, see . +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# diff and a properly formatted GNU ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD + # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. @@ -70,7 +73,8 @@ version="\ GNU config.sub ($timestamp) -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, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +87,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +103,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,10 +122,18 @@ # 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* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ + kopensolaris*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -144,10 +156,13 @@ -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 | -microblaze) os= basic_machine=$1 ;; + -bluegene*) + os=-cnk + ;; -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 @@ -162,13 +177,17 @@ os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -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/'` @@ -185,6 +204,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/'` @@ -202,6 +225,12 @@ -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -226,56 +255,103 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ + | bfin \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | epiphany \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64octeon | mips64octeonel \ | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | moxie \ + | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | open8 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | s390 | s390x \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ - | v850 | v850e \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -291,57 +367,80 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64octeon-* | mips64octeonel-* \ | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ | 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-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* \ - | s390-* | s390x-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ - | v850-* | v850e-* | vax-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ | ymp-* \ - | z8k-*) + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. @@ -359,6 +458,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -373,6 +475,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 @@ -396,6 +504,10 @@ basic_machine=m68k-apollo os=-bsd ;; + aros) + basic_machine=i386-pc + os=-aros + ;; aux) basic_machine=m68k-apple os=-aux @@ -404,10 +516,35 @@ basic_machine=ns32k-sequent os=-dynix ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -432,12 +569,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | 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 ;; @@ -460,6 +612,14 @@ basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -571,7 +731,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -610,6 +769,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 ;; @@ -621,10 +788,17 @@ basic_machine=ns32k-utek os=-sysv ;; + microblaze) + basic_machine=microblaze-xilinx + ;; mingw32) basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -638,10 +812,6 @@ 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 @@ -654,10 +824,21 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -722,9 +903,11 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem ;; nsr-tandem) basic_machine=nsr-tandem @@ -733,9 +916,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -753,6 +939,14 @@ basic_machine=i860-intel os=-osf ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` + os=-linux + ;; pbd) basic_machine=sparc-tti ;; @@ -762,32 +956,45 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + 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 | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -812,6 +1019,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -822,6 +1033,12 @@ 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 @@ -832,6 +1049,14 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -839,6 +1064,12 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -857,6 +1088,9 @@ basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -913,13 +1147,9 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu ;; tx39) basic_machine=mipstx39-unknown @@ -934,6 +1164,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -977,9 +1211,16 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -988,6 +1229,10 @@ basic_machine=z8k-unknown os=-sim ;; + z80-*-coff) + basic_machine=z80-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -1007,6 +1252,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1023,13 +1271,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1073,9 +1318,12 @@ if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; @@ -1096,25 +1344,31 @@ # Each alternative MUST END IN A *, to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ + | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -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* \ + | -chorusos* | -chorusrdb* | -cegcc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -microbsd*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1132,12 +1386,15 @@ 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|'` ;; @@ -1150,6 +1407,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1171,6 +1431,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1193,6 +1456,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1223,6 +1489,20 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -nacl*) + ;; -none) ;; *) @@ -1245,6 +1525,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1254,6 +1540,21 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1272,13 +1573,13 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1297,9 +1598,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1402,7 +1709,7 @@ -sunos*) vendor=sun ;; - -aix*) + -cnk*|-aix*) vendor=ibm ;; -beos*) @@ -1432,9 +1739,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1459,7 +1772,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- aplus-fsf-4.22.1.orig/config/config.guess +++ aplus-fsf-4.22.1/config/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2003-01-10' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -16,24 +17,24 @@ # General Public License for more details. # # 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. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. + +# Originally written by Per Bothner. Please send patches (context +# diff format) to and include a 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 # exits with 0. Otherwise, it exits with 1. # -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. +# You can get the latest version of this script from: +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD me=`echo "$0" | sed -e 's,.*/,,'` @@ -53,7 +54,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -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, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +68,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -104,8 +106,9 @@ trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; @@ -122,7 +125,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -140,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -157,6 +160,7 @@ 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 @@ -165,7 +169,7 @@ arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null + | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? @@ -175,7 +179,7 @@ fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -195,141 +199,115 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:MicroBSD:*:*) - echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *: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. - eval $set_cc_for_build - 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 - $CC_FOR_BUILD -o $dummy $dummy.s 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" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - 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'` + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; 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 @@ -337,29 +315,51 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + 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 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; + s390x:SunOS:*:*) + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; + i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) + echo i386-pc-auroraux${UNAME_RELEASE} + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + eval $set_cc_for_build + SUN_ARCH="i386" + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH="x86_64" + fi + fi + echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # 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*) @@ -368,10 +368,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -383,10 +383,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -396,38 +396,41 @@ # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-atari-mint${UNAME_RELEASE} + 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 ;; + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + echo m68k-unknown-mint${UNAME_RELEASE} + 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 @@ -451,35 +454,36 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -492,29 +496,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` @@ -522,7 +526,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 @@ -537,15 +541,19 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; - *:AIX:*:[45]) + exit ;; + *:AIX:*:[4567]) 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 @@ -558,28 +566,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -588,52 +596,52 @@ 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -641,9 +649,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep -q __LP64__ then HP_ARCH="hppa2.0w" else @@ -651,11 +669,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -683,205 +701,266 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) - echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + 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 ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + 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:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_PROCESSOR}-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*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 - exit 0 ;; + exit ;; + *:Interix*:*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + authenticamd | genuineintel | EM64T) + 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 0 ;; + exit ;; + 8664:Windows_NT:*) + echo x86_64-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep -q ld.so.1 + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + 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 + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-gnueabi + else + echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + fi + fi + exit ;; + avr32*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - ia64:Linux:*:*) + exit ;; + cris:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo ${UNAME_MACHINE}-axis-linux-gnu + exit ;; + frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) + exit ;; + hexagon:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) + exit ;; + i*86:Linux:*:*) + LIBC=gnu 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 + #ifdef __dietlibc__ + LIBC=dietlibc #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit ;; + ia64:Linux:*:*) + 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 ;; + mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #undef CPU - #undef mips64 - #undef mips64el + #undef ${UNAME_MACHINE} + #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el + CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 + CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - 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 ;; + or32:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + padre:Linux:*:*) + echo sparc-unknown-linux-gnu + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -889,106 +968,71 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + 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 ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - 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. - # 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: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # 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 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 - ;; + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + xtensa*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + 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... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -996,15 +1040,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; - 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 | 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) + 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 ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + NCR*:*:4.2:* | MPRAS*:*:4.2:*) + OS_REL='.3' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 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` @@ -1096,68 +1154,94 @@ else echo ns32k-sni-sysv fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + 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} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + 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 ;; + BePC:Haiku:*:*) # Haiku running on Intel PC compatible. + echo i586-pc-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + 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:*:*) - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + i386) + eval $set_cc_for_build + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + UNAME_PROCESSOR="x86_64" + fi + fi ;; + unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1165,22 +1249,28 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + 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 @@ -1191,25 +1281,53 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *: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 ;; + i*86:AROS:*:*) + echo ${UNAME_MACHINE}-pc-aros + exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1232,16 +1350,16 @@ #include printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #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) @@ -1330,11 +1448,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1343,22 +1462,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 @@ -1369,7 +1488,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 --- aplus-fsf-4.22.1.orig/src/lisp.1/aplus.el +++ aplus-fsf-4.22.1/src/lisp.1/aplus.el @@ -26,16 +26,16 @@ ;; ;; -(defvar aplus-set-load-path t +(defvar aplus-set-load-path nil "*Non-nil means set the load-path for the user.") -(if aplus-set-load-path - (setq load-path - (append - '("/usr/local/aplus-fsf-4.20/lisp.1") load-path - ) - )) -;; +;; (if aplus-set-load-path +;; (setq load-path +;; (append +;; '("/usr/local/aplus-fsf-4.22/lisp.1") load-path +;; ) +;; )) + ;; Load Aplus and set defaults ;; (defvar aplus-setup-global-bindings t @@ -47,7 +47,7 @@ (require 'a-font) (require 'keyb) (require 'a) -(setq a-prog "/usr/local/bin/a+") +(setq a-prog "a+") (setq a-plus t) (cond ((file-readable-p "~/.custom/a-options.el") --- aplus-fsf-4.22.1.orig/src/lisp.1/a.el +++ aplus-fsf-4.22.1/src/lisp.1/a.el @@ -866,23 +866,13 @@ (cond (tuple (setcdr tuple value)) (t (nconc alist (list (cons key value))))))) -;; +++ a-mode seems better. Also, why .z and .+? -(change-assoc "\\.apl$" 'a-mode auto-mode-alist) -(change-assoc "\\.a$" 'a-mode auto-mode-alist) -(change-assoc "\\.\\+$" 'a-mode auto-mode-alist) -; (change-assoc "\\.z$" 'a-mode auto-mode-alist) +(change-assoc "\\.apl$" 'a-minor-mode auto-mode-alist) +(change-assoc "\\.a$" 'a-minor-mode auto-mode-alist) +(change-assoc "\\.\\+$" 'a-minor-mode auto-mode-alist) (defvar a-prog-default "a+") -(defvar a-path-default "/usr/local/lib/aplus-") - -;(cond ((string-equal (getenv "SYS_FIRIS") "FID") -; (defvar a-path-default "/usr/local/a+_") -; ) -; ((string-equal (getenv "SYS_FIRIS") "IS" ) -; (defvar a-path-default "/ms/dist/aplus/PROJ/aplus/") -; ) -;) +(defvar a-path-default "/usr/lib/") (defun toggle-a-prog (arg) (interactive "P") --- aplus-fsf-4.22.1.orig/src/lisp.1/Makefile.in +++ aplus-fsf-4.22.1/src/lisp.1/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.6.3 from Makefile.am. +# Makefile.in generated by automake 1.7.9 from Makefile.am. # @configure_input@ -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 # Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,81 +16,137 @@ ############################################################################### ############################################################################### -SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ top_builddir = ../.. -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c -INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_HEADER = $(INSTALL_DATA) -transform = @program_transform_name@ +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -host_alias = @host_alias@ host_triplet = @host@ - -EXEEXT = @EXEEXT@ -OBJEXT = @OBJEXT@ -PATH_SEPARATOR = @PATH_SEPARATOR@ +ACLOCAL = @ACLOCAL@ +AMDEP_FALSE = @AMDEP_FALSE@ +AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ -AS = @AS@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ DEPDIR = @DEPDIR@ -DLLTOOL = @DLLTOOL@ +DSYMUTIL = @DSYMUTIL@ ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GREP = @GREP@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LDFLAGS = @LDFLAGS@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ LIBTOOL = @LIBTOOL@ LIBTOOL_DEPS = @LIBTOOL_DEPS@ LN_S = @LN_S@ +LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -OBJDUMP = @OBJDUMP@ +MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ +MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ +MAKEINFO = @MAKEINFO@ +NMEDIT = @NMEDIT@ +OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ RANLIB = @RANLIB@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +XMKMF = @XMKMF@ X_INCLUDES = @X_INCLUDES@ X_LIBS = @X_LIBS@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ +am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ +am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ +am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ +am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ lisp1dir = $(prefix)/lisp.1 @@ -112,12 +168,13 @@ xa.el subdir = src/lisp.1 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs CONFIG_CLEAN_FILES = DIST_SOURCES = DATA = $(lisp1_DATA) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in Makefile.am all: all-am .SUFFIXES: @@ -157,13 +214,22 @@ tags: TAGS TAGS: +ctags: CTAGS +CTAGS: + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) - @list='$(DISTFILES)'; for file in $$list; do \ + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ + case $$file in \ + $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ + $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ + esac; \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ if test "$$dir" != "$$file" && test "$$dir" != "."; then \ @@ -189,7 +255,6 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(lisp1dir) - install: install-am install-exec: install-exec-am install-data: install-data-am @@ -201,7 +266,7 @@ installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - INSTALL_STRIP_FLAG=-s \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: @@ -209,7 +274,7 @@ clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -219,7 +284,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am - + -rm -f Makefile distclean-am: clean-am distclean-generic distclean-libtool dvi: dvi-am @@ -241,13 +306,21 @@ installcheck-am: maintainer-clean: maintainer-clean-am - + -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic mostlyclean-libtool +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + uninstall-am: uninstall-info-am uninstall-lisp1DATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ @@ -257,8 +330,8 @@ install-info-am install-lisp1DATA install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool uninstall uninstall-am uninstall-info-am \ - uninstall-lisp1DATA + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-lisp1DATA # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. --- aplus-fsf-4.22.1.orig/src/lisp.1/keyb.el +++ aplus-fsf-4.22.1/src/lisp.1/keyb.el @@ -26,6 +26,16 @@ (defvar a-key-string nil "Apl characters corresponding to raw keyboard input") +(defvar a-modifier-list '(super) + "List of modifiers of a key to send the Apl character.") + +(defun a-insert-map (akeydef) + (let ((key (car akeydef)) + (apl (cdr akeydef))) + (define-key a-minor-map (append a-modifier-list (list key)) 'a-self-insert) + (define-key a-minor-map (vector '(control c) key) 'a-self-insert) + (aset a-key-string (char-to-int key) apl))) + (defun a-self-insert (n) (interactive "p") (or n (setq n 1)) @@ -34,159 +44,151 @@ (setq last-command-char (aref a-key-string (char-to-int key))) (self-insert-command n))) -(defvar a-minor-map nil) -(if a-minor-map nil - (setq a-minor-map (make-sparse-keymap)) - (setq a-key-string (make-string 256 ?\000)) - (let ((n 32)) - (while (< n 256) - (aset a-key-string n n) - (setq n (1+ n)))) +(setq a-minor-map (make-sparse-keymap)) +(setq a-key-string (make-string 256 ?\000)) +(let ((n 32)) + (while (< n 256) + (aset a-key-string n n) + (setq n (1+ n)))) +(mapcar 'a-insert-map + '((?a . ?\301) ; A (2) + (?b . ?\302) ; B + (?c . ?\303) ; + (?d . ?\304) ; D + (?e . ?\305) ; + (?f . ?_) ; _ + (?g . ?\307) ; G + (?h . ?\310) ; H + (?i . ?\311) ; + (?j . ?\312) ; J + (?k . ?\') ; ' + (?l . ?\314) ; L + (?m . ?|) ; | + (?n . ?\316) ; N + (?o . ?\317) ; + (?p . ?\*) ; * + (?q . ?\?) ; ? + (?r . ?\322) ; R + (?s . ?\323) ; + (?t . ?\~) ; ~ + (?u . ?\325) ; + (?v . ?\326) ; V + (?w . ?\327) ; W (1) + (?x . ?\330) ; + (?y . ?\331) ; + (?z . ?\332) ; + (?1 . ?\241) ; ! + (?2 . ?\242) ; + (?3 . ?<) ; < + (?4 . ?\244) ; $ + (?5 . ?=) ; = + (?6 . ?\246) ; + (?7 . ?>) ; > + (?8 . ?\250) ; ( + (?9 . ?\251) ; ) + (?0 . ?^) ; ^ + (?- . ?\253) ; + + (?= . ?\337) ; + (?\\ . ?\334); + (?` . ?\376) ; ~ + (?, . ?\254) ; , + (?[ . ?\373) ; { + (?] . ?\375) ; } + (?\; . ?\333) ; [ + (?' . ?\335) ; + (?. . ?\334) ; + (?/ . ?\257) ; / + (?! . ?\340) ; ` + (?@ . ?\346) ; + (?# . ?\347) ; + (?$ . ?\350) ; h + (?% . ?\367) ; w (1) + (?^ . ?\364) ; t + (?& . ?\341) ; a (2) + (?* . ?\360) ; p + (?\( . ?\271); 9 + (?\) . ?\260); 0 + (?_ . ?!) ; ! + (?+ . ?\255) ; - + (?| . ?\374) ; | (check syntax table entry!) + (?O . ?\357) ; + (?J . ?\352) ; + (?F . ?\275) ; = + (?E . ?\345) ; e + (?I . ?\351) ; i + (?{ . ?\335) ; + (?} . ?\333) ; [ + (?S . ?\276) ; > + (?G . ?\347) ; + (?H . ?\350) ; h + (?L . ?\354) ; l + (?: . ?\274) ; + (?\" . ?\273); ; + (?C . ?\343) ; c + (?B . ?\342) ; b + (?N . ?\356) ; n + (?M . ?\315) ; + (?> . ?\256) ; . *** ??? + (?P . ?\263) ; 3 + (?Y . ?\264) ; 4 + (?Z . ?\372) ; z + (?Q . ?\277) ; + (?W . ?W) ; W + (?R . ?R) ; R + (?T . ?T) ; T + (?U . ?U) ; U + (?A . ?A) ; A + (?D . ?D) ; D + (?K . ?K) ; K + (?X . ?X) ; X + (?V . ?V) ; V + (?? . ?\?) ; ? + (?~ . ?~) ; ~ + (?< . ?<) ; < + (?\040 . ?\040) + ) ; end of translation table + ) ; end of mapcar + +; if we are running off of a tty, window-system is nil +; in such a case, we need to handle all those events that get passed +; as escape sequences +(if window-system nil + (global-unset-key "\C-h") + (global-set-key "\C-h" 'backward-delete-char) + (define-key esc-map "[" nil) + (define-key esc-map "O" nil) (mapcar #'(lambda (akeydef) (let ((key (car akeydef)) (apl (cdr akeydef))) - (define-key a-minor-map (list 'meta (- key 128)) 'a-self-insert) - (aset a-key-string (char-to-int key) apl))) - '((?\M-a . ?\301) ; A (2) - (?\M-b . ?\302) ; B - (?\M-c . ?\303) ; - (?\M-d . ?\304) ; D - (?\M-e . ?\305) ; - (?\M-f . ?_) ; _ - (?\M-g . ?\307) ; G - (?\M-h . ?\310) ; H - (?\M-i . ?\311) ; - (?\M-j . ?\312) ; J - (?\M-k . ?\') ; ' - (?\M-l . ?\314) ; L - (?\M-m . ?|) ; | - (?\M-n . ?\316) ; N - (?\M-o . ?\317) ; - (?\M-p . ?\*) ; * - (?\M-q . ?\?) ; ? - (?\M-r . ?\322) ; R - (?\M-s . ?\323) ; - (?\M-t . ?\~) ; ~ - (?\M-u . ?\325) ; - (?\M-v . ?\326) ; V - (?\M-w . ?\327) ; W (1) - (?\M-x . ?\330) ; - (?\M-y . ?\331) ; - (?\M-z . ?\332) ; - (?\M-1 . ?\241) ; ! - (?\M-2 . ?\242) ; - (?\M-3 . ?<) ; < - (?\M-4 . ?\244) ; $ - (?\M-5 . ?=) ; = - (?\M-6 . ?\246) ; - (?\M-7 . ?>) ; > - (?\M-8 . ?\250) ; ( - (?\M-9 . ?\251) ; ) - (?\M-0 . ?^) ; ^ - (?\M-- . ?\253) ; + - (?\M-= . ?\337) ; - (?\M-\\ . ?\334); - (?\M-` . ?\376) ; ~ - (?\M-, . ?\254) ; , - (?\M-[ . ?\373) ; { - (?\M-] . ?\375) ; } - (?\M-\; . ?\333) ; [ - (?\M-' . ?\335) ; - (?\M-. . ?\334) ; - (?\M-/ . ?\257) ; / - (?\M-! . ?\340) ; ` - (?\M-@ . ?\346) ; - (?\M-# . ?\347) ; - (?\M-$ . ?\350) ; h - (?\M-% . ?\367) ; w (1) - (?\M-^ . ?\364) ; t - (?\M-& . ?\341) ; a (2) - (?\M-* . ?\360) ; p - (?\M-\( . ?\271); 9 - (?\M-\) . ?\260); 0 - (?\M-_ . ?!) ; ! - (?\M-+ . ?\255) ; - - (?\M-| . ?\374) ; | (check syntax table entry!) - (?\M-O . ?\357) ; - (?\M-J . ?\352) ; - (?\M-F . ?\275) ; = - (?\M-E . ?\345) ; e - (?\M-I . ?\351) ; i - (?\M-{ . ?\335) ; - (?\M-} . ?\333) ; [ - (?\M-S . ?\276) ; > - (?\M-G . ?\347) ; - (?\M-H . ?\350) ; h - (?\M-L . ?\354) ; l - (?\M-: . ?\274) ; - (?\M-\" . ?\273); ; - (?\M-C . ?\343) ; c - (?\M-B . ?\342) ; b - (?\M-N . ?\356) ; n - (?\M-M . ?\315) ; - (?\M-> . ?\256) ; . *** ??? - (?\M-P . ?\263) ; 3 - (?\M-Y . ?\264) ; 4 - (?\M-Z . ?\372) ; z - (?\M-Q . ?\277) ; - (?\M-W . ?W) ; W - (?\M-R . ?R) ; R - (?\M-T . ?T) ; T - (?\M-U . ?U) ; U - (?\M-A . ?A) ; A - (?\M-D . ?D) ; D - (?\M-K . ?K) ; K - (?\M-X . ?X) ; X - (?\M-V . ?V) ; V - (?\M-? . ?\?) ; ? - (?\M-~ . ?~) ; ~ - (?\M-< . ?<) ; < - (?\M-\040 . ?\040) + (define-key esc-map key apl) + )) + '( + ("[224z" . a-send-region) ; f1 + ("[225z" . a-send-line) ; f2 + ("[226z" . a-send-func) ; f3 + ("[227z" . a-other-window) ; f4 + ("[228z" . delete-other-windows) ; f5 + ("[229z" . other-window-or-pop) ; f6 + ("[230z" . next-buffer) ; f7 + ("[231z" . previous-buffer) ; f8 + ("[232z" . enlarge-window) ; f9 + ("[233z" . shrink-window) ; f10 + ("[209z" . print-buffer) ; PrintScreen + ("[210z" . scroll-down-in-place) ; Scroll + ("[5z" . scroll-down) ; pgup + ("[216z" . scroll-down) ; pgup + ("[6z" . scroll-up) ; pgdn + ("[222z" . scroll-up) ; pgdn + ("[214z" . beginning-of-line) ; home + ("[220z" . end-of-line) ; end + ("[2z" . overwrite-mode) ; insert + ("OA" . previous-line) ; up-arrow + ("OB" . next-line) ; down-arrow + ("OC" . forward-char) ; right-arrow + ("OD" . backward-char) ; left-arrow ) ; end of translation table - ) ; end of mapcar - - ;; if we are running off of a tty, window-system is nil - ;; in such a case, we need to handle all those events that get passed - ;; as escape sequences - (if window-system nil - (global-unset-key "\C-h") - (global-set-key "\C-h" 'backward-delete-char) - (define-key esc-map "[" nil) - (define-key esc-map "O" nil) - (mapcar #'(lambda (akeydef) - (let ((key (car akeydef)) - (apl (cdr akeydef))) - (define-key esc-map key apl) - )) - '( - ("[224z" . a-send-region) ; f1 - ("[225z" . a-send-line) ; f2 - ("[226z" . a-send-func) ; f3 - ("[227z" . a-other-window) ; f4 - ("[228z" . delete-other-windows) ; f5 - ("[229z" . other-window-or-pop) ; f6 - ("[230z" . next-buffer) ; f7 - ("[231z" . previous-buffer) ; f8 - ("[232z" . enlarge-window) ; f9 - ("[233z" . shrink-window) ; f10 - ("[209z" . print-buffer) ; PrintScreen - ("[210z" . scroll-down-in-place) ; Scroll - ("[5z" . scroll-down) ; pgup - ("[216z" . scroll-down) ; pgup - ("[6z" . scroll-up) ; pgdn - ("[222z" . scroll-up) ; pgdn - ("[214z" . beginning-of-line) ; home - ("[220z" . end-of-line) ; end - ("[2z" . overwrite-mode) ; insert - ("OA" . previous-line) ; up-arrow - ("OB" . next-line) ; down-arrow - ("OC" . forward-char) ; right-arrow - ("OD" . backward-char) ; left-arrow - ) ; end of translation table - ) ; end of mapcar - ) ; end of if window-system nil -) ; end of if a-minor-map - + ) ; end of mapcar + ) ; end of if window-system nil (define-key a-minor-map "\C-c\C-a" 'a) (define-key a-minor-map "\C-c\C-r" 'a-send-region) (define-key a-minor-map "\C-c\C-l" 'a-send-line) @@ -205,9 +207,9 @@ (define-key a-mode-map "\C-c\C-o" 'a-kill-output) (define-key a-mode-map "\C-c\C-p" 'a-goto-last-input) (define-key a-mode-map "\C-c\C-m" 'a-recall-last-input) - + (if (not (assq 'a-minor minor-mode-alist)) - (setq minor-mode-alist (cons '(a-minor " A") minor-mode-alist))) + (setq minor-mode-alist (cons '(a-minor " A") minor-mode-alist))) (provide 'keyb) --- aplus-fsf-4.22.1.orig/src/lisp.1/.emacs +++ aplus-fsf-4.22.1/src/lisp.1/.emacs @@ -1,3 +1,3 @@ -(load "/usr/local/aplus-fsf-4.18/lisp_new/aplus") -;(load "/ms/dev/aplus/aplus/fsf/src/aplus-fsf-4.18/src/lisp.1/aplus") +(load "/usr/local/aplus-fsf-4.22/lisp_new/aplus") +;(load "/ms/dev/aplus/aplus/fsf/src/aplus-fsf-4.22/src/lisp.1/aplus") --- aplus-fsf-4.22.1.orig/src/MSTypes/MSObjectTypeVectorInlines.C +++ aplus-fsf-4.22.1/src/MSTypes/MSObjectTypeVectorInlines.C @@ -87,7 +87,7 @@ template INLINELINKAGE MSObjectVector MSObjectVector::operator[] (const MSBinaryVector & bVect_) const { - return compress (*this, bVect_); + return this->compress (*this, bVect_); } --- aplus-fsf-4.22.1.orig/src/MSTypes/MSObservableTree.C +++ aplus-fsf-4.22.1/src/MSTypes/MSObservableTree.C @@ -94,7 +94,7 @@ void MSObservableTree::removeSubtree(const MSTabularTreeCursor& cursor_) { MSTabularTreeCursor cursor2(cursor_); - unsigned long pos=position(cursor2); + unsigned long pos=this->position(cursor2); cursor2.setToParent(); MSTabularTree::removeSubtree(cursor_); if (cursor2.isValid()) changed(cursor2,pos,MSObservableTreeDelete); @@ -162,7 +162,7 @@ void MSObservableTree::replaceAt(MSTabularTreeCursor const& cursor_,Element const& element_) { MSTabularTree::replaceAt(cursor_,element_); - changed(cursor_,position(cursor_),MSObservableTreeAssign); + changed(cursor_,this->position(cursor_),MSObservableTreeAssign); } template @@ -170,10 +170,10 @@ { if (&tree_!=this) { - if (isRoot(cursor_)) copy(tree_); + if (this->isRoot(cursor_)) copy(tree_); else { - unsigned long pos=position(cursor_); + unsigned long pos=this->position(cursor_); MSTabularTreeCursor cursor=cursor_; cursor.setToParent(); MSTabularTree::removeSubtree(cursor_); @@ -199,7 +199,7 @@ template void MSObservableTree::elementChanged(MSTabularTreeCursor const& cursor_) { - changed(cursor_,position(cursor_),MSObservableTreeAssign); + changed(cursor_,this->position(cursor_),MSObservableTreeAssign); } template --- aplus-fsf-4.22.1.orig/src/MSTypes/MSFloat.C +++ aplus-fsf-4.22.1/src/MSTypes/MSFloat.C @@ -111,7 +111,8 @@ MSError::ErrorStatus MSFloat::internalSet(const char *pString_) { - char *np,buf[512]; + const char*np; + char buf[512]; _real=0.0; _flags=MSFloat::Set; // clear the Valid bit, i.e. isValid==MSFalse @@ -128,7 +129,7 @@ { return (MSError::BadReal); } // Disallow leading commas // Make sure we don't save too many characters after the decimal - char *decimal=strchr(pString_,'.'); + const char *decimal=strchr(pString_,'.'); if ((decimal!=0)&&(strlen(decimal+1)>MSRealMaximumLength)) { return (MSError::IntTooBig); } strcpy(buf,pString_); --- aplus-fsf-4.22.1.orig/src/MSTypes/MSTypeData.H +++ aplus-fsf-4.22.1/src/MSTypes/MSTypeData.H @@ -9,6 +9,7 @@ // /////////////////////////////////////////////////////////////////////////////// +#include #ifndef MSDefinesHEADER #include --- aplus-fsf-4.22.1.orig/src/MSTypes/MSBuiltinTypeVectorInlines.C +++ aplus-fsf-4.22.1/src/MSTypes/MSBuiltinTypeVectorInlines.C @@ -77,7 +77,7 @@ template INLINELINKAGE MSBuiltinVector MSBuiltinVector::operator[] (const MSBinaryVector & bVect_) const { - return compress (*this, bVect_); + return this->compress (*this, bVect_); } --- aplus-fsf-4.22.1.orig/src/MSTypes/MSUtil.C +++ aplus-fsf-4.22.1/src/MSTypes/MSUtil.C @@ -25,7 +25,7 @@ void MSUtil::comma(const char *fromBuffer_,char *toBuffer_,int size_) { int places,len,i,j; - char *cp; + const char *cp; if ((cp=strchr(fromBuffer_,'.'))!=NULL) { --- aplus-fsf-4.22.1.orig/src/MSGUI/Makefile.am +++ aplus-fsf-4.22.1/src/MSGUI/Makefile.am @@ -382,6 +382,8 @@ MSWidgetView.H\ MSWindow.H +libMSGUI_la_LIBADD = $(X_LIBS) + EXTRA_DIST = \ MSArrayViewInlines.C\ MSCompositeTextInlines.C\ --- aplus-fsf-4.22.1.orig/src/MSGUI/Makefile.in +++ aplus-fsf-4.22.1/src/MSGUI/Makefile.in @@ -466,6 +466,7 @@ MSWidgetView.H\ MSWindow.H +libMSGUI_la_LIBADD = $(X_LIBS) EXTRA_DIST = \ MSArrayViewInlines.C\ --- aplus-fsf-4.22.1.orig/src/cxs/s.+ +++ aplus-fsf-4.22.1/src/cxs/s.+ @@ -4206,6 +4206,8 @@ { kûsys.readmat{f0}; if (()½k) kûsys.readmat{f1}; + ã Remove comment lines. + kû(Ø'!'¨¡1Ù¡(' '¨¡<@1k)/¡<@1k)/k; zû13Õ@1 k; zûszÒz Ý ((z=TAB)/z)û' ' Ý zû,z Ý szûÒz; zû((z=' ')É@1Û0)÷@0 1 z; @@ -5958,8 +5960,8 @@ `sâ'DEFAULT_COLOR:bDefaultPixelValue{}'; `sâ'DEFAULT_FONT:bDefaultFontValue{}'; - s.COLOR_FILEû'/usr/local/X11/lib/rgb.txt'; - s.COLOR_FILE1û'/usr/local/X11R5/lib/rgb.txt'; + s.COLOR_FILEû'/etc/X11/rgb.txt'; + s.COLOR_FILE1û'/usr/share/X11/rgb.txt'; `sâ'COLOR_INFORMATION:color_information{COLOR_FILE;COLOR_FILE1}'; `sâ'COLOR_NAMES:0ØCOLOR_INFORMATION'; --- aplus-fsf-4.22.1.orig/src/main/Makefile.am +++ aplus-fsf-4.22.1/src/main/Makefile.am @@ -37,7 +37,8 @@ $(top_srcdir)/src/dap/libdap.la \ $(top_srcdir)/src/MSGUI/libMSGUI.la \ $(top_srcdir)/src/MSIPC/libMSIPC.la \ - $(top_srcdir)/src/MSTypes/libMSTypes.la + $(top_srcdir)/src/MSTypes/libMSTypes.la \ + $(X_LIBS) $(LIBS) aplus_LDFLAGS = \ -L$(top_srcdir)/src/IPC \ @@ -51,8 +52,7 @@ -L$(top_srcdir)/src/dap \ -L$(top_srcdir)/src/MSGUI \ -L$(top_srcdir)/src/MSIPC \ - -L$(top_srcdir)/src/MSTypes \ - $(X_LIBS) $(LIBS) + -L$(top_srcdir)/src/MSTypes install-exec-hook: mv $(DESTDIR)$(bindir)/aplus $(DESTDIR)$(bindir)/a+ --- aplus-fsf-4.22.1.orig/src/main/Makefile.in +++ aplus-fsf-4.22.1/src/main/Makefile.in @@ -122,7 +122,8 @@ $(top_srcdir)/src/dap/libdap.la \ $(top_srcdir)/src/MSGUI/libMSGUI.la \ $(top_srcdir)/src/MSIPC/libMSIPC.la \ - $(top_srcdir)/src/MSTypes/libMSTypes.la + $(top_srcdir)/src/MSTypes/libMSTypes.la \ + $(X_LIBS) $(LIBS) aplus_LDFLAGS = \ @@ -137,8 +138,7 @@ -L$(top_srcdir)/src/dap \ -L$(top_srcdir)/src/MSGUI \ -L$(top_srcdir)/src/MSIPC \ - -L$(top_srcdir)/src/MSTypes \ - $(X_LIBS) $(LIBS) + -L$(top_srcdir)/src/MSTypes subdir = src/main mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs @@ -449,7 +449,7 @@ rm -f $@;\ cat version.h.template | sed -e s/%RCVAL%/$(VERSION)/ \ -e s/%FNVAL%/$(OWNER_FULLNAME)/ \ - -e s@%IMDIRVAL%@$(prefix)@ >$@; + -e s@%IMDIRVAL%@$(libdir)@ >$@; FORCE: # Tell versions [3.59,3.63) of GNU make to not export all variables. --- aplus-fsf-4.22.1.orig/src/main/version.h +++ aplus-fsf-4.22.1/src/main/version.h @@ -12,5 +12,5 @@ /* external macro declarations */ #define RELEASE_CODE "4.22" #define OWNER_FULLNAME "" -#define IMDIR "/usr/local" +#define IMDIR "/usr/lib/aplus-fsf" #endif /* included_main_version_h */ --- aplus-fsf-4.22.1.orig/debian/aplus-fsf.install +++ aplus-fsf-4.22.1/debian/aplus-fsf.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin/a+ usr/bin +debian/tmp/usr/lib/aplus-fsf/*.so.[0-9].[0-9].[0-9] usr/lib/aplus-fsf +debian/tmp/usr/lib/aplus-fsf/*.so.[0-9] usr/lib/aplus-fsf +debian/tmp/usr/lib/aplus-fsf/*.+ usr/lib/aplus-fsf/lib --- aplus-fsf-4.22.1.orig/debian/rules +++ aplus-fsf-4.22.1/debian/rules @@ -0,0 +1,209 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +default: build + +autoinit: + ./bootstrap.sh + +clean-stamp: + rm -f configure-stamp build-stamp install-stamp \ + xfonts-kapl-stamp aplus-fsf-el-stamp aplus-fsf-doc-stamp \ + aplus-fsf-stamp aplus-fsf-dev-stamp + +clean: clean-stamp + dh_testdir + rm -f debian/buildinfo + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + rm -f print.ps + dh_clean +# See /usr/share/doc/autotools-dev/README.Debian.gz + -test -r /usr/share/misc/config.sub && \ + cp -f /usr/share/misc/config.sub config/config.sub + -test -r /usr/share/misc/config.guess && \ + cp -f /usr/share/misc/config.guess config/config.guess + +confflags = --prefix=/usr --libdir=/usr/lib/aplus-fsf + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +# see /usr/share/doc/autotools-dev/README.Debian +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build $(DEB_HOST_GNU_TYPE) +else + confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) +endif + + +configure: configure-stamp +configure-stamp: + dh_testdir + dh_buildinfo generate cat +# Add here commands to configure the package. + ./configure $(confflags) + touch $@ + +CFLAGS := -g -pipe +CXXFLAGS := -g -pipe +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 + CXXFLAGS += -O0 +else + CFLAGS += -O2 + CXXFLAGS += -O2 +endif +export CFLAGS +export CXXFLAGS +export LDFLAGS + +build: configure build-stamp +build-stamp: + dh_testdir + $(MAKE) + touch $@ + +# CURDIR is set by make +DESTDIR = $(CURDIR)/debian/tmp +export DESTDIR # so it gets passed to sub-makes + +install_ := install -o root -g root -p +install_data := install -o root -g root -m 644 -p +install_script := install -o root -g root -m 755 -p +install_program := install -o root -g root -m 755 -p +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + install_program += --strip +endif +inst_flags := INSTALL='$(install_)' +inst_flags += INSTALL_DATA='$(install_data)' +inst_flags += INSTALL_SCRIPT='$(install_script)' +inst_flags += INSTALL_PROGRAM='$(install_program)' + +# The install step can take quite a while, so use a stamp file for that to +# avoid redoing it unless necessary. +install: build install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_prep +# Install into DESTDIR with upstream's directory structure + $(MAKE) install $(inst_flags) + touch $@ + +binary: binary-indep binary-arch + +# Architecture-independent +binary-indep: xfonts-kapl aplus-fsf-el aplus-fsf-doc + +# Architecture-dependent +binary-arch: aplus-fsf aplus-fsf-dev + +xfonts-kapl: install xfonts-kapl-stamp +aplus-fsf-el: install aplus-fsf-el-stamp +aplus-fsf-doc: install aplus-fsf-doc-stamp +aplus-fsf: install aplus-fsf-stamp +aplus-fsf-dev: install aplus-fsf-dev-stamp + +export DH_OPTIONS + +%-stamp: DH_OPTIONS=-p$(@:%-stamp=%) + +xfonts-kapl-stamp: + dh_testdir + dh_testroot + rm -fr debian/xfonts-kapl/ debian/xfonts-kapl.*.debhelper + dh_installdirs +# Alias file must be .alias; dh_install cannot rename + cd $(DESTDIR)/usr/fonts/X11/pcf && cp -p Kapl.alias xfonts-kapl.alias + dh_install + dh_installdocs + dh_installchangelogs ChangeLog + dh_installxfonts + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +aplus-fsf-el-stamp: + dh_testdir + dh_testroot + rm -fr debian/aplus-fsf-el/ debian/aplus-fsf-el.*.debhelper + #dh_installdirs + #dh_install + dh_installdocs + #dh_installemacsen --flavor=xemacs21 + dh_installchangelogs ChangeLog + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +aplus-fsf-doc-stamp: + dh_testdir + dh_testroot + rm -fr debian/aplus-fsf-doc/ debian/aplus-fsf-doc.*.debhelper + dh_installdirs + dh_install + dh_installdocs + dh_installchangelogs ChangeLog + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +aplus-fsf-stamp: + dh_testdir + dh_testroot + rm -fr debian/aplus-fsf/ debian/aplus-fsf.*.debhelper + dh_installdirs + dh_install + dh_installdocs + dh_installexamples + dh_installmenu + dh_installman + dh_installchangelogs ChangeLog + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps -Xdebian/aplus-fsf/usr/lib/aplus-fsf -v -u-v $(DESTDIR)/../aplus-fsf/usr/bin/a+ + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +aplus-fsf-dev-stamp: + dh_testdir + dh_testroot + rm -fr debian/aplus-fsf-dev/ debian/aplus-fsf-dev.*.debhelper + dh_installdirs + dh_install + dh_installdocs + dh_installchangelogs ChangeLog + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + touch $@ + +.PHONY: configure build install binary-indep binary-arch binary clean \ +xfonts-kapl aplus-fsf-el aplus-fsf-doc aplus-fsf aplus-fsf-dev + +# Local Variables: +# compile-command: "cd .. && dpkg-buildpackage -uc -us" +# End: --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.emacsen-startup +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.emacsen-startup @@ -0,0 +1,35 @@ +;; +;; /etc/xemacs21/site-start.d/50aplus-fsf-el.el +;; +;; Copyright (C) 2002, Neil Roeth + +(let ((aplus-fsf-el-pkgdir (concat "/usr/share/" + (symbol-name debian-emacs-flavor) + "/site-lisp/aplus-fsf-el"))) + (if (file-exists-p aplus-fsf-el-pkgdir) + (progn + (debian-pkg-add-load-path-item aplus-fsf-el-pkgdir) + + ;; Following to override setting in aplus.el since load-path is + ;; properly set here on Debian systems + (defvar aplus-set-load-path nil) + + ;; Pressing F4 will load A+ then start A+ in a new process buffer. + (autoload 'a-other-window "aplus" + "Start A+ interpreter in an A+ process buffer") + (define-key global-map [f4] `a-other-window) + + ;; Loading an A+ file will load A+. + (autoload 'a-minor-mode "aplus" + "Minor mode for editing A+ code." t) + (defun change-assoc (key value alist) + "usage: (change-assoc KEY VALUE ALIST) +If ALIST contains KEY then replace the associated value with VALUE. +Otherwise, associate KEY and VALUE in the alist" + (let ((tuple (assoc key alist))) + (cond (tuple (setcdr tuple value)) + (t (nconc alist (list (cons key value))))))) + (change-assoc "\\.apl$" 'a-minor-mode auto-mode-alist) + (change-assoc "\\.a$" 'a-minor-mode auto-mode-alist) + (change-assoc "\\.\\+$" 'a-minor-mode auto-mode-alist) +))) --- aplus-fsf-4.22.1.orig/debian/xfonts-kapl.install +++ aplus-fsf-4.22.1/debian/xfonts-kapl.install @@ -0,0 +1,3 @@ +debian/tmp/usr/fonts/X11/pcf/xfonts-kapl.alias etc/X11/fonts/X11R7/misc +debian/tmp/usr/fonts/X11/pcf/*.pcf.gz usr/share/fonts/X11/misc +debian/tmp/usr/fonts/TrueType/KAPL.TTF usr/share/fonts/truetype/xfonts-kapl --- aplus-fsf-4.22.1.orig/debian/menu +++ aplus-fsf-4.22.1/debian/menu @@ -0,0 +1,2 @@ +?package(aplus-fsf):needs=text section=Applications/Programming\ + title="aplus-fsf" command="/usr/bin/a+" --- aplus-fsf-4.22.1.orig/debian/a+.1 +++ aplus-fsf-4.22.1/debian/a+.1 @@ -0,0 +1,36 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH A+ 1 "December 28, 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +a+ \- A+ interpreter +.SH SYNOPSIS +.B a+ +.RI [ files ] ... +.SH DESCRIPTION +This manual page documents briefly the +.B a+ +command. This manual page was written for the Debian GNU/Linux +distribution because the original program does not have a manual page. +Instead, it has documentation in HTML format; install the package +aplus-fsf-doc then open /usr/share/doc/aplus-fsf-doc/html/index.html. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +.SH AUTHOR +This manual page was written by Neil Roeth , +for the Debian GNU/Linux system (but may be used by others). --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.README.Debian +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.README.Debian @@ -0,0 +1,97 @@ +Version 4.18.8-3: A change in XFree 4.2 might cause some difficulties when +using XEmacs for A+ development. On a pc104 keyboard, the older X setup had +the keys labeled Alt as the Alt keysyms, and the keys labeled Windows as the +Meta keysyms, and XEmacs would use the Meta keys as its meta prefix keys. The +newer X setup still has the keys labeled Alt as the Alt keysyms, but the keys +labeled Windows are now the Super keysyms. XEmacs uses the Alt keysyms as its +meta prefix keys. For this version of aplus-fsf-el, I made the A+ modifier +key (defined in keyb.el) the Super key so that A+ will work with the standard +setup, without interfering with the use of the Meta key by XEmacs for other +purposes. This means that if you might notice that XEmacs has switched which +key it recognizes as its meta prefix (not an A+ change, an XFree86 change) and +A+ has switched which key it recognizes as its modifier key (an A+ change to +leave the default behavior of XEmacs untouched). + +On a pc101 keyboard (those with just two Alt keys, no Windows or other special +keys), you might have to change the definitions of the Alt keys so that one is +the Alt key and the other is the Super key. One way to do this is via the +setxkbmap(1) or xmodmap(1) utilities. + +Another issue is that your window manager might grab some keystrokes before +they get to XEmacs. I found that IceWM will grab the Super- keys, where + is any key in the top (number) row of the keyboard. Since these keys are +used by A+, it becomes impossible to enter those characters. Again, use the +setxkbmap(1) or xmodmap(1) utilities to solve this. + + +A+ modifications: + +You can also define a variable in XEmacs to make something other than the +Super key. Do the following in you XEmacs initialization file (~/.emacs): + +(defvar a-modifier-list '(hyper)) + +The default configuration sets it to '(super), but you can set it to alt, +meta, super or hyper, to correspond to your X setup. It appears that if you +have nothing but Alt keys, though, XEmacs will grab them, and even if you set +the a-modifier-list to be '(alt), it will not work. It's better to figure out +via xmodmap how to set one key to be the Super keysym. + + +An example: + +I used the xev(1) program to determine that the keycode of my left Alt key was +decimal 64, or hex 0x40, and of the right Alt key decimal 113, or hex 0x71. +So, to make the left Alt key the Alt keysym and the right Alt key the Super +keysym, I created a file ~/.Xmodmap with these lines: + +clear mod1 +keycode 0x40 = Alt_L +keycode 0x71 = Super_R +add mod1 = Super_R +add mod3 = Alt_L + +then XEmacs treated the left Alt as its meta prefix key, yet I was able to use +the right Alt to input A+ characters. + + +Another example: + +This command will swap the Alt and Windows keys from their regular +definitions, so that the Windows keys become the Meta keys, and the Alt keys +are Alt keys: + +setxkbmap -option altwin:meta_win + +If you explicity define a key as a Meta keysym, XEmacs will pick that up as it +meta prefix key. This is a case where you would also define the +a-modifier-list (see above) to be '(alt). + + +XEmacs workarounds: + +Alternatively, you can use the following two-keystroke sequence: + + C-c + +where is a character on the APL Union keyboard. +See the keyboard table: /usr/share/doc/aplus-fsf-doc/html/keyboard.html + +Examples: + + C-c s is the "ceiling" operator + C-c C (uppercase C) is the "lamp" (comment) character + C-c [ is "assignment" ( <- ) + +These keys are active whenever `a-minor-mode' is active, which by +default is when you are inside the A+ interactive buffer, or are in +buffer containing a *.a file. + +If all else fails and you have to take over whatever XEmacs wants to use as +its meta prefix key in order to be able to enter A+ characters (unlikely) then +note that the Meta prefix in XEmacs can be obtained not only by an explicit +Meta key, but also by using the Esc key, or the C-[ combination. I.e., Esc-x +is the same as M-x, as is C-[ x. It's a little more cumbersome, but it works +in a pinch. + + -- Neil Roeth , Sun, 30 Mar 2008 18:19:09 -0400 --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.dirs +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.dirs @@ -0,0 +1 @@ +usr/share/emacs/site-lisp/aplus-fsf-el --- aplus-fsf-4.22.1.orig/debian/doc-base.aplus-fsf-doc +++ aplus-fsf-4.22.1/debian/doc-base.aplus-fsf-doc @@ -0,0 +1,9 @@ +Document: aplus-fsf-doc +Title: A+ Manual +Author: help@aplusdev.org +Abstract: Reference manual for the A+ programming language. +Section: Programming + +Format: HTML +Index: /usr/share/doc/aplus-fsf-doc/html/index.html +Files: /usr/share/doc/aplus-fsf-doc/html/*.html --- aplus-fsf-4.22.1.orig/debian/changelog +++ aplus-fsf-4.22.1/debian/changelog @@ -0,0 +1,243 @@ +aplus-fsf (4.22.1-6) unstable; urgency=low + + * Install docs in aplus-fsf-el so copyright is included. (Closes: + #683938). + * Corrected aplus-fsf-el.NEWS format. + + -- Neil Roeth Sun, 05 Aug 2012 13:07:00 -0400 + +aplus-fsf (4.22.1-5) unstable; urgency=low + + * Made aplus-fsf-el inoperative because it depends upon XEmacs 21 which + is removed from Debian. Files can still be edited with vi in an + xterm, and the interpreter is still fully functional. + + -- Neil Roeth Fri, 03 Aug 2012 20:04:08 -0400 + +aplus-fsf (4.22.1-4.2) unstable; urgency=low + + * Non maintainer upload. + * Fix build failure with GCC 4.7. Closes: #674316. + + -- Matthias Klose Wed, 30 May 2012 12:50:41 +0000 + +aplus-fsf (4.22.1-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: ../MSTypes/MSTypeData.H:54:23: error: declaration of + 'operator new' as non-function": add patch from Ubuntu / Andreas Moog: + - src/main/Makefile.am/in: Fix order of arguments to allow building + with --as-needed. + - src/MSGUI/Makefile.am/in: Include X11 libs when linking + - src/MSTypes/MSTypeData.H: Add to headers (LP: #766003) + (Closes: #625102) + + -- gregor herrmann Thu, 08 Dec 2011 14:56:21 +0100 + +aplus-fsf (4.22.1-4) unstable; urgency=low + + * Fix FTBFS with changes to MSFloat.C and MSUtil.C. (Closes: #560446). + * Updated standards version to 3.8.3 (no changes necessary). + + -- Neil Roeth Mon, 28 Dec 2009 00:23:44 -0500 + +aplus-fsf (4.22.1-3) unstable; urgency=low + + * Now put updated config.{sub,guess} in the proper location. + (Closes: #536428). + * Removed unnecessary debian/xfonts-kapl.{postinst,prerm}. + * Changed dh_clean -k to dh_prep in debian/rules. + * Updated standards version to 3.8.2 (no changes). + * Removed unnecessary call to dh_makeshlibs that caused lintian error + about unnecessary call to ldconfig. + * Fixed file location for rgb.txt and fixed method that reads it to + handle comments properly. + + -- Neil Roeth Mon, 20 Jul 2009 22:38:10 -0400 + +aplus-fsf (4.22.1-2) unstable; urgency=low + + * Rebuild to get up to date config.{sub,guess}. (Closes: #535728). + + -- Neil Roeth Sat, 04 Jul 2009 20:00:08 -0400 + +aplus-fsf (4.22.1-1) unstable; urgency=low + + * New upstream release. + - Fixes errors on amd64 platform. (Closes: #468131) + - Also fixes "Font problems in aplus-fsf in Debian-40r0-amd64" which I + believe is a 64 bit problem, not a font problem. (Closes: #422970) + * Fixed "aplus-fsf: bashism in debian/rules". (Closes: #472909) + * Added patch from Stephen Ma for "Entering APL characters via C-c + prefix". (Closes: #413028) + * Moved dyld'ed shared objects to /usr/lib/aplus-fsf. They are used only + by the A+ binary. Moved system A+ scripts to /usr/lib/aplus-fsf/lib. + * debian/rules: Do not ignore errors in make distclean. + * debian/rules: Incremented debhelper compatibility version to 6. + + -- Neil Roeth Mon, 07 Apr 2008 23:04:32 -0400 + +aplus-fsf (4.20.2-5) unstable; urgency=medium + + * Move xfonts-kapl.postrm to .prerm, it depends on fc-cache which could + get removed before this package, making the removal of xfonts-kapl + fail. Thanks to Lucas Nussbaum. (closes: #398832) + + -- Neil Roeth Sat, 18 Nov 2006 09:23:17 -0500 + +aplus-fsf (4.20.2-4) unstable; urgency=low + + * "FTBFS with G++ 4.1: cannot convert MSObjectVector to int" + Thanks to Martin Michlmayr, and to Ben Hutchings for supplying the + patches. (closes: #357770) + * "xfonts-kapl: X fonts transition" Moved fonts to /usr/share/fonts and + xfonts-kapl.alias to /etc/X11/fonts/X11R7, thanks to Joey + Hess. (closes: #362387) + + -- Neil Roeth Wed, 19 Apr 2006 23:11:51 -0400 + +aplus-fsf (4.20.2-3) unstable; urgency=low + + * Use KAPL.TTF font so help is viewable in web browsers. + + -- Neil Roeth Sat, 7 Jan 2006 15:43:15 -0500 + +aplus-fsf (4.20.2-2) unstable; urgency=low + + * Make tr64() global instead of local to avoid FTBFS on 64 bit machines. + * Added stdio.h and string.h to avoid warnings. + + -- Neil Roeth Fri, 2 Sep 2005 21:36:16 -0400 + +aplus-fsf (4.20.2-1) unstable; urgency=low + + * New upstream release + - Incorporates my changes to compile under g++ 4.0. + - Adds new scripts directory with example scripts. + + -- Neil Roeth Mon, 29 Aug 2005 21:07:14 -0400 + +aplus-fsf (4.18.8-12) unstable; urgency=low + + * Apply patch from Matt Kraai to fix FTBFS. (closes: #318361) + * Remove aplus-fsf.postinst which ran tests. (closes: #301907) + * Updated libtool to 1.5.6. + + -- Neil Roeth Sun, 7 Aug 2005 07:48:01 -0400 + +aplus-fsf (4.18.8-11) unstable; urgency=low + + * Added include of errno.h in src/cxsys/sfe.c to avoid problems running + with 2.6 kernels. (closes: #230879) + * Applied patch supplied by Andreas Jochens for multiple files to allow + compiling under gcc 3.4 and 4.0 - "an explicit specialization must be + preceded by 'template <>'" (closes: #264679, #285130) + * Added dh_buildinfo to debian/rules. + + -- Neil Roeth Tue, 21 Dec 2004 07:41:06 -0500 + +aplus-fsf (4.18.8-10) unstable; urgency=low + + * Moved debhelper compatibility level from d/rules to d/compat. + * Added autoinit target to d/rules to run autotools script. + * Removed gruesome sed hack to get libtool to use g++ for linking; new + libtool 1.5 does this properly. + * Added AM_MAINTAINER_MODE to configure.in; it's a more common way to + handle timestamp problems than the method introduced in 4.18.8-7. + * Removed build dependency on gcc 3.2 (formerly needed for some + platforms). + * Cleaned up d/rules a bit more by using target-specific DH_OPTIONS. + * Added the description of A+ to the aplus-fsf-doc package extended + description, modified some other descriptions to make it more clear + which packages to install for the run-time vs. development + environments. (Would have closed 209425). + * Updated to policy 3.6.1 (no changes). + * Fixed emacs install/remove scripts so that upgrades no longer blow + away A+ scripts. + + -- Neil Roeth Wed, 8 Oct 2003 21:54:42 -0400 + +aplus-fsf (4.18.8-9) unstable; urgency=low + + * Added testing for g++ 3.3 headers to configure.in and use of the + resulting #defines in the code instead of previous ad hoc method. + * Handle noopt and nostrip DEB_BUILD_OPTIONS as recommended by policy. + + -- Neil Roeth Wed, 16 Jul 2003 18:33:53 -0400 + +aplus-fsf (4.18.8-8) unstable; urgency=low + + * Fix auto-mode-alist modification in startup code of aplus-fsf-el to + use a-minor-mode, not a-mode. + * Fix startup to check for existence of aplus-fsf-el package, to avoid + error if removed but not purged. + * Changes to allow compiling with g++ 3.3 (closes: #196240) + - replaced deprecated headers with newer equivalents + - disambiguated definitions of xAxis() in AplusGUI/AplusTrace.[CH] + - resolved int/unsigned incompatibilities + * Force libtool to use g++ for linking so that stdc++ libraries are + linked in. + + -- Neil Roeth Wed, 11 Jun 2003 18:29:56 -0400 + +aplus-fsf (4.18.8-7) unstable; urgency=low + + * Fixed timestamp bug that caused FTBFS on m68k and arm. + + -- Neil Roeth Sat, 19 Apr 2003 21:19:58 -0400 + +aplus-fsf (4.18.8-6) unstable; urgency=low + + * Revamped the build process, making better use of debhelper tools. + + -- Neil Roeth Tue, 25 Mar 2003 21:56:59 -0500 + +aplus-fsf (4.18.8-5) unstable; urgency=low + + * Fixed broken test for arm introduced in -4. + + * Handled race condition that caused Makefile.in to be unnecessarily + rebuilt by saving timestamps of all files, and putting that timestamp + back in the configure-stamp step. + + -- Neil Roeth Sat, 15 Mar 2003 21:16:14 -0500 + +aplus-fsf (4.18.8-4) unstable; urgency=low + + * Skip FP_INEXACT for arm, not available. + + * Made architecture any. Closes: #176314 + + -- Neil Roeth Mon, 3 Mar 2003 21:59:17 -0500 + +aplus-fsf (4.18.8-3) unstable; urgency=low + + * Added test run (fsftest.+) to aplus-fsf.postinst. + + * Changes to allow compiling with g++-3.2, will change Build-Depends and + rules to reflect that when it is available on all architectures that + aplus-fsf depends on. Closes: #166887 + + * Changed architecture of aplus-fsf-dev meta package to same as + aplus-fsf, upon which it depends. + + * Reverted aplus-fsf-el back to architecture all, because + xemacs21-nomule is supposed to be available there. + + -- Neil Roeth Wed, 6 Nov 2002 22:20:15 -0500 + +aplus-fsf (4.18.8-2) unstable; urgency=low + + * Excluded arm mips mipsel from aplus-fsf (FTBFS). + + * Excluded hppa m68k from aplus-fsf-el, depends on xemacs21-nomule, + apparently not available on those. + + -- Neil Roeth Thu, 24 Oct 2002 22:21:51 -0400 + +aplus-fsf (4.18.8-1) unstable; urgency=low + + * Initial Release. + + -- Neil Roeth Wed, 20 Mar 2002 23:02:00 -0500 + --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.emacsen-install +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.emacsen-install @@ -0,0 +1,35 @@ +#! /bin/sh -e +# /usr/lib/emacsen-common/packages/install/aplus-fsf-el + +# Written by Neil Roeth , borrowing heavily +# from the install scripts for dpkg-dev-el by Jim Van Zandt +# . + +FLAVOR=$1 +PACKAGE=aplus-fsf-el + +if [ "${FLAVOR}" != "xemacs21" ]; then exit 0; fi + +echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR} + +FLAGS="-no-site-file -q -batch -l path.el -f batch-byte-compile" + +ELDIR=/usr/share/emacs/site-lisp/${PACKAGE} +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} +[ -d $ELCDIR ] || mkdir -p $ELCDIR + +install -m 755 -d ${ELDIR} +install -m 755 -d ${ELCDIR} + +cd ${ELDIR} +FILES=`echo *.el` +cp ${FILES} ${ELCDIR} +cd ${ELCDIR} + +cat << EOF > path.el +(setq load-path (cons "." load-path) byte-compile-warnings nil) +EOF +${FLAVOR} ${FLAGS} ${FILES} +rm -f ${FILES} path.el + +exit 0 --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-doc.install +++ aplus-fsf-4.22.1/debian/aplus-fsf-doc.install @@ -0,0 +1,4 @@ +debian/tmp/usr/doc/{html,tutorials} usr/share/doc/aplus-fsf-doc +debian/tmp/usr/app-defaults/* usr/share/doc/aplus-fsf-doc/app-defaults +debian/tmp/usr/contrib/* usr/share/doc/aplus-fsf-doc/contrib +debian/tmp/usr/scripts/* usr/share/doc/aplus-fsf-doc/scripts --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-doc.dirs +++ aplus-fsf-4.22.1/debian/aplus-fsf-doc.dirs @@ -0,0 +1,4 @@ +usr/share/doc/aplus-fsf-doc +usr/share/doc/aplus-fsf-doc/app-defaults +usr/share/doc/aplus-fsf-doc/contrib +usr/share/doc/aplus-fsf-doc/scripts --- aplus-fsf-4.22.1.orig/debian/copyright +++ aplus-fsf-4.22.1/debian/copyright @@ -0,0 +1,11 @@ +This package created by Neil Roeth Wed, 20 Mar 2002. + +A+ and the A+ Reference Manual are Copyright 1995-2008 Morgan Stanley Dean +Witter & Co. They are distributed under the GNU General Public License and +the GNU Free Documentation License and are available from +http://www.aplusdev.org/. + +On Debian systems, the complete text of the GNU General Public +License can be found in /usr/share/common-licenses/GPL file. + +Questions, comments, etc. may be sent to help@aplusdev.org. --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.emacsen-remove +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.emacsen-remove @@ -0,0 +1,11 @@ +#!/bin/sh -e +# /usr/lib/emacsen-common/packages/remove/aplus-fsf-el + +FLAVOR=$1 +PACKAGE=aplus-fsf-el +ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE} + +if [ "${FLAVOR}" = "xemacs21" ]; then + echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR} + rm -rf $ELCDIR +fi --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.NEWS +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.NEWS @@ -0,0 +1,10 @@ +aplus-fsf (4.22.1-6) unstable; urgency=low + + The aplus-fsf-el package has been made inoperative because the XEmacs + package upon which it dependes has been removed from Debian. The + shell of the package remains in case XEmacs is resurrected or A+ can + be made to work with FSF Emacs. As an alternative, you can view and + edit A+ files in an xterm using the xfonts-kapl package. + + -- Neil Roeth Sun, 05 Aug 2012 13:05:29 -0400 + --- aplus-fsf-4.22.1.orig/debian/compat +++ aplus-fsf-4.22.1/debian/compat @@ -0,0 +1 @@ +7 --- aplus-fsf-4.22.1.orig/debian/control +++ aplus-fsf-4.22.1/debian/control @@ -0,0 +1,88 @@ +Source: aplus-fsf +Section: interpreters +Priority: optional +Maintainer: Neil Roeth +Build-Depends: debhelper (>= 7.0.0), autotools-dev, libx11-dev, libxt-dev, + dh-buildinfo +Standards-Version: 3.8.3 + +Package: aplus-fsf-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Recommends: xfonts-kapl +Description: A+ programming language documentation + This package contains the HTML documentation and examples for the A+ + programming language and development environment. See the package aplus-fsf + for the run-time environment, and aplus-fsf-dev for the development + environment. + +Package: xfonts-kapl +Section: fonts +Architecture: all +Depends: fontconfig, ${misc:Depends} +Description: APL fonts for A+ development + The A+ programming language development environment requires these APL fonts + to properly display A+ code in an XTerm, XEmacs or a web browser. They are + not required to run an A+ program. + +Package: aplus-fsf-el +Section: lisp +Architecture: all +Depends: ${misc:Depends} +Description: XEmacs lisp for A+ development + This package contains the XEmacs lisp required for the development of A+ + programs. It does the key bindings, sets the font properly, and binds some + function keys. The complete A+ development environment is provided by the + aplus-fsf-dev package. + . + To load A+ from XEmacs, load a file with extension .apl, .a or .+, or + use the command 'M-x a-mode'. Or, press F4 to start the A+ interpreter. + . + See /usr/share/doc/README.Debian.gz if you have trouble entering the special + A+ characters in XEmacs. + . + This package is now an empty dummy package because XEmacs is no longer + available. If that changes, this package will be resurrected. + +Package: aplus-fsf +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: A+ programming language run-time environment + A+ is a powerful and efficient programming language. It is freely + available under the GNU General Public License. It embodies a rich set + of functions and operators, a modern graphical user interface with + many widgets and automatic synchronization of widgets and variables, + asynchronous execution of functions associated with variables and + events, dynamic loading of user compiled subroutines, and many other + features. Execution is by a rather efficient interpreter. A+ was + created at Morgan Stanley. Primarily used in a + computationally-intensive business environment, many critical + applications written in A+ have withstood the demands of real world + developers over many years. Written in an interpreted language, A+ + applications tend to be portable. + . + This package contains the binaries and libraries needed to run A+ programs. + The A+ development environment is provided by the aplus-fsf-dev package. + +Package: aplus-fsf-dev +Section: devel +Architecture: any +Depends: aplus-fsf, aplus-fsf-el, aplus-fsf-doc, ${misc:Depends} +Recommends: xfonts-kapl +Description: A+ programming language development environment + A+ is a powerful and efficient programming language. It is freely + available under the GNU General Public License. It embodies a rich set + of functions and operators, a modern graphical user interface with + many widgets and automatic synchronization of widgets and variables, + asynchronous execution of functions associated with variables and + events, dynamic loading of user compiled subroutines, and many other + features. Execution is by a rather efficient interpreter. A+ was + created at Morgan Stanley. Primarily used in a + computationally-intensive business environment, many critical + applications written in A+ have withstood the demands of real world + developers over many years. Written in an interpreted language, A+ + applications tend to be portable. + . + This is a metapackage that provides a complete A+ development environment. + The A+ run-time environment is provided by the aplus-fsf package. --- aplus-fsf-4.22.1.orig/debian/xfonts-kapl.dirs +++ aplus-fsf-4.22.1/debian/xfonts-kapl.dirs @@ -0,0 +1,3 @@ +etc/X11/fonts/X11R7/misc +usr/share/fonts/X11/misc +usr/share/fonts/truetype/xfonts-kapl --- aplus-fsf-4.22.1.orig/debian/aplus-fsf.manpages +++ aplus-fsf-4.22.1/debian/aplus-fsf.manpages @@ -0,0 +1 @@ +debian/a+.1 --- aplus-fsf-4.22.1.orig/debian/aplus-fsf.dirs +++ aplus-fsf-4.22.1/debian/aplus-fsf.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/lib/aplus-fsf/lib --- aplus-fsf-4.22.1.orig/debian/aplus-fsf-el.install +++ aplus-fsf-4.22.1/debian/aplus-fsf-el.install @@ -0,0 +1 @@ +debian/tmp/usr/lisp.1/{a-font,a,aplus,keyb,xa}.el usr/share/emacs/site-lisp/aplus-fsf-el