[Pkg-lirc-changes] lirc ChangeLog config.guess config.sub
setup-driver.sh setup.data setup.sh
Thomas Schmidt
tschmidt at haydn.debian.org
Sun Jul 30 16:41:03 UTC 2006
Update of /cvsroot/pkg-lirc/lirc
In directory haydn:/tmp/cvs-serv13392
Modified Files:
ChangeLog config.guess config.sub setup-driver.sh setup.data
setup.sh
Log Message:
Merge differences between the sourcepackages in the archive and the repository
Index: setup-driver.sh
===================================================================
RCS file: /cvsroot/pkg-lirc/lirc/setup-driver.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- setup-driver.sh 27 Mar 2005 20:59:51 -0000 1.1.1.1
+++ setup-driver.sh 31 Mar 2005 09:37:18 -0000 1.2
@@ -25,8 +25,8 @@
--menu "$CONFIG_DRIVER_TEXT" 10 74 3 \
\
1 "Simple IR diode (EXPERIMENTAL)" \
- 2 "IR receiver IC connected to auido input (EXPERIMENTAL)" \
- 3 "IR receiver IC connected to auido input using ALSA (EXPERIMENTAL)" 2> $TEMP
+ 2 "IR receiver IC connected to audio input (EXPERIMENTAL)" \
+ 3 "IR receiver IC connected to audio input using ALSA (EXPERIMENTAL)" 2> $TEMP
if test "$?" = "0"; then
{
set `cat $TEMP`
Index: config.sub
===================================================================
RCS file: /cvsroot/pkg-lirc/lirc/config.sub,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- config.sub 27 Mar 2005 20:59:46 -0000 1.1.1.1
+++ config.sub 31 Mar 2005 09:37:18 -0000 1.2
@@ -1,9 +1,9 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2002-03-07'
+timestamp='2004-11-30'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -70,7 +70,7 @@
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
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -118,7 +118,8 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -144,7 +145,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -228,31 +229,45 @@
| a29k \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| c4x | clipper \
- | d10v | d30v | dsp16xx \
- | fr30 \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
- | m32r | m68000 | m68k | m88k | mcore \
- | mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
- | mips64vr4100 | mips64vr4100el | mips64vr4300 \
- | mips64vr4300el | mips64vr5000 | mips64vr5000el \
- | mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
- | mipsisa32 | mipsisa64 \
+ | ip2k | iq2000 \
+ | m32r | m32rle | m68000 | m68k | m88k | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | msp430 \
| ns16k | ns32k \
| openrisc | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
| strongarm \
- | tahoe | thumb | tic80 | tron \
+ | tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -281,38 +296,55 @@
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
- | arm-* | armbe-* | armle-* | armv*-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \
- | c[123]* | c30-* | [cjt]90-* | c54x-* \
- | clipper-* | cydra-* \
- | d10v-* | d30v-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | fx80-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
- | m32r-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
- | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
- | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
- | mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | msp430-* \
| none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -332,6 +364,9 @@
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -346,6 +381,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
@@ -405,12 +446,27 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-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
;;
@@ -433,6 +489,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
@@ -611,10 +671,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
@@ -706,6 +762,10 @@
basic_machine=or32-unknown
os=-coff
;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
@@ -728,49 +788,55 @@
pbb)
basic_machine=m68k-tti
;;
- pc532 | pc532-*)
+ pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
- pentiumpro | p6 | 6x86 | athlon)
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
basic_machine=i686-pc
;;
- pentiumii | pentium2)
+ pentiumii | pentium2 | pentiumiii | pentium3)
basic_machine=i686-pc
;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
pentiumpro-* | p6-* | 6x86-* | athlon-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-*)
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pn)
basic_machine=pn-gould
;;
power) basic_machine=power-ibm
;;
ppc) basic_machine=powerpc-unknown
- ;;
+ ;;
ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppcle | powerpclittle | ppc-le | powerpc-little)
basic_machine=powerpcle-unknown
- ;;
+ ;;
ppcle-* | powerpclittle-*)
basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64) basic_machine=powerpc64-unknown
- ;;
+ ;;
ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
ppc64le | powerpc64little | ppc64-le | powerpc64-little)
basic_machine=powerpc64le-unknown
- ;;
+ ;;
ppc64le-* | powerpc64little-*)
basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -801,6 +867,16 @@
basic_machine=a29k-amd
os=-udi
;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
sequent)
basic_machine=i386-sequent
;;
@@ -808,6 +884,9 @@
basic_machine=sh-hitachi
os=-hms
;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
sparclite-wrs | simso-wrs)
basic_machine=sparclite-wrs
os=-vxworks
@@ -866,7 +945,7 @@
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
- sv1)
+ sv1)
basic_machine=sv1-cray
os=-unicos
;;
@@ -874,10 +953,6 @@
basic_machine=i386-sequent
os=-dynix
;;
- t3d)
- basic_machine=alpha-cray
- os=-unicos
- ;;
t3e)
basic_machine=alphaev5-cray
os=-unicos
@@ -890,6 +965,14 @@
basic_machine=tic54x-unknown
os=-coff
;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
@@ -903,6 +986,10 @@
tower | tower-32)
basic_machine=m68k-ncr
;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
udi29k)
basic_machine=a29k-amd
os=-udi
@@ -924,8 +1011,8 @@
os=-vms
;;
vpp*|vx|vx-*)
- basic_machine=f301-fujitsu
- ;;
+ basic_machine=f301-fujitsu
+ ;;
vxworks960)
basic_machine=i960-wrs
os=-vxworks
@@ -946,11 +1033,11 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
- windows32)
- basic_machine=i386-pc
- os=-windows32-msvcrt
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
;;
- xps | xps100)
+ xps | xps100)
basic_machine=xps100-honeywell
;;
ymp)
@@ -980,6 +1067,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -996,16 +1086,16 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh3eb | sh4eb)
+ sh3 | sh4 | 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)
basic_machine=sparc-sun
;;
- cydra)
+ cydra)
basic_machine=cydra-cydrome
;;
orion)
@@ -1020,10 +1110,6 @@
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
- c4x*)
- basic_machine=c4x-none
- os=-coff
- ;;
*-unknown)
# Make sure to match an already-canonicalized machine name.
;;
@@ -1079,18 +1165,20 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
+ | -mingw32* | -linux-gnu* | -linux-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*)
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1102,8 +1190,10 @@
;;
esac
;;
+ -nto-qnx*)
+ ;;
-nto*)
- os=-nto-qnx
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
| -windows* | -osx | -abug | -netware* | -os9* | -beos* \
@@ -1112,6 +1202,9 @@
-mac*)
os=`echo $os | sed -e 's|mac|macos|'`
;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
@@ -1124,6 +1217,9 @@
-opened*)
os=-openedition
;;
+ -os400*)
+ os=-os400
+ ;;
-wince*)
os=-wince
;;
@@ -1145,6 +1241,9 @@
-atheos*)
os=-atheos
;;
+ -syllable*)
+ os=-syllable
+ ;;
-386bsd)
os=-bsd
;;
@@ -1155,7 +1254,7 @@
os=-rtmk-nova
;;
-ns2 )
- os=-nextstep2
+ os=-nextstep2
;;
-nsk*)
os=-nsk
@@ -1167,6 +1266,9 @@
-sinix*)
os=-sysv4
;;
+ -tpf*)
+ os=-tpf
+ ;;
-triton*)
os=-sysv3
;;
@@ -1194,8 +1296,17 @@
-xenix)
os=-xenix
;;
- -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- os=-mint
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
;;
-none)
;;
@@ -1228,11 +1339,14 @@
arm*-semi)
os=-aout
;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
;;
- pdp11-*)
+ pdp11-*)
os=-none
;;
*-dec | vax-*)
@@ -1274,6 +1388,9 @@
*-ibm)
os=-aix
;;
+ *-knuth)
+ os=-mmixware
+ ;;
*-wec)
os=-proelf
;;
@@ -1325,19 +1442,19 @@
*-next)
os=-nextstep3
;;
- *-gould)
+ *-gould)
os=-sysv
;;
- *-highlevel)
+ *-highlevel)
os=-bsd
;;
*-encore)
os=-bsd
;;
- *-sgi)
+ *-sgi)
os=-irix
;;
- *-siemens)
+ *-siemens)
os=-sysv4
;;
*-masscomp)
@@ -1406,10 +1523,16 @@
-mvs* | -opened*)
vendor=ibm
;;
+ -os400*)
+ vendor=ibm
+ ;;
-ptx*)
vendor=sequent
;;
- -vxsim* | -vxworks*)
+ -tpf*)
+ vendor=ibm
+ ;;
+ -vxsim* | -vxworks* | -windiss*)
vendor=wrs
;;
-aux*)
Index: config.guess
===================================================================
RCS file: /cvsroot/pkg-lirc/lirc/config.guess,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- config.guess 27 Mar 2005 20:59:46 -0000 1.1.1.1
+++ config.guess 31 Mar 2005 09:37:18 -0000 1.2
@@ -1,9 +1,9 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-timestamp='2002-03-20'
+timestamp='2004-11-12'
# 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
@@ -53,7 +53,7 @@
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
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -88,30 +88,42 @@
exit 1
fi
+trap 'exit 1' 1 2 15
-dummy=dummy-$$
-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
-# CC_FOR_BUILD -- compiler used by this script.
# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
# use `HOST_CC' if defined, but it is deprecated.
-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,) echo "int dummy(){}" > $dummy.c ;
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
for c in cc gcc c89 c99 ; do
- ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
- if test $? = 0 ; then
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
CC_FOR_BUILD="$c"; break ;
fi ;
done ;
- rm -f $dummy.c $dummy.o $dummy.rel ;
if test x"$CC_FOR_BUILD" = x ; then
CC_FOR_BUILD=no_compiler_found ;
fi
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac'
+esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -142,6 +154,7 @@
UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
/usr/sbin/$sysctl 2>/dev/null || echo unknown)`
case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
@@ -167,21 +180,38 @@
;;
esac
# The OS release
- release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
exit 0 ;;
+ amd64:OpenBSD:*:*)
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
amiga:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
hp300:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
mac68k:OpenBSD:*:*)
echo m68k-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
@@ -197,83 +227,76 @@
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}
+ echo mips64-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 ;;
*:OpenBSD:*:*)
echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
exit 0 ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- cat <<EOF >$dummy.s
- .data
-\$Lformat:
- .byte 37,100,45,37,120,10,0 # "%d-%x\n"
-
- .text
- .globl main
- .align 4
- .ent main
-main:
- .frame \$30,16,\$26,0
- ldgp \$29,0(\$27)
- .prologue 1
- .long 0x47e03d80 # implver \$0
- lda \$2,-1
- .long 0x47e20c21 # amask \$2,\$1
- lda \$16,\$Lformat
- mov \$0,\$17
- not \$1,\$18
- jsr \$26,printf
- ldgp \$29,0(\$26)
- mov 0,\$16
- jsr \$26,exit
- .end main
-EOF
- eval $set_cc_for_build
- $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
- if test "$?" = 0 ; then
- case `./$dummy` in
- 0-0)
- UNAME_MACHINE="alpha"
- ;;
- 1-0)
- UNAME_MACHINE="alphaev5"
- ;;
- 1-1)
- UNAME_MACHINE="alphaev56"
- ;;
- 1-101)
- UNAME_MACHINE="alphapca56"
- ;;
- 2-303)
- UNAME_MACHINE="alphaev6"
- ;;
- 2-307)
- UNAME_MACHINE="alphaev67"
- ;;
- 2-1307)
- UNAME_MACHINE="alphaev68"
- ;;
- esac
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -296,6 +319,12 @@
*:OS/390:*:*)
echo i370-ibm-openedition
exit 0 ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit 0;;
@@ -313,6 +342,13 @@
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
exit 0 ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
+ 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 ;;
+ esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
@@ -381,6 +417,9 @@
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
exit 0 ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
exit 0 ;;
@@ -419,15 +458,20 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy \
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
exit 0 ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
exit 0 ;;
@@ -500,8 +544,7 @@
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
@@ -599,11 +642,21 @@
exit (0);
}
EOF
- (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
- if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
- rm -f $dummy.c $dummy
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
fi ;;
esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ # 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
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
exit 0 ;;
ia64:HP-UX:*:*)
@@ -637,8 +690,7 @@
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -696,21 +748,26 @@
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
- CRAY*T3D:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
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 ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
exit 0 ;;
@@ -732,14 +789,17 @@
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit 0 ;;
- x86:Interix*:3*)
- echo i386-pc-interix3
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
+ echo i586-pc-interix
exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
@@ -751,17 +811,34 @@
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit 0 ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
exit 0 ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit 0 ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
exit 0 ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit 0 ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit 0 ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -782,8 +859,26 @@
#endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- rm -f $dummy.c
- test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
@@ -819,6 +914,9 @@
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
exit 0 ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit 0 ;;
@@ -845,7 +943,7 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit 0 ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
exit 0 ;;
@@ -876,9 +974,11 @@
LIBC=gnuaout
#endif
#endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
EOF
eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- rm -f $dummy.c
test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
;;
@@ -896,6 +996,26 @@
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
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
@@ -917,22 +1037,19 @@
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
elif /bin/uname -X 2>/dev/null >/dev/null ; then
- UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
- (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
- (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
&& UNAME_MACHINE=i586
- (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
&& UNAME_MACHINE=i686
- (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
exit 0 ;;
- i*86:*DOS:*:*)
- echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -956,9 +1073,15 @@
# "miniframe"
echo m68010-convergent-sysv
exit 0 ;;
- M68*:*:R3V[567]*:*)
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
+ M68*:*:R3V[5678]*:*)
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 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
+ 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`
@@ -975,9 +1098,6 @@
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
exit 0 ;;
- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
exit 0 ;;
@@ -1049,6 +1169,9 @@
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
@@ -1056,7 +1179,12 @@
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
exit 0 ;;
*:Darwin:*:*)
- echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
@@ -1069,7 +1197,7 @@
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
- NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
+ NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
*:NonStop-UX:*:*)
@@ -1092,11 +1220,6 @@
fi
echo ${UNAME_MACHINE}-unknown-plan9
exit 0 ;;
- i*86:OS/2:*:*)
- # If we were able to find `uname', then EMX Unix compatibility
- # is probably installed.
- echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
exit 0 ;;
@@ -1115,11 +1238,21 @@
*:ITS:*:*)
echo pdp10-unknown-its
exit 0 ;;
- i*86:XTS-300:*:STOP)
- echo ${UNAME_MACHINE}-unknown-stop
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
exit 0 ;;
- i*86:atheos:*:*)
- echo ${UNAME_MACHINE}-unknown-atheos
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
exit 0 ;;
esac
@@ -1241,8 +1374,7 @@
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
Index: setup.data
===================================================================
RCS file: /cvsroot/pkg-lirc/lirc/setup.data,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- setup.data 27 Mar 2005 20:59:51 -0000 1.1.1.1
+++ setup.data 31 Mar 2005 09:37:18 -0000 1.2
@@ -13,8 +13,8 @@
hw_menu_entry: @hw-soundcard
dsp: "Simple IR diode (EXPERIMENTAL)"
- audio: "IR receiver IC connected to auido input (EXPERIMENTAL)"
- audio_alsa: "IR receiver IC connected to auido input using ALSA (EXPERIMENTAL)"
+ audio: "IR receiver IC connected to audio input (EXPERIMENTAL)"
+ audio_alsa: "IR receiver IC connected to audio input using ALSA (EXPERIMENTAL)"
hw_menu_entry: @hw-other
ea65: "AOpen XC Cube EA65, EA65-II"
Index: setup.sh
===================================================================
RCS file: /cvsroot/pkg-lirc/lirc/setup.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- setup.sh 27 Mar 2005 20:59:52 -0000 1.1.1.1
+++ setup.sh 31 Mar 2005 09:37:18 -0000 1.2
@@ -265,7 +265,307 @@
ConfigDriver ()
{
- . ./setup-driver.sh
+
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 18 74 11 \
+ \
+ 1 "Home-brew (16x50 UART compatible serial port)" \
+ 2 "Home-brew (parallel port)" \
+ 3 "Home-brew (soundcard input)" \
+ 4 "Other serial port devices" \
+ 5 "TV card" \
+ 6 "IrDA hardware" \
+ 7 "PDAs" \
+ 8 "USB devices" \
+ 9 "Network (UDP)" \
+ 0 "Other (MIDI, Bluetooth, etc.)" \
+ a "None (network connections only)" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=serial; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "2"; then LIRC_DRIVER=parallel; DRIVER_PARAMETER=lpt1; DRIVER_PARAM_TYPE=lpt;
+ elif test "$1" = "3"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 10 74 3 \
+ \
+ 1 "Simple IR diode (EXPERIMENTAL)" \
+ 2 "IR receiver IC connected to audio input (EXPERIMENTAL)" \
+ 3 "IR receiver IC connected to audio input using ALSA (EXPERIMENTAL)" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=dsp; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "2"; then LIRC_DRIVER=audio; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "3"; then LIRC_DRIVER=audio_alsa; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "4"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 19 74 12 \
+ \
+ 1 "Anir Multimedia Magic" \
+ 2 "CARACA" \
+ 3 "Creative Infra Receiver/CIMR100" \
+ 4 "IRdeo" \
+ 5 "IRdeo Remote" \
+ 6 "Irman / UIR" \
+ 7 "Logitech/AST" \
+ 8 "PCMAK serial receiver" \
+ 9 "Miro PCTV receiver" \
+ 0 "Packard Bell receiver" \
+ a "Pinnacle Systems PCTV (pro) receiver" \
+ b "PixelView RemoteMaster RC2000/RC3000" \
+ c "REALmagic (bundled with Hollywood Plus DVD card)" \
+ d "Slink-e (receive only)" \
+ e "Silitek SM-1000" \
+ f "Tekram Irmate 210 (16x50 UART compatible serial port)" \
+ g "UIRT2 (receive only, UIR mode)" \
+ h "UIRT2 (receive and transmit)" \
+ i "X10 MouseRemote RF Receiver (Serial)" \
+ j "X10 MouseRemote RF Receiver (PS/2)" \
+ k "X10 MP3 Anywhere RF Receiver" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=animax; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "2"; then LIRC_DRIVER=caraca; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "3"; then LIRC_DRIVER=creative; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "4"; then LIRC_DRIVER=irdeo; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "5"; then LIRC_DRIVER=irdeo_remote; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "6"; then LIRC_DRIVER=irman; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "7"; then LIRC_DRIVER=logitech; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "8"; then LIRC_DRIVER=pcmak; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "9"; then LIRC_DRIVER=pctv; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "0"; then LIRC_DRIVER=packard_bell; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "a"; then LIRC_DRIVER=pctv; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "b"; then LIRC_DRIVER=remotemaster; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "c"; then LIRC_DRIVER=realmagic; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "d"; then LIRC_DRIVER=slinke; DRIVER_PARAMETER=tty3; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "e"; then LIRC_DRIVER=silitek; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "f"; then LIRC_DRIVER=tekram; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "g"; then LIRC_DRIVER=uirt2; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "h"; then LIRC_DRIVER=uirt2_raw; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "i"; then LIRC_DRIVER=mouseremote; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "j"; then LIRC_DRIVER=mouseremote_ps2; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "k"; then LIRC_DRIVER=mp3anywhere; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "5"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 19 74 12 \
+ \
+ 1 "Askey Magic TView CPH03x (card=1)" \
+ 2 "Askey/Typhoon/Anubis Magic TView CPH051/061 (bt878) (card=24)" \
+ 3 "Asus TV-Box" \
+ 4 "AverMedia TV card (TVCapture, TVPhone) (card=6)" \
+ 5 "AverMedia TV card (TVCapture98, TVPhone98) (card=13/41)" \
+ 6 "AverMedia TV card (VDOMATE) (use card=13)" \
+ 7 "BestBuy Easy TV (BT848) (card=55)" \
+ 8 "BestBuy Easy TV (BT878) (card=62)" \
+ 9 "Chronos Video Shuttle II (card=35)" \
+ 0 "Creative BreakOut-Box" \
+ a "Dynalink Magic TView (card=48)" \
+ b "FlyVideo II (card=8)" \
+ c "FlyVideo 98 (card=30)" \
+ d "FlyVideo 98/FM /2000S (card=56)" \
+ e "Flyvideo 98FM (LR50Q) / Typhoon TView TV/FM Tuner (card=36)" \
+ f "Hauppauge TV card (new I2C layer required)" \
+ g "Hauppauge DVB-s card (ver. 2.1)" \
+ h "Hercules Smart TV Stereo (card=100)" \
+ i "I-O Data Co. GV-BCTV5/PCI (card=81)" \
+ j "Jetway TV/Capture JW-TV878-FBK, Kworld KW-TV878RF (card=78)" \
+ k "KNC ONE TV Station (-/SE/PRO/RDS)" \
+ l "Lenco MXTV-9578 CP (card=50)" \
+ m "Miro PCTV serial port receiver" \
+ n "Phoebe Tv Master + FM (card=22)" \
+ o "PixelView PlayTV PAK (card=50)" \
+ p "Pixelview PlayTV pro (card=37)" \
+ q "Pixelview PlayTV (bt878) (Prolink PV-BT878P+, card=16)" \
+ r "Prolink Pixelview PV-BT878P+ (Rev.4C,8E, card=70)" \
+ s "Prolink PV-BT878P+4E (card=50)" \
+ t "Prolink PV-BT878P+9B (PlayTV Pro rev.9B FM+NICAM) (card=72)" \
+ u "ProVideo PV951 (card=42)" \
+ v "Technisat MediaFocus I" \
+ w "Tekram M230 Mach64 (and others bt829 based)" \
+ x "TriTan Technology TView95 CPH03x (card=1)" \
+ y "TView99 CPH063 (card=38)" \
+ z "Typhoon TView RDS / FM Stereo (card=53)" \
+ A "Winfast PVR2000 (Linux kernel >=2.6.11 required)" \
+ B "Winfast TV2000/XP (card=34)" \
+ C "WinView 601 (card=17)" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=cph03x; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "2"; then LIRC_DRIVER=cph06x; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "3"; then LIRC_DRIVER=tvbox; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "4"; then LIRC_DRIVER=avermedia; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "5"; then LIRC_DRIVER=avermedia98; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "6"; then LIRC_DRIVER=avermedia_vdomate; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "7"; then LIRC_DRIVER=bestbuy; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "8"; then LIRC_DRIVER=bestbuy2; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "9"; then LIRC_DRIVER=chronos; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "0"; then LIRC_DRIVER=breakoutbox; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "a"; then LIRC_DRIVER=cph03x; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "b"; then LIRC_DRIVER=flyvideo; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "c"; then LIRC_DRIVER=flyvideo; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "d"; then LIRC_DRIVER=flyvideo; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "e"; then LIRC_DRIVER=flyvideo; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "f"; then LIRC_DRIVER=hauppauge; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "g"; then LIRC_DRIVER=hauppauge_dvb; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "h"; then LIRC_DRIVER=hercules_smarttv_stereo; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "i"; then LIRC_DRIVER=gvbctv5pci; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "j"; then LIRC_DRIVER=kworld; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "k"; then LIRC_DRIVER=knc_one; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "l"; then LIRC_DRIVER=pixelview_pak; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "m"; then LIRC_DRIVER=pctv; DRIVER_PARAMETER=tty1; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "n"; then LIRC_DRIVER=cph06x; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "o"; then LIRC_DRIVER=pixelview_pak; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "p"; then LIRC_DRIVER=pixelview_pro; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "q"; then LIRC_DRIVER=pixelview_bt878; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "r"; then LIRC_DRIVER=pixelview_pro; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "s"; then LIRC_DRIVER=pixelview_pak; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "t"; then LIRC_DRIVER=pixelview_pro; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "u"; then LIRC_DRIVER=provideo; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "v"; then LIRC_DRIVER=mediafocusI; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "w"; then LIRC_DRIVER=tekram_bt829; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "x"; then LIRC_DRIVER=cph03x; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "y"; then LIRC_DRIVER=cph06x; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "z"; then LIRC_DRIVER=knc_one; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "A"; then LIRC_DRIVER=leadtek_pvr2000; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "B"; then LIRC_DRIVER=leadtek_0010; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "C"; then LIRC_DRIVER=leadtek_0007; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "6"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 11 74 4 \
+ \
+ 1 "SIR IrDA (built-in IR ports)" \
+ 2 "Tekram Irmate 210 (16x50 UART compatible serial port)" \
+ 3 "ITE IT8712/IT8705 CIR port (experimental, 2.4.x required)" \
+ 4 "Actisys Act200L SIR driver support" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=sir; DRIVER_PARAMETER=com3; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "2"; then LIRC_DRIVER=tekram; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ elif test "$1" = "3"; then LIRC_DRIVER=it87; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "4"; then LIRC_DRIVER=act200l; DRIVER_PARAMETER=com1; DRIVER_PARAM_TYPE=com;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "7"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 9 74 2 \
+ \
+ 1 "HP iPAQ" \
+ 2 "Sharp Zaurus" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=sa1100; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "2"; then LIRC_DRIVER=sa1100; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "8"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 18 74 11 \
+ \
+ 1 "ATI/NVidia/X10 I & II RF Remote" \
+ 2 "ATI/NVidia/X10 RF Remote (userspace)" \
+ 3 "Dign HV5 HTPC IR/VFD Module" \
+ 4 "Home Electronics Tira USB device" \
+ 5 "Igor Cesko's USB IR Receiver" \
+ 6 "PCMAK USB receiver" \
+ 7 "Sasem OnAir Remocon-V" \
+ 8 "Sound Blaster Extigy USB sound card" \
+ 9 "Soundgraph iMON MultiMedian IR/VFD" \
+ 0 "Streamzap PC Remote" \
+ a "Windows Media Center Remotes" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=atiusb; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "2"; then LIRC_DRIVER=atilibusb; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "3"; then LIRC_DRIVER=sasem; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "4"; then LIRC_DRIVER=tira; DRIVER_PARAMETER=ttyUSB1; DRIVER_PARAM_TYPE=ttyUSB;
+ elif test "$1" = "5"; then LIRC_DRIVER=igorplugusb; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "6"; then LIRC_DRIVER=pcmak_usb; DRIVER_PARAMETER=ttyUSB1; DRIVER_PARAM_TYPE=ttyUSB;
+ elif test "$1" = "7"; then LIRC_DRIVER=sasem; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "8"; then LIRC_DRIVER=exaudio; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "9"; then LIRC_DRIVER=imon; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "0"; then LIRC_DRIVER=streamzap; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "a"; then LIRC_DRIVER=mceusb; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "9"; then LIRC_DRIVER=udp; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "0"; then
+ dialog --clear --backtitle "$BACKTITLE" \
+ --title "Select your driver" \
+ --menu "$CONFIG_DRIVER_TEXT" 13 74 6 \
+ \
+ 1 "AOpen XC Cube EA65, EA65-II" \
+ 2 "Creative LiveDrive midi" \
+ 3 "Creative LiveDrive sequencer" \
+ 4 "Creative iNFRA CDROM" \
+ 5 "Ericsson mobile phone via Bluetooth" \
+ 6 "Linux input layer (/dev/input/eventX)" 2> $TEMP
+ if test "$?" = "0"; then
+ {
+ set `cat $TEMP`
+ if false; then :
+ elif test "$1" = "1"; then LIRC_DRIVER=ea65; DRIVER_PARAMETER=tty2; DRIVER_PARAM_TYPE=tty;
+ elif test "$1" = "2"; then LIRC_DRIVER=livedrive_midi; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "3"; then LIRC_DRIVER=livedrive_seq; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "4"; then LIRC_DRIVER=creative_infracd; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "5"; then LIRC_DRIVER=bte; DRIVER_PARAMETER=btty; DRIVER_PARAM_TYPE=none;
+ elif test "$1" = "6"; then LIRC_DRIVER=devinput; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ fi
+ }
+ else
+ return;
+ fi;
+ elif test "$1" = "a"; then LIRC_DRIVER=none; DRIVER_PARAMETER=none; DRIVER_PARAM_TYPE=none;
+ fi
+ }
+ else
+ return;
+ fi;
+
+
if test "$?" = "0"; then
GetSelectedDriver
SetPortAndIrq
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pkg-lirc/lirc/ChangeLog,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- ChangeLog 27 Mar 2005 20:59:43 -0000 1.1.1.1
+++ ChangeLog 31 Mar 2005 09:37:17 -0000 1.2
@@ -657,7 +657,7 @@
fine-tuning of lirc_sir driver
* daemons/hw_audio_alsa.c, daemons/hw-types.c, doc/html-source/audio-alsa.html, doc/release-html.sh, acconfig.h, configure.in, contrib/lirc.redhat, daemons/Makefile.am, NEWS, setup.data:
- IR receiver IC connected to auido input using ALSA (Andrew Zabolotny)
+ IR receiver IC connected to audio input using ALSA (Andrew Zabolotny)
* daemons/hw_livedrive_common.c, daemons/hw_livedrive_midi.c, daemons/hw_livedrive_seq.c:
timing issues fixed (Stephen Beahm)
More information about the Pkg-lirc-changes
mailing list