reverted: --- zhcon-0.2.6/config.guess +++ zhcon-0.2.6.orig/config.guess @@ -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 +# Free Software Foundation, Inc. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +timestamp='2001-08-21' -timestamp='2003-01-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 @@ -24,9 +24,8 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Written by Per Bothner . +# Please send patches to . -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -88,41 +87,30 @@ exit 1 fi -trap 'exit 1' 1 2 15 +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. +# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c ; + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; + if test $? = 0 ; then -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac' -esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -139,30 +127,29 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) + # Netbsd (nbsd) targets should (where applicable) match one or - # NetBSD (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. + case "${UNAME_MACHINE}" in + i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -179,65 +166,12 @@ ;; 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 ;; - 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 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:MicroBSD:*:*) - echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} - exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -246,7 +180,6 @@ # 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: @@ -272,9 +205,10 @@ jsr \$26,exit .end main EOF + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null if test "$?" = 0 ; then + case `./$dummy` in - case `$dummy` in 0-0) UNAME_MACHINE="alpha" ;; @@ -296,11 +230,9 @@ 2-1307) UNAME_MACHINE="alphaev68" ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; esac fi + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) @@ -315,11 +247,29 @@ Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos exit 0 ;; + arc64:OpenBSD:*:*) + echo mips64el-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hkmips:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition @@ -341,10 +291,6 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; - DRS?6000:UNIX_SV: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 ;; @@ -373,7 +319,7 @@ echo m68k-sun-sunos${UNAME_RELEASE} exit 0 ;; sun*:*:4.2BSD:*) + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -387,6 +333,12 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # 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 @@ -413,6 +365,18 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -429,7 +393,6 @@ echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #ifdef __cplusplus #include /* for printf() prototype */ @@ -451,20 +414,16 @@ exit (-1); } EOF + eval $set_cc_for_build + $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 ;; @@ -525,7 +484,6 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include @@ -537,7 +495,9 @@ exit(0); } EOF + eval $set_cc_for_build + $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 @@ -546,7 +506,7 @@ fi exit 0 ;; *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -586,8 +546,10 @@ 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) + case "${HPUX_REV}" in + 11.[0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -596,13 +558,12 @@ case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then + sed 's/^ //' << EOF >$dummy.c - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -635,21 +596,12 @@ exit (0); } EOF + eval $set_cc_for_build + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - # 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:*:*) @@ -657,7 +609,6 @@ echo ia64-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) - eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c #include int @@ -683,7 +634,9 @@ exit (0); } EOF + eval $set_cc_for_build + $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:*:* ) @@ -711,6 +664,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -729,6 +685,9 @@ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; @@ -741,21 +700,27 @@ 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 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; - *:UNICOS/mp:*:*) - echo nv1-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 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -766,18 +731,10 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - # 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 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -788,17 +745,11 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 - 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 @@ -819,48 +770,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux - echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; mips:Linux:*:*) + case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in + big) echo mips-unknown-linux-gnu && exit 0 ;; + little) echo mipsel-unknown-linux-gnu && exit 0 ;; + esac - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - 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 @@ -909,8 +828,7 @@ # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. + ld_supported_targets=`cd /; ld --help 2>&1 \ - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -922,7 +840,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 ;; @@ -933,29 +851,33 @@ exit 0 ;; esac # Determine whether the default compiler is a.out or elf + cat >$dummy.c < +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif +#ifdef __ELF__ +# ifdef __GLIBC__ +# if __GLIBC__ >= 2 + printf ("%s-pc-linux-gnu\n", argv[1]); +# else + printf ("%s-pc-linux-gnulibc1\n", argv[1]); +# endif +# else + printf ("%s-pc-linux-gnulibc1\n", argv[1]); +# endif +#else + printf ("%s-pc-linux-gnuaout\n", argv[1]); +#endif + return 0; +} +EOF eval $set_cc_for_build + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy - 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 ;; i*86:DYNIX/ptx:4*:*) @@ -972,23 +894,6 @@ # 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: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 @@ -1010,19 +915,22 @@ UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1046,15 +954,9 @@ # "miniframe" echo m68010-convergent-sysv exit 0 ;; - 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[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) - 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) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1071,6 +973,9 @@ 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 ;; @@ -1142,9 +1047,6 @@ 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 ;; @@ -1152,24 +1054,18 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) + echo `uname -p`-apple-darwin${UNAME_RELEASE} - case `uname -p` in - *86) UNAME_PROCESSOR=i686 ;; - powerpc) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; + NSR-[KW]:NONSTOP_KERNEL:*:*) - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1192,6 +1088,11 @@ 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 ;; @@ -1210,12 +1111,14 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -eval $set_cc_for_build cat >$dummy.c < @@ -1330,7 +1233,9 @@ } EOF +eval $set_cc_for_build +$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. reverted: --- zhcon-0.2.6/config.sub +++ zhcon-0.2.6.orig/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. +timestamp='2001-08-13' -timestamp='2003-01-03' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -29,8 +29,7 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +# Please send patches to . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -118,7 +117,7 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in + nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*) - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -227,44 +226,31 @@ 1750a | 580 \ | a29k \ | 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 \ + | c4x | clipper \ + | d10v | d30v | dsp16xx \ + | fr30 \ - | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ | m32r | m68000 | m68k | m88k | mcore \ + | mips16 | mips64 | mips64el | mips64orion | mips64orionel \ + | mips64vr4100 | mips64vr4100el | mips64vr4300 \ + | mips64vr4300el | mips64vr5000 | mips64vr5000el \ + | mipsbe | mipsel | mipsle | 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 \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ - | msp430 \ | ns16k | ns32k \ + | openrisc \ - | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ + | s390 | s390x \ + | sh | sh[34] | sh[34]eb | shbe | shle \ + | sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic80 | tron \ + | v850 \ - | v850 | v850e \ | we32k \ + | x86 | xscale \ - | x86 | xscale | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -291,53 +277,38 @@ 580-* \ | a29k-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alphapca5[67]-* | arc-* \ + | arm-* | armbe-* | armle-* | armv*-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c54x-* \ + | clipper-* | cray2-* | cydra-* \ + | d10v-* | d30v-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | 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-* \ - | ip2k-* \ | m32r-* \ + | m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ + | mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \ + | mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipsel-* \ + | mipsle-* | mipstx39-* | mipstx39el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | msp430-* \ - | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ + | s390-* | s390x-* \ + | sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \ + | sparc-* | sparc64-* | sparc86x-* | sparclite-* \ + | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* \ + | t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ + | v850-* | vax-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | 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-* \ | we32k-* \ + | x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -402,10 +373,6 @@ basic_machine=ns32k-sequent os=-dynix ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -426,8 +393,16 @@ basic_machine=c38-convex os=-bsd ;; + cray | ymp) + basic_machine=ymp-cray + os=-unicos + ;; + cray2) + basic_machine=cray2-cray + os=-unicos + ;; + [cjt]90) + basic_machine=${basic_machine}-cray - cray | j90) - basic_machine=j90-cray os=-unicos ;; crds | unos) @@ -442,14 +417,6 @@ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) basic_machine=mips-dec ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) basic_machine=m68k-motorola @@ -630,6 +597,14 @@ basic_machine=m68k-atari os=-mint ;; + mipsel*-linux*) + basic_machine=mipsel-unknown + os=-linux-gnu + ;; + mips*-linux*) + basic_machine=mips-unknown + os=-linux-gnu + ;; mips3*-*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` ;; @@ -644,10 +619,6 @@ basic_machine=m68k-rom68k os=-coff ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; msdos) basic_machine=i386-pc os=-msdos @@ -720,10 +691,6 @@ np1) basic_machine=np1-gould ;; - nv1) - basic_machine=nv1-cray - os=-unicosmp - ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -731,10 +698,6 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -757,19 +720,19 @@ pbb) basic_machine=m68k-tti ;; + pc532 | pc532-*) - pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pentium | p5 | k5 | k6 | nexgen) - 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) basic_machine=i686-pc ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-*) - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) @@ -784,22 +747,22 @@ 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/^[^-]*-//'` ;; @@ -820,22 +783,10 @@ rtpc | rtpc-*) basic_machine=romp-ibm ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; sa29200) basic_machine=a29k-amd os=-udi ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; sequent) basic_machine=i386-sequent ;; @@ -843,7 +794,7 @@ basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) - sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; @@ -910,17 +861,9 @@ os=-dynix ;; t3e) + basic_machine=t3e-cray - basic_machine=alphaev5-cray os=-unicos ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff @@ -931,10 +874,6 @@ tx39el) basic_machine=mipstx39el-unknown ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; tower | tower-32) basic_machine=m68k-ncr ;; @@ -959,8 +898,8 @@ os=-vms ;; vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; - basic_machine=f301-fujitsu - ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -981,13 +920,17 @@ basic_machine=hppa1.1-winbond os=-proelf ;; + windows32) + basic_machine=i386-pc + os=-windows32-msvcrt - xps | xps100) - basic_machine=xps100-honeywell ;; + xmp) + basic_machine=xmp-cray - ymp) - basic_machine=ymp-cray os=-unicos ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; z8k-*-coff) basic_machine=z8k-unknown os=-sim @@ -1008,6 +951,13 @@ op60c) basic_machine=hppa1.1-oki ;; + mips) + if [ x$os = x-linux-gnu ]; then + basic_machine=mips-unknown + else + basic_machine=mips-mips + fi + ;; romp) basic_machine=romp-ibm ;; @@ -1027,16 +977,13 @@ we32k) basic_machine=we32k-att ;; + sh3 | sh4 | sh3eb | sh4eb) - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; + cydra) - cydra) basic_machine=cydra-cydrome ;; orion) @@ -1051,6 +998,10 @@ pmac | pmac-mpw) basic_machine=powerpc-apple ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1113,12 +1064,10 @@ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos*) - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -microbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1130,10 +1079,8 @@ ;; 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* \ @@ -1172,20 +1119,14 @@ -acis*) os=-aos ;; - -atheos*) - os=-atheos - ;; -386bsd) os=-bsd ;; -ctix* | -uts*) os=-sysv ;; - -nova*) - os=-rtmk-nova - ;; -ns2 ) + os=-nextstep2 - os=-nextstep2 ;; -nsk*) os=-nsk @@ -1224,8 +1165,8 @@ -xenix) os=-xenix ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint ;; -none) ;; @@ -1258,11 +1199,10 @@ arm*-semi) os=-aout ;; - # This must come before the *-dec entry. pdp10-*) os=-tops20 ;; + pdp11-*) - pdp11-*) os=-none ;; *-dec | vax-*) @@ -1289,9 +1229,6 @@ mips*-*) os=-elf ;; - or32-*) - os=-coff - ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -1355,19 +1292,19 @@ *-next) os=-nextstep3 ;; + *-gould) - *-gould) os=-sysv ;; + *-highlevel) - *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; + *-sgi) - *-sgi) os=-irix ;; + *-siemens) - *-siemens) os=-sysv4 ;; *-masscomp) @@ -1439,7 +1376,7 @@ -ptx*) vendor=sequent ;; + -vxsim* | -vxworks*) - -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; -aux*) reverted: --- zhcon-0.2.6/debian/config +++ zhcon-0.2.6.orig/debian/config @@ -4,5 +4,5 @@ . /usr/share/debconf/confmodule +db_input high zhcon/rebuild_kernel || true -db_input medium zhcon/rebuild_kernel || true db_go diff -u zhcon-0.2.6/debian/control zhcon-0.2.6/debian/control --- zhcon-0.2.6/debian/control +++ zhcon-0.2.6/debian/control @@ -2,12 +2,13 @@ Section: utils Priority: optional Maintainer: Yu Guanghui -Build-Depends: debhelper (>= 4.1.16), libggi2-dev (>= 1:2.2.1-4), unicon-imc2, libpth-dev, libncurses5-dev -Standards-Version: 3.7.2 +Build-Depends: debhelper (>= 4.1.16), libggi2-dev (>= 1:2.2.1-4), unicon-imc2, + libpth-dev, libncurses5-dev, autotools-dev +Standards-Version: 3.8.0 Package: zhcon Architecture: any -Depends: ${shlibs:Depends}, debconf +Depends: ${shlibs:Depends} Conflicts: unicon-im (<< 3.0.4-9) Description: A Fast Console CJK System Using FrameBuffer Zhcon is a fast Linux Console Chinese System which supports framebuffer diff -u zhcon-0.2.6/debian/rules zhcon-0.2.6/debian/rules --- zhcon-0.2.6/debian/rules +++ zhcon-0.2.6/debian/rules @@ -8,6 +8,12 @@ configure: configure-stamp configure-stamp: dh_testdir +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif # Add here commands to configure the package. ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc @@ -29,7 +35,8 @@ rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.sub config.guess debian/dirs debian/conffiles dh_clean @@ -51,7 +58,7 @@ binary-arch: build install dh_testdir dh_testroot - dh_installdebconf + dh_install dh_installdocs dh_installexamples doc/poem.big5 doc/poem.gb dh_installmenu diff -u zhcon-0.2.6/debian/changelog zhcon-0.2.6/debian/changelog --- zhcon-0.2.6/debian/changelog +++ zhcon-0.2.6/debian/changelog @@ -1,3 +1,30 @@ +zhcon (1:0.2.6-5.2ubuntu1) intrepid; urgency=low + + * fix FTBFS (LP: #288764) + * debian/rules: + - fix debian-rules-ignores-make-clean-error + - add dh_install + - remove dh_installdebconf + - copy config.guess and config.sub + - clean unneed debian staff from upstream source. + * debian/dirs: removed, fix package-contains-empty-directory + * debian/conffiles: removed, fix duplicate-conffile + * debian/templates: removed, fix malformed-title-in-templates and + possible-debconf-note-abuse + * debian/po/*: removed. same as above. + * debian/config: removed. same as above. + * debian/postinst: removed. same as above. + * debian/control: + - bump standards version to 3.8.0, nothing changed. + - build depends on autotools-dev. + - binary package no longer depends on debconf. + * debian/lintian/zhcon: added, override the setuid and rpath of zhcon. + * debian/install: added, install lintian overrides. + * debian/source.lintian-overrides: added, upstream source code contain + debian deconf staff. + + -- LI Daobing Fri, 07 Nov 2008 13:26:52 +0800 + zhcon (1:0.2.6-5.2) unstable; urgency=low * Non-maintainer upload. reverted: --- zhcon-0.2.6/debian/po/ja.po +++ zhcon-0.2.6.orig/debian/po/ja.po @@ -1,44 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon 1:0.2.6-4\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-11-24 13:52+0900\n" -"Last-Translator: Hideki Yamane (Debian-JP) \n" -"Language-Team: Japanese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "" -"フレームバッファのサポートを有効にしてカーネルを再構築「しなければなりませ" -"ん」。" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"README.Debian と README を参照してください。zhcon は、カーネルがフレームバッ" -"ファをサポートしている必要があるので、自分でカーネルをビルドする必要がありま" -"す。" reverted: --- zhcon-0.2.6/debian/po/es.po +++ zhcon-0.2.6.orig/debian/po/es.po @@ -1,48 +0,0 @@ -# zhcon debconf translation to spanish -# Copyright (C) 2001, 2006 Software in the Public Interest -# This file is distributed under the same license as the zhcon package. -# -# Changes: -# - Initial translation -# Carlos Valdivia Yage , 2001, 2006 -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon 0.2.6-2\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-08-15 00:45+0200\n" -"Last-Translator: Carlos Valdivia Yage \n" -"Language-Team: Debian l10n Spanish Team \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Debe recompilar el ncleo con soporte de framebuffer." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Por favor, lea los ficheros README.Debian y README. zhcon necesita que el " -"ncleo incluya soporte de framebuffer, por lo que tendr que recompilarlo." reverted: --- zhcon-0.2.6/debian/po/POTFILES.in +++ zhcon-0.2.6.orig/debian/po/POTFILES.in @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates reverted: --- zhcon-0.2.6/debian/po/templates.pot +++ zhcon-0.2.6.orig/debian/po/templates.pot @@ -1,31 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" reverted: --- zhcon-0.2.6/debian/po/fr.po +++ zhcon-0.2.6.orig/debian/po/fr.po @@ -1,38 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon_0.2.6-1\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-07-09 22:19+0200\n" -"Last-Translator: Michel Grentzinger \n" -"Language-Team: French \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Noyau compil sans la gestion du tampon vido (framebuffer)" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Veuillez consulter les fichiers README.Debian et README. Zhcon a besoin d'un " -"noyau grant le tampon vido (framebuffer) et c'est vous de le compiler." reverted: --- zhcon-0.2.6/debian/po/da.po +++ zhcon-0.2.6.orig/debian/po/da.po @@ -1,29 +0,0 @@ -# Danish translation of the po-template file for zhcon. -# Morten Bo Johansen , 2004 -msgid "" -msgstr "" -"Project-Id-Version: zhcon 0.2.6-4\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-12-04 23:23+0100\n" -"Last-Translator: Morten Bo Johansen \n" -"Language-Team: Danish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "En ny kerne med understttelse af framebuffer SKAL bygges." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Ls venlist README.Debian og README: zhcon krver at kernen understtter " -"framebuffer, og du m selv srge for dette." reverted: --- zhcon-0.2.6/debian/po/cs.po +++ zhcon-0.2.6.orig/debian/po/cs.po @@ -1,40 +0,0 @@ -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-09-24 13:50+0200\n" -"Last-Translator: Miroslav Kure \n" -"Language-Team: Czech \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "MUSÍTE sestavit jádro s podporou framebufferu." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Přečtěte si prosím README a README.Debian. zhcon vyžaduje jádro s podporou " -"framebufferu, což znamená že si jádro musíte sestavit sami." reverted: --- zhcon-0.2.6/debian/po/vi.po +++ zhcon-0.2.6.orig/debian/po/vi.po @@ -1,33 +0,0 @@ -# Vietnamese translation for zhcon. -# Copyright © 2005 Free Software Foundation, Inc. -# Clytie Siddall , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon 1/0.2.3-8.1\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2005-08-21 22:00+0930\n" -"Last-Translator: Clytie Siddall \n" -"Language-Team: Vietnamese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: LocFactoryEditor 1.2.2\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Bạn • phải • xây dụng lại hạt nhân với sự hỗ trợ bộ đệm khung." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Bạn hãy đọc hai tập tin Đọc Đi và . Trình zhcon cần " -"một bộ đệm khung có hỗ trợ hạt nhăn: bạn cần phải tự xăy dụng nó." reverted: --- zhcon-0.2.6/debian/po/ca.po +++ zhcon-0.2.6.orig/debian/po/ca.po @@ -1,32 +0,0 @@ -# zhcon (debconf) translation to Catalan. -# Copyright (C) 2004 Free Software Foundation, Inc. -# Aleix Badia i Bosch , 2004 -# Josep Lladonosa i Capell , 2004 -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon_1_0.2.3-7_templates\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2004-03-05 19:46GMT\n" -"Last-Translator: Aleix Badia i Bosch \n" -"Language-Team: Catalan \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Heu de tornar a muntar el nucli amb el suport de framebuffer." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Llegiu el fitxer README.Debian i el README. El zhcon necessita un nucli que " -"suporti framebuffer i caldrà que el munteu vosaltres." reverted: --- zhcon-0.2.6/debian/po/pt.po +++ zhcon-0.2.6.orig/debian/po/pt.po @@ -1,31 +0,0 @@ -# Portuguese translation of zhcon -# This file is distributed under the same license as the zhcon package -# Ricardo Silva , 2006. -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon 1:0.2.6-1\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-08-02 15:34+0100\n" -"Last-Translator: Ricardo Silva \n" -"Language-Team: Native Portuguese \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "DEVE reconstruir o kernel com suporte para framebuffer." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Por favor leia README.Debian e README. O zhcon necessita de um kernel que " -"suporte framebuffer, Terá que o contruir por si mesmo." reverted: --- zhcon-0.2.6/debian/po/de.po +++ zhcon-0.2.6.orig/debian/po/de.po @@ -1,32 +0,0 @@ -# Translation of zhcon debconf templates to German -# Copyright (C) Sebastian Feltel . -# Copyright (C) Helge Kreutzmann , 2006. -# This file is distributed under the same license as the zhcon package. -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon 1:0.2.6-4\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-12-12 20:54+0100\n" -"Last-Translator: Helge Kreutzmann \n" -"Language-Team: German \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-15\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Sie MSSEN den Kernel mit Framebuffer-Untersttzung neu bauen." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Bitte lesen Sie die Dateien README.Debian und README. Zhcon bentigt einen " -"Kernel mit Framebuffer-Untersttzung, den Sie selber erstellen mssen." reverted: --- zhcon-0.2.6/debian/po/ru.po +++ zhcon-0.2.6.orig/debian/po/ru.po @@ -1,46 +0,0 @@ -# translation of zhcon_1:0.2.6-4_ru.po to Russian -# -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# -# Developers do not need to manually edit POT or PO files. -# -# Ilgiz Kalmetev , 2002, -# Yuri Kozlov , 2006. -msgid "" -msgstr "" -"Project-Id-Version: 0.2.6-4\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2006-12-24 21:26+0300\n" -"Last-Translator: Yuri Kozlov \n" -"Language-Team: Russian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Вы ДОЛЖНЫ пересобрать ядро с поддержкой фреймбуфера." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Прочтите README.Debian и README. Для zhcon требуется поддержка фреймбуфера в " -"ядре, вы должны пересобрать ядро самостоятельно." reverted: --- zhcon-0.2.6/debian/po/fi.po +++ zhcon-0.2.6.orig/debian/po/fi.po @@ -1,29 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: zhcon\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: \n" -"Last-Translator: Esko Arajärvi \n" -"Language-Team: Finnish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: Finnish\n" -"X-Poedit-Country: FINLAND\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Ydin TÄYTYY kääntää uudelleen sisältämään tuen kehyspuskuroinnille." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Lue tiedostot README.Debian ja README. zhcon vaatii, että ydin tukee " -"kehyspuskurointia. Se on käännettävä käsin uudelleen." reverted: --- zhcon-0.2.6/debian/po/uk.po +++ zhcon-0.2.6.orig/debian/po/uk.po @@ -1,27 +0,0 @@ -# Olexandr Kravchuk -# -msgid "" -msgstr "" -"Project-Id-Version: \n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2008-10-12 15:04+0300\n" -"Last-Translator: Olexandr Kravchuk \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Ви ПОВИННІ перезібрати ядро з підтримкою фреймбуфера." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "Будь ласка, прочитайте файл README.Debian and README. zhcon вимагаєпідтримку ядром фреймбуферу, яку ви можете додати самотужки." reverted: --- zhcon-0.2.6/debian/po/sv.po +++ zhcon-0.2.6.orig/debian/po/sv.po @@ -1,39 +0,0 @@ -# Translators, if you are not familiar with the PO format, gettext -# documentation is worth reading, especially sections dedicated to -# this format, e.g. by running: -# info -n '(gettext)PO Files' -# info -n '(gettext)Header Entry' -# Some information specific to po-debconf are available at -# /usr/share/doc/po-debconf/README-trans -# or http://www.debian.org/intl/l10n/po-debconf/README-trans -# Developers do not need to manually edit POT or PO files. -# , fuzzy -# -# -msgid "" -msgstr "" -"Project-Id-Version: zhcon 1:0.2.3-8.2\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2008-10-13 00:37+0100\n" -"Last-Translator: Martin Bagge \n" -"Language-Team: Swedish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Du MSTE bygga om krnan med framebuffer-std" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Vligen ls README.Debian och README. zhcon behver en krna med std fr " -"framebuffer, denna krna mste du bygga sjlv." reverted: --- zhcon-0.2.6/debian/po/eu.po +++ zhcon-0.2.6.orig/debian/po/eu.po @@ -1,33 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# pi,,, , 2008 -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2008-10-15 00:35+0200\n" -"Last-Translator: pi,,, \n" -"Language-Team: debian-l19n-basque@lists.debian.org\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.2-rc1\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "Kernela framebuffer onarpenarekin berreraiki behar duzu." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Mesedez irakurri README.Debian eta README fitxategiak. Zhcon-ek eskuz eraiki " -"duzun framebuffer onartzen duen kernel bat behar du." reverted: --- zhcon-0.2.6/debian/po/it.po +++ zhcon-0.2.6.orig/debian/po/it.po @@ -1,33 +0,0 @@ -# Italian TRANSLATION OF ZHCON'S.PO-DEBCONF FILE -# Copyright (C) 2008 THE ZHCON'S COPYRIGHT HOLDER -# This file is distributed under the same license as the zhcon package. -# -# Vincenzo Campanella , 2008. -msgid "" -msgstr "" -"Project-Id-Version: it\n" -"Report-Msgid-Bugs-To: zhcon@packages.debian.org\n" -"POT-Creation-Date: 2008-10-12 09:11+0200\n" -"PO-Revision-Date: 2008-10-12 11:34+0200\n" -"Last-Translator: Vincenzo Campanella \n" -"Language-Team: Italian \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" - -#. Type: note -#. Description -#: ../templates:1001 -msgid "You MUST rebuild kernel with framebuffer support." -msgstr "È OBBLIGATORIO ricompilare il kernel con supporto per il framebuffer." - -#. Type: note -#. Description -#: ../templates:1001 -msgid "" -"Please read README.Debian and README. zhcon need a kernel supporting " -"framebuffer, you have to build it by yourself." -msgstr "" -"Consultare README.Debian e README. zhcon necessita di un kernel con supporto " -"per il framebuffer, è necessario compilarlo da sé." only in patch2: unchanged: --- zhcon-0.2.6.orig/debian/install +++ zhcon-0.2.6/debian/install @@ -0,0 +1 @@ +debian/lintian/zhcon usr/share/lintian/overrides only in patch2: unchanged: --- zhcon-0.2.6.orig/debian/copyright +++ zhcon-0.2.6/debian/copyright @@ -9,6 +9,8 @@ Hu Yong Copyright: + Copyright (C) 2001 ejoy + Copyright (C) 2001 huyong This program is under GPL license. only in patch2: unchanged: --- zhcon-0.2.6.orig/debian/source.lintian-overrides +++ zhcon-0.2.6/debian/source.lintian-overrides @@ -0,0 +1 @@ +zhcon source: not-using-po-debconf only in patch2: unchanged: --- zhcon-0.2.6.orig/debian/lintian/zhcon +++ zhcon-0.2.6/debian/lintian/zhcon @@ -0,0 +1,2 @@ +zhcon: setuid-binary usr/bin/zhcon 4755 root/root +zhcon: binary-or-shlib-defines-rpath ./usr/bin/zhcon /usr/lib/unicon only in patch2: unchanged: --- zhcon-0.2.6.orig/src/display/lrmi.c +++ zhcon-0.2.6/src/display/lrmi.c @@ -33,6 +33,13 @@ #include "lrmi.h" +#if defined(__linux__) && !defined(TF_MASK) + #define TF_MASK X86_EFLAGS_TF + #define IF_MASK X86_EFLAGS_IF + #define VIF_MASK X86_EFLAGS_VIF + #define IOPL_MASK X86_EFLAGS_IOPL +#endif + #define REAL_MEM_BASE ((void *)0x10000) #define REAL_MEM_SIZE 0x10000 #define REAL_MEM_BLOCKS 0x100