--- wml-2.0.11.orig/wml_backend/p2_mp4h/config.sub +++ wml-2.0.11/wml_backend/p2_mp4h/config.sub @@ -1,23 +1,20 @@ #! /bin/sh -# Configuration validation subroutine script. +# Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2005-12-11' +timestamp='2007-07-22' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 +# 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 # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software @@ -30,36 +27,23 @@ # the same distribution terms that you use for the rest of that program. +# Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. +# This script attempts to guess a canonical system name similar to +# config.sub. If it succeeds, it prints the system name on stdout, and +# exits with 0. Otherwise, it exits with 1. +# +# The plan is that this can be called by configure scripts if you +# don't specify an explicit build system type. me=`echo "$0" | sed -e 's,.*/,,'` usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS +Usage: $0 [OPTION] -Canonicalize a configuration name. +Output the configuration name of the system \`$me' is run on. Operation modes: -h, --help print this help, then exit @@ -69,8 +53,9 @@ Report bugs and patches to ." version="\ -GNU config.sub ($timestamp) +GNU config.guess ($timestamp) +Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -94,1502 +79,1434 @@ - ) # Use stdin as input. break ;; -* ) - echo "$me: invalid option $1$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - * ) break ;; esac done -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac +if test $# != 0; then + echo "$me: too many arguments$help" >&2 + exit 1 +fi -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac +trap 'exit 1' 1 2 15 -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -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 | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; +# 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. + +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +# Portable tmp directory creation inspired by the Autoconf team. + +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > $dummy.c ; + for c in cc gcc c89 c99 ; do + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + 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 ; set_cc_for_build= ;' + +# This is needed to find uname on a Pyramid OSx when run in the BSD universe. +# (ghazi@noc.rutgers.edu 1994-08-24) +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then + PATH=$PATH:/.attbin ; export PATH +fi + +UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown +UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown + +# Note: order is significant - the case branches are not exclusive. + +case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in + *:NetBSD:*:*) + # NetBSD (nbsd) targets should (where applicable) match one or + # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # *-*-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. + # + # Note: NetBSD doesn't particularly care about the vendor + # portion of the name. We always set it to "unknown". + sysctl="sysctl -n hw.machine_arch" + UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + case "${UNAME_MACHINE_ARCH}" in + armeb) machine=armeb-unknown ;; + arm*) machine=arm-unknown ;; + sh3el) machine=shl-unknown ;; + sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; + *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + esac + # The Operating System including object format, if it has switched + # to ELF recently, or will in the future. + case "${UNAME_MACHINE_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 + then + # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). + # Return netbsd for either. FIX? + os=netbsd + else + os=netbsdelf + fi + ;; + *) + os=netbsd + ;; + esac + # The OS release + # 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 ;; + *:OpenBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; + alpha:OSF1:*:*) + case $UNAME_RELEASE in + *4.0) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` + ;; + *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. + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; + Alpha\ *:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # Should we change UNAME_MACHINE based on the output of uname instead + # of the specific Alpha model? + echo alpha-pc-interix + exit ;; + 21064:Windows_NT:50:3) + echo alpha-dec-winnt3.5 + exit ;; + Amiga*:UNIX_System_V:4.0:*) + echo m68k-unknown-sysv4 + exit ;; + *:[Aa]miga[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-amigaos + exit ;; + *:[Mm]orph[Oo][Ss]:*:*) + echo ${UNAME_MACHINE}-unknown-morphos + exit ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; + arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) + echo arm-acorn-riscix${UNAME_RELEASE} + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; + SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) + echo hppa1.1-hitachi-hiuxmpp + exit ;; + Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) + # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. + if test "`(/bin/universe) 2>/dev/null`" = att ; then + echo pyramid-pyramid-sysv3 + else + echo pyramid-pyramid-bsd + fi + exit ;; + NILE*:*:*:dcosx) + echo pyramid-pyramid-svr4 + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) + case `/usr/bin/uname -p` in + sparc) echo sparc-icl-nx7; exit ;; + esac ;; + sun4H:SunOS:5.*:*) + echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) + echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:6*:*) + # According to config.sub, this is the proper way to canonicalize + # SunOS6. Hard to guess exactly what SunOS6 will be like, but + # it's likely to be more like Solaris than SunOS4. + echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + sun4*:SunOS:*:*) + case "`/usr/bin/arch -k`" in + Series*|S4*) + UNAME_RELEASE=`uname -v` + ;; + esac + # Japanese Language versions have a version number like `4.1.3-JL'. + echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` + exit ;; + sun3*:SunOS:*:*) + echo m68k-sun-sunos${UNAME_RELEASE} + exit ;; + sun*:*:4.2BSD:*) + UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 + case "`/bin/arch`" in + sun3) + echo m68k-sun-sunos${UNAME_RELEASE} + ;; + sun4) + echo sparc-sun-sunos${UNAME_RELEASE} + ;; + esac + exit ;; + aushp:SunOS:*:*) + echo sparc-auspex-sunos${UNAME_RELEASE} + exit ;; + # The situation for MiNT is a little confusing. The machine name + # can be virtually everything (everything which is not + # "atarist" or "atariste" at least should have a processor + # > m68000). The system name ranges from "MiNT" over "FreeMiNT" + # to the lowercase version "mint" (or "freemint"). Finally + # the system name "TOS" denotes a system which is actually not + # MiNT. But MiNT is downward compatible to TOS, so this should + # be no problem. + atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; + powerpc:machten:*:*) + echo powerpc-apple-machten${UNAME_RELEASE} + exit ;; + RISC*:Mach:*:*) + echo mips-dec-mach_bsd4.3 + exit ;; + RISC*:ULTRIX:*:*) + echo mips-dec-ultrix${UNAME_RELEASE} + exit ;; + VAX*:ULTRIX*:*:*) + echo vax-dec-ultrix${UNAME_RELEASE} + exit ;; + 2020:CLIX:*:* | 2430:CLIX:*:*) + echo clipper-intergraph-clix${UNAME_RELEASE} + exit ;; + mips:*:*:UMIPS | mips:*:*:RISCos) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif + #if defined (host_mips) && defined (MIPSEB) + #if defined (SYSTYPE_SYSV) + printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_SVR4) + printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); + #endif + #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) + printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); + #endif + #endif + exit (-1); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } + echo mips-mips-riscos${UNAME_RELEASE} + exit ;; + Motorola:PowerMAX_OS:*:*) + echo powerpc-motorola-powermax + exit ;; + Motorola:*:4.3:PL8-*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) + echo powerpc-harris-powermax + exit ;; + Night_Hawk:Power_UNIX:*:*) + echo powerpc-harris-powerunix + exit ;; + m88k:CX/UX:7*:*) + echo m88k-harris-cxux7 + exit ;; + m88k:*:4*:R4*) + echo m88k-motorola-sysv4 + exit ;; + m88k:*:3*:R3*) + echo m88k-motorola-sysv3 + exit ;; + AViiON:dgux:*:*) + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` + if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] + then + if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ + [ ${TARGET_BINARY_INTERFACE}x = x ] + then + echo m88k-dg-dgux${UNAME_RELEASE} + else + echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} + fi + exit ;; + M88*:DolphinOS:*:*) # DolphinOS (SVR3) + echo m88k-dolphin-sysv3 + exit ;; + M88*:*:R3*:*) + # Delta 88k system running SVR3 + echo m88k-motorola-sysv3 + exit ;; + XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) + echo m88k-tektronix-sysv3 + exit ;; + Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) + echo m68k-tektronix-bsd + exit ;; + *:IRIX*:*:*) + echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` + exit ;; + ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + i*86:AIX:*:*) + echo i386-ibm-aix + exit ;; + ia64:AIX:*:*) + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} + exit ;; + *: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 + + main() + { + if (!__power_pc()) + exit(1); + puts("powerpc-ibm-aix3.2.5"); + exit(0); + } +EOF + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi + elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then + echo rs6000-ibm-aix3.2.4 + else + echo rs6000-ibm-aix3.2 + fi + exit ;; + *:AIX:*:[45]) + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then + IBM_ARCH=rs6000 + else + IBM_ARCH=powerpc + fi + if [ -x /usr/bin/oslevel ] ; then + IBM_REV=`/usr/bin/oslevel` + else + IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} + fi + echo ${IBM_ARCH}-ibm-aix${IBM_REV} + exit ;; + *:AIX:*:*) + echo rs6000-ibm-aix + exit ;; + ibmrt:4.4BSD:*|romp-ibm:BSD:*) + echo romp-ibm-bsd4.4 + exit ;; + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and + echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to + exit ;; # report: romp-ibm BSD 4.3 + *:BOSX:*:*) + echo rs6000-bull-bosx + exit ;; + DPX/2?00:B.O.S.:*:*) + echo m68k-bull-sysv3 + exit ;; + 9000/[34]??:4.3bsd:1.*:*) + echo m68k-hp-bsd + exit ;; + hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) + echo m68k-hp-bsd4.4 + exit ;; + 9000/[34678]??:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + case "${UNAME_MACHINE}" in + 9000/31? ) HP_ARCH=m68000 ;; + 9000/[34]?? ) HP_ARCH=m68k ;; + 9000/[678][0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; + '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 + esac ;; + esac + fi + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE + #include + #include + + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); + + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } +EOF + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa + fi ;; + esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi + echo ${HP_ARCH}-hp-hpux${HPUX_REV} + exit ;; + ia64:HP-UX:*:*) + HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` + echo ia64-hp-hpux${HPUX_REV} + exit ;; + 3050*:HI-UX:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + int + main () + { + long cpu = sysconf (_SC_CPU_VERSION); + /* The order matters, because CPU_IS_HP_MC68K erroneously returns + true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct + results, however. */ + if (CPU_IS_PA_RISC (cpu)) + { + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; + case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; + default: puts ("hppa-hitachi-hiuxwe2"); break; + } + } + else if (CPU_IS_HP_MC68K (cpu)) + puts ("m68k-hitachi-hiuxwe2"); + else puts ("unknown-hitachi-hiuxwe2"); + exit (0); + } +EOF + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } + echo unknown-hitachi-hiuxwe2 + exit ;; + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) + echo hppa1.1-hp-bsd + exit ;; + 9000/8??:4.3bsd:*:*) + echo hppa1.0-hp-bsd + exit ;; + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit ;; + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) + echo hppa1.1-hp-osf + exit ;; + hp8??:OSF1:*:*) + echo hppa1.0-hp-osf + exit ;; + i*86:OSF1:*:*) + if [ -x /usr/sbin/sysversion ] ; then + echo ${UNAME_MACHINE}-unknown-osf1mk + else + echo ${UNAME_MACHINE}-unknown-osf1 + fi + exit ;; + parisc*:Lites*:*:*) + echo hppa1.1-hp-lites + exit ;; + C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) + echo c1-convex-bsd + exit ;; + C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) + echo c34-convex-bsd + exit ;; + C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) + echo c38-convex-bsd + exit ;; + C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) + echo c4-convex-bsd + exit ;; + CRAY*Y-MP:*:*:*) + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*[A-Z]90:*:*:*) + echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ + | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*TS:*:*:*) + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; + F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) + FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; + i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit ;; + sparc*:BSD/OS:*:*) + echo sparc-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} + exit ;; + *:FreeBSD:*:*) + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; + i*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; + *:MINGW*:*) + echo ${UNAME_MACHINE}-pc-mingw32 + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; + i*:Windows_NT*:* | Pentium*:Windows_NT*:*) + # How do we know it's Interix rather than the generic POSIX subsystem? + # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we + # UNAME_MACHINE based on the output of uname instead of i386? + echo i586-pc-interix + exit ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; + p*:CYGWIN*:*) + echo powerpcle-unknown-cygwin + exit ;; + prep*:SunOS:5.*:*) + echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; + *:GNU:*:*) + # the GNU system + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit ;; + arm*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; + ia64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + m68*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + mips:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips + #undef mipsel + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mipsel + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; + ppc:Linux:*:*) + echo powerpc-unknown-linux-gnu + exit ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit ;; + alpha:Linux:*:*) + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + EV5) UNAME_MACHINE=alphaev5 ;; + EV56) UNAME_MACHINE=alphaev56 ;; + PCA56) UNAME_MACHINE=alphapca56 ;; + PCA57) UNAME_MACHINE=alphapca56 ;; + EV6) UNAME_MACHINE=alphaev6 ;; + EV67) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; + esac + objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null + if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi + echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + exit ;; + parisc:Linux:*:* | hppa:Linux:*:*) + # Look for CPU level + case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in + PA7*) echo hppa1.1-unknown-linux-gnu ;; + PA8*) echo hppa2.0-unknown-linux-gnu ;; + *) echo hppa-unknown-linux-gnu ;; + esac + exit ;; + parisc64:Linux:*:* | hppa64:Linux:*:*) + echo hppa64-unknown-linux-gnu + exit ;; + s390:Linux:*:* | s390x:Linux:*:*) + echo ${UNAME_MACHINE}-ibm-linux + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sh*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + sparc:Linux:*:* | sparc64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; + x86_64:Linux:*:*) + echo x86_64-unknown-linux-gnu + exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; + i*86:Linux:*:*) + # The BFD linker knows what the default object file format is, so + # first see if it will tell us. cd to the root directory to prevent + # problems with other programs or directories called `ld' in the path. + # Set LC_ALL=C to ensure ld outputs messages in English. + ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + | sed -ne '/supported targets:/!d + s/[ ][ ]*/ /g + s/.*supported targets: *// + s/ .*// + p'` + case "$ld_supported_targets" in + elf32-i386) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + a.out-i386-linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit ;; + coff-i386) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit ;; + "") + # Either a pre-BFD a.out linker (linux-gnuoldld) or + # one that does not give us useful --help. + echo "${UNAME_MACHINE}-pc-linux-gnuoldld" + exit ;; + esac + # Determine whether the default compiler is a.out or elf + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #include + #ifdef __ELF__ + # ifdef __GLIBC__ + # if __GLIBC__ >= 2 + LIBC=gnu + # else + LIBC=gnulibc1 + # endif + # else + LIBC=gnulibc1 + # endif + #else + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) + LIBC=gnu + #else + LIBC=gnuaout + #endif + #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + ;; + i*86:DYNIX/ptx:4*:*) + # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. + # earlier versions are messed up and put the nodename in both + # sysname and nodename. + echo i386-sequent-sysv4 + exit ;; + i*86:UNIX_SV:4.2MP:2.*) + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, + # I just have to hope. -- rms. + # Use sysv4.2uw... so that sysv4* matches it. + echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; + i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) + UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` + if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. + case `/bin/uname -X | grep "^Machine"` in + *486*) UNAME_MACHINE=i486 ;; + *Pentium) UNAME_MACHINE=i586 ;; + *Pent*|*Celeron) UNAME_MACHINE=i686 ;; + esac + echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + exit ;; + i*86:*:3.2:*) + if test -f /usr/options/cb.name; then + UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then + UNAME_REL=`(/bin/uname -X|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|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/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 ;; + pc:*:*:*) + # Left here for compatibility: + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i386. + echo i386-pc-msdosdjgpp + exit ;; + Intel:Mach:3*:*) + echo i386-pc-mach3 + exit ;; + paragon:*:*:*) + echo i860-intel-osf1 + exit ;; + i860:*:4.*:*) # i860-SVR4 + if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + else # Add other i860-SVR4 vendors below as they are discovered. + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + fi + exit ;; + mini*:CTIX:SYS*5:*) + # "miniframe" + echo m68010-convergent-sysv + exit ;; + mc68k:UNIX:SYSTEM5:3.51m) + echo m68k-convergent-sysv + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + OS_REL='' + test -r /etc/.relid \ + && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; + m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) + echo m68k-unknown-lynxos${UNAME_RELEASE} + exit ;; + mc68030:UNIX_System_V:4.*:*) + echo m68k-atari-sysv4 + exit ;; + TSUNAMI:LynxOS:2.*:*) + echo sparc-unknown-lynxos${UNAME_RELEASE} + exit ;; + rs6000:LynxOS:2.*:*) + echo rs6000-unknown-lynxos${UNAME_RELEASE} + exit ;; + PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) + echo powerpc-unknown-lynxos${UNAME_RELEASE} + exit ;; + SM[BE]S:UNIX_SV:*:*) + echo mips-dde-sysv${UNAME_RELEASE} + exit ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + RM*:SINIX-*:*:*) + echo mips-sni-sysv4 + exit ;; + *:SINIX-*:*:*) + if uname -p 2>/dev/null >/dev/null ; then + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 + else + echo ns32k-sni-sysv + fi + exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; + *:UNIX_System_V:4*:FTX*) + # From Gerald Hewes . + # How about differentiating between stratus architectures? -djm + echo hppa1.1-stratus-sysv4 + exit ;; + *:*:*:FTX*) + # From seanf@swdc.stratus.com. + echo i860-stratus-sysv4 + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit ;; + mc68*:A/UX:*:*) + echo m68k-apple-aux${UNAME_RELEASE} + exit ;; + news*:NEWS-OS:6*:*) + echo mips-sony-newsos6 + exit ;; + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) + if [ -d /usr/nec ]; then + echo mips-nec-sysv${UNAME_RELEASE} + else + echo mips-unknown-sysv${UNAME_RELEASE} + fi + exit ;; + BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. + echo powerpc-be-beos + exit ;; + BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. + echo powerpc-apple-beos + exit ;; + BePC:BeOS:*:*) # BeOS running on Intel PC compatible. + echo i586-pc-beos + exit ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit ;; + SX-6:SUPER-UX:*:*) + echo sx6-nec-superux${UNAME_RELEASE} + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit ;; + *:Darwin:*:*) + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + UNAME_PROCESSOR=`uname -p` + if test "$UNAME_PROCESSOR" = "x86"; then + UNAME_PROCESSOR=i386 + UNAME_MACHINE=pc + fi + echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} + exit ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit ;; + *:Plan9:*:*) + # "uname -m" is not consistent, so use $cputype instead. 386 + # is converted to i386 for consistency with other x86 + # operating systems. + if test "$cputype" = "386"; then + UNAME_MACHINE=i386 + else + UNAME_MACHINE="$cputype" + fi + echo ${UNAME_MACHINE}-unknown-plan9 + exit ;; + *:TOPS-10:*:*) + echo pdp10-unknown-tops10 + exit ;; + *:TENEX:*:*) + echo pdp10-unknown-tenex + exit ;; + KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) + echo pdp10-dec-tops20 + exit ;; + XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) + echo pdp10-xkl-tops20 + exit ;; + *:TOPS-20:*:*) + echo pdp10-unknown-tops20 + exit ;; + *:ITS:*:*) + echo pdp10-unknown-its + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | 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 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | mt \ - | msp430 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m32c) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; +#echo '(No uname command or uname output not recognized.)' 1>&2 +#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - m32c-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - 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 - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - 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 - ;; - 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 - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - 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-* | 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/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - 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 - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; +eval $set_cc_for_build +cat >$dummy.c < +# include +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (__arm) && defined (__acorn) && defined (__unix) + printf ("arm-acorn-riscix\n"); exit (0); +#endif + +#if defined (hp300) && !defined (hpux) + printf ("m68k-hp-bsd\n"); exit (0); +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); + +#endif + +#if defined (vax) +# if !defined (ultrix) +# include +# if defined (BSD) +# if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +# else +# if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# endif +# else + printf ("vax-dec-bsd\n"); exit (0); +# endif +# else + printf ("vax-dec-ultrix\n"); exit (0); +# endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac +# Apollos put the system type in the environment. -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } -# Decode manufacturer-specific aliases for certain operating systems. +# Convex versions that predate uname can use getsysinfo(1) -if [ x"$os" != x"" ] +if [ -x /usr/convex/getsysinfo ] then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -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* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac + case `getsysinfo -f cpu_type` in + c1*) + echo c1-convex-bsd + exit ;; + c2*) + if getsysinfo -f scalar_acc + then echo c32-convex-bsd + else echo c2-convex-bsd + fi + exit ;; + c34*) + echo c34-convex-bsd + exit ;; + c38*) + echo c38-convex-bsd + exit ;; + c4*) + echo c4-convex-bsd + exit ;; + esac fi -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess timestamp = $timestamp + +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null` + +hostinfo = `(hostinfo) 2>/dev/null` +/bin/universe = `(/bin/universe) 2>/dev/null` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` +/bin/arch = `(/bin/arch) 2>/dev/null` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` + +UNAME_MACHINE = ${UNAME_MACHINE} +UNAME_RELEASE = ${UNAME_RELEASE} +UNAME_SYSTEM = ${UNAME_SYSTEM} +UNAME_VERSION = ${UNAME_VERSION} +EOF -echo $basic_machine$os -exit +exit 1 # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- wml-2.0.11.orig/wml_backend/p9_slice/slice.pod +++ wml-2.0.11/wml_backend/p9_slice/slice.pod @@ -356,7 +356,7 @@ Copyright (c) 1997-2002 Ralf S. Engelschall. Copyright (c) 1999-2002 Denis Barbier. -=head1 SEEALSO +=head1 SEE ALSO Slice Home: http://www.engelschall.com/sw/slice/ --- wml-2.0.11.orig/wml_backend/p8_htmlstrip/Makefile.in +++ wml-2.0.11/wml_backend/p8_htmlstrip/Makefile.in @@ -27,11 +27,11 @@ SRC_FILES = htmlstrip.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e '/^=head1/,/^=cut/d' \ @@ -41,9 +41,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod >$@ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod >$@ rm -f $*.pod all: $(EXE_FILES) $(MAN_FILES) --- wml-2.0.11.orig/wml_backend/p7_htmlfix/Makefile.in +++ wml-2.0.11/wml_backend/p7_htmlfix/Makefile.in @@ -27,11 +27,11 @@ SRC_FILES = htmlfix.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e '/^=head1/,/^=cut/d' \ @@ -41,9 +41,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod >$@ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod >$@ rm -f $*.pod all: $(EXE_FILES) $(MAN_FILES) --- wml-2.0.11.orig/wml_backend/p6_asubst/Makefile.in +++ wml-2.0.11/wml_backend/p6_asubst/Makefile.in @@ -27,11 +27,11 @@ SRC_FILES = asubst.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e '/^=head1/,/^=cut/d' \ @@ -41,9 +41,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod >$@ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod >$@ rm -f $*.pod all: $(EXE_FILES) $(MAN_FILES) --- wml-2.0.11.orig/wml_backend/p1_ipp/Makefile.in +++ wml-2.0.11/wml_backend/p1_ipp/Makefile.in @@ -27,11 +27,11 @@ SRC_FILES = ipp.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e '/^=head1/,/^=cut/d' \ @@ -41,9 +41,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod |\ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod |\ sed -e 's/^.ds N" """""/.ds N" ""/g' \ -e 's/^.ds T" """""/.ds T" ""/g' >$@ rm -f $*.pod --- wml-2.0.11.orig/wml_backend/p1_ipp/ipp.src +++ wml-2.0.11/wml_backend/p1_ipp/ipp.src @@ -17,6 +17,7 @@ use Getopt::Long 2.13; use IO::Handle 1.15; use IO::File 1.06; +use File::Temp; # # help functions @@ -565,6 +566,8 @@ # process the pre-loaded include files # $tmpdir = $ENV{'TMPDIR'} || '/tmp'; +my $tmpldir = ($ENV{'TMPDIR'} || '/tmp') . '/ipp.XXXXXX'; +$tmpdir = mkdtemp($tmpldir) or die "Unable to create temporary directory: $!\n"; $tmpfile = $tmpdir . "/ipp.$$.tmp"; unlink($tmpfile); $tmp = new IO::File; --- wml-2.0.11.orig/wml_backend/p3_eperl/eperl_sys.c +++ wml-2.0.11/wml_backend/p3_eperl/eperl_sys.c @@ -211,13 +211,20 @@ { char ca[1024]; char *cp, *tmpdir; + char tmpfile[]="eperl_sourceXXXXXX"; int i; + int fd=-1; tmpdir = getenv ("TMPDIR"); if (tmpdir == (char *) NULL) tmpdir="/tmp"; - snprintf(ca, sizeof(ca), "%s/%s.%d.tmp%d", tmpdir, id, (int)getpid(), mytmpfilecnt++); + snprintf(ca, sizeof(ca), "%s/%s", tmpdir, tmpfile); + if((fd = mkstemp(tmpfile)) == -1){ + perror("can not create tmpfile"); + return NULL; + } + close(fd); ca[sizeof(ca)-1] = NUL; cp = strdup(ca); for (i = 0; mytmpfiles[i] != NULL; i++) --- wml-2.0.11.orig/wml_backend/p3_eperl/eperl.pod +++ wml-2.0.11/wml_backend/p3_eperl/eperl.pod @@ -891,7 +891,7 @@ rse@engelschall.com www.engelschall.com -=head1 SEEALSO +=head1 SEE ALSO Parse::ePerl(3), Apache::ePerl(3). --- wml-2.0.11.orig/wml_backend/p5_divert/Makefile.in +++ wml-2.0.11/wml_backend/p5_divert/Makefile.in @@ -27,11 +27,11 @@ SRC_FILES = divert.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e '/^=head1/,/^=cut/d' \ @@ -41,9 +41,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod >$@ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod >$@ rm -f $*.pod all: $(EXE_FILES) $(MAN_FILES) --- wml-2.0.11.orig/wml_backend/Makefile.in +++ wml-2.0.11/wml_backend/Makefile.in @@ -16,14 +16,10 @@ SUBDIRS = \ p1_ipp \ - p2_mp4h \ - p3_eperl \ - p4_gm4 \ p5_divert \ p6_asubst \ p7_htmlfix \ - p8_htmlstrip \ - p9_slice + p8_htmlstrip # ------------------------------------------------ # THE DEFAULT TARGETS --- wml-2.0.11.orig/wml_aux/map2html/Makefile.in +++ wml-2.0.11/wml_aux/map2html/Makefile.in @@ -27,11 +27,11 @@ SRC_FILES = map2html.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e '/^=head1/,/^=cut/d' \ @@ -42,9 +42,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod >$@ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod >$@ rm -f $*.pod all: $(EXE_FILES) $(MAN_FILES) --- wml-2.0.11.orig/wml_aux/htmlinfo/Makefile.in +++ wml-2.0.11/wml_aux/htmlinfo/Makefile.in @@ -28,11 +28,11 @@ SRC_FILES = htmlinfo.src -MAN_FILES = $(SRC_FILES:.src=.1) +MAN_FILES = $(SRC_FILES:.src=.3) EXE_FILES = $(SRC_FILES:.src=.pl) .SUFFIXES: -.SUFFIXES: .pl .1 .src +.SUFFIXES: .pl .3 .src .src.pl: sed -e 's|\@PATH_PERL\@|$(PATH_PERL)|g' \ @@ -40,9 +40,9 @@ -e 's|\@INSTALLARCHLIB\@|$(INSTALLARCHLIB)|g' \ <$< >$@ && chmod a+x $@ -.src.1: +.src.3: cp $< $*.pod - pod2man --section=1 --center="EN Tools" --release="EN Tools" $*.pod >$@ + pod2man --section=3 --center="EN Tools" --release="EN Tools" $*.pod >$@ rm -f $*.pod all: $(EXE_FILES) $(MAN_FILES) --- wml-2.0.11.orig/wml_aux/txt2html/txt2html.txt +++ wml-2.0.11/wml_aux/txt2html/txt2html.txt @@ -1,3 +1,8 @@ +.TH WML_AUX_TXT2HTML 3 "4 Jan 1999" "WML" "Website META Language" +.SH NAME +wml_aux_txt2html \- text to HTML converter +.RE +.nf txt2html -- Text to HTML converter http://www.aigeek.com/txt2html/ --- wml-2.0.11.orig/wml_aux/Makefile.in +++ wml-2.0.11/wml_aux/Makefile.in @@ -15,15 +15,9 @@ VPATH = @srcdir@ SUBDIRS = \ - iselect \ - htmlclean \ htmlinfo \ - linklint \ map2html \ - tidy \ - txt2html \ - weblint \ - freetable + txt2html # ------------------------------------------------ # TARGETS --- wml-2.0.11.orig/wml_list.txt +++ wml-2.0.11/wml_list.txt @@ -0,0 +1,217 @@ +wml: usr/bin/wmb +wml: usr/bin/wmd +wml: usr/bin/wmk +wml: usr/bin/wml +wml: usr/bin/wmu +wml: usr/lib/wml/exec/wml_aux_freetable +wml: usr/lib/wml/exec/wml_aux_htmlclean +wml: usr/lib/wml/exec/wml_aux_htmlinfo +wml: usr/lib/wml/exec/wml_aux_iselect +wml: usr/lib/wml/exec/wml_aux_linklint +wml: usr/lib/wml/exec/wml_aux_map2html +wml: usr/lib/wml/exec/wml_aux_newtxt2html +wml: usr/lib/wml/exec/wml_aux_tidy +wml: usr/lib/wml/exec/wml_aux_txt2html +wml: usr/lib/wml/exec/wml_aux_weblint +wml: usr/lib/wml/exec/wml_p1_ipp +wml: usr/lib/wml/exec/wml_p2_mp4h +wml: usr/lib/wml/exec/wml_p3_eperl +wml: usr/lib/wml/exec/wml_p4_gm4 +wml: usr/lib/wml/exec/wml_p5_divert +wml: usr/lib/wml/exec/wml_p6_asubst +wml: usr/lib/wml/exec/wml_p7_htmlfix +wml: usr/lib/wml/exec/wml_p8_htmlstrip +wml: usr/lib/wml/exec/wml_p9_slice +wml: usr/lib/wml/perl/lib/File/PathConvert.pm +wml: usr/lib/wml/perl/lib/i386-linux-thread-multi/WML/GD.pm +wml: usr/lib/wml/perl/lib/i386-linux-thread-multi/auto/WML/GD/GD.bs +wml: usr/lib/wml/perl/lib/i386-linux-thread-multi/auto/WML/GD/GD.so +wml: usr/lib/wml/perl/lib/i386-linux-thread-multi/auto/WML/GD/autosplit.ix +wml: usr/share/doc/wml/ANNOUNCE.gz +wml: usr/share/doc/wml/BUGREPORT +wml: usr/share/doc/wml/COPYRIGHT +wml: usr/share/doc/wml/COPYRIGHT.OTHER +wml: usr/share/doc/wml/CREDITS.gz +wml: usr/share/doc/wml/MANIFEST.gz +wml: usr/share/doc/wml/NEWS.gz +wml: usr/share/doc/wml/README +wml: usr/share/doc/wml/README.Debian +wml: usr/share/doc/wml/README.mp4h.gz +wml: usr/share/doc/wml/SUPPORT +wml: usr/share/doc/wml/VERSION +wml: usr/share/doc/wml/VERSION.HISTORY +wml: usr/share/doc/wml/changelog.Debian.gz +wml: usr/share/doc/wml/changelog.gz +wml: usr/share/doc/wml/copyright +wml: usr/share/doc/wml/wml_contrib/README +wml: usr/share/doc/wml/wml_contrib/mkwml.gz +wml: usr/share/doc/wml/wml_contrib/navbar-FH.wml.gz +wml: usr/share/doc/wml/wml_contrib/tkwmd.gz +wml: usr/share/doc/wml/wml_contrib/wmg.cgi.gz +wml: usr/share/doc/wml/wml_contrib/wml.spec.in +wml: usr/share/doc/wml/wml_contrib/wml.vim.gz +wml: usr/share/doc/wml/wml_contrib/wml1to2.gz +wml: usr/share/man/man1/wmb.1.gz +wml: usr/share/man/man1/wmd.1.gz +wml: usr/share/man/man1/wmd_missing.1.gz +wml: usr/share/man/man1/wmk.1.gz +wml: usr/share/man/man1/wml.1.gz +wml: usr/share/man/man1/wmu.1.gz +wml: usr/share/man/man3/wml::all.3.gz +wml: usr/share/man/man3/wml::des::all.3.gz +wml: usr/share/man/man3/wml::des::gfont.3.gz +wml: usr/share/man/man3/wml::des::imgbg.3.gz +wml: usr/share/man/man3/wml::des::imgdot.3.gz +wml: usr/share/man/man3/wml::des::lowsrc.3.gz +wml: usr/share/man/man3/wml::des::navbar.3.gz +wml: usr/share/man/man3/wml::des::preload.3.gz +wml: usr/share/man/man3/wml::des::rollover.3.gz +wml: usr/share/man/man3/wml::des::space.3.gz +wml: usr/share/man/man3/wml::des::typography.3.gz +wml: usr/share/man/man3/wml::fmt::all.3.gz +wml: usr/share/man/man3/wml::fmt::isolatin.3.gz +wml: usr/share/man/man3/wml::fmt::pod.3.gz +wml: usr/share/man/man3/wml::fmt::sdf.3.gz +wml: usr/share/man/man3/wml::fmt::text.3.gz +wml: usr/share/man/man3/wml::fmt::url.3.gz +wml: usr/share/man/man3/wml::fmt::verbatim.3.gz +wml: usr/share/man/man3/wml::fmt::xtable.3.gz +wml: usr/share/man/man3/wml::imp::all.3.gz +wml: usr/share/man/man3/wml::imp::csmap.3.gz +wml: usr/share/man/man3/wml::imp::fsview.3.gz +wml: usr/share/man/man3/wml::imp::generic.3.gz +wml: usr/share/man/man3/wml::mod::MakeMaker.3.gz +wml: usr/share/man/man3/wml::mod::all.3.gz +wml: usr/share/man/man3/wml::mod::version.3.gz +wml: usr/share/man/man3/wml::std::all.3.gz +wml: usr/share/man/man3/wml::std::box.3.gz +wml: usr/share/man/man3/wml::std::case.3.gz +wml: usr/share/man/man3/wml::std::grid.3.gz +wml: usr/share/man/man3/wml::std::href.3.gz +wml: usr/share/man/man3/wml::std::info.3.gz +wml: usr/share/man/man3/wml::std::label.3.gz +wml: usr/share/man/man3/wml::std::lang.3.gz +wml: usr/share/man/man3/wml::std::logo.3.gz +wml: usr/share/man/man3/wml::std::page.3.gz +wml: usr/share/man/man3/wml::std::tags.3.gz +wml: usr/share/man/man3/wml::std::toc.3.gz +wml: usr/share/man/man3/wml::sup::all.3.gz +wml: usr/share/man/man3/wml::sup::hextriple.3.gz +wml: usr/share/man/man3/wml::sup::path.3.gz +wml: usr/share/man/man3/wml::sys::all.3.gz +wml: usr/share/man/man3/wml::sys::bootp3.3.gz +wml: usr/share/man/man3/wml::sys::bootp4.3.gz +wml: usr/share/man/man3/wml::sys::compat1.3.gz +wml: usr/share/man/man3/wml_aux_htmlinfo.3.gz +wml: usr/share/man/man3/wml_aux_map2html.3.gz +wml: usr/share/man/man3/wml_aux_txt2html.3.gz +wml: usr/share/man/man3/wml_p1_ipp.3.gz +wml: usr/share/man/man3/wml_p5_divert.3.gz +wml: usr/share/man/man3/wml_p6_asubst.3.gz +wml: usr/share/man/man3/wml_p7_htmlfix.3.gz +wml: usr/share/man/man3/wml_p8_htmlstrip.3.gz +wml: usr/share/man/man7/wml_faq.7.gz +wml: usr/share/man/man7/wml_intro.7.gz +wml: usr/share/man/man7/wml_macros.7.gz +wml: usr/share/man/man7/wml_tags.7.gz +wml: usr/share/man/man7/wml_tutorial.7.gz +wml: usr/share/wml/aux/logos/logo-apache.gif +wml: usr/share/wml/aux/logos/logo-apache.info +wml: usr/share/wml/aux/logos/logo-apache.png +wml: usr/share/wml/aux/logos/logo-freebsd.gif +wml: usr/share/wml/aux/logos/logo-freebsd.info +wml: usr/share/wml/aux/logos/logo-freebsd.png +wml: usr/share/wml/aux/logos/logo-gimp.gif +wml: usr/share/wml/aux/logos/logo-gimp.info +wml: usr/share/wml/aux/logos/logo-gimp.png +wml: usr/share/wml/aux/logos/logo-htdig.gif +wml: usr/share/wml/aux/logos/logo-htdig.info +wml: usr/share/wml/aux/logos/logo-htdig.png +wml: usr/share/wml/aux/logos/logo-linux.gif +wml: usr/share/wml/aux/logos/logo-linux.info +wml: usr/share/wml/aux/logos/logo-linux.png +wml: usr/share/wml/aux/logos/logo-netbsd.gif +wml: usr/share/wml/aux/logos/logo-netbsd.info +wml: usr/share/wml/aux/logos/logo-netbsd.png +wml: usr/share/wml/aux/logos/logo-openbsd.gif +wml: usr/share/wml/aux/logos/logo-openbsd.info +wml: usr/share/wml/aux/logos/logo-openbsd.png +wml: usr/share/wml/aux/logos/logo-php.gif +wml: usr/share/wml/aux/logos/logo-php.info +wml: usr/share/wml/aux/logos/logo-php.png +wml: usr/share/wml/aux/logos/logo-php3.gif +wml: usr/share/wml/aux/logos/logo-php3.info +wml: usr/share/wml/aux/logos/logo-php3.png +wml: usr/share/wml/aux/logos/logo-vim.gif +wml: usr/share/wml/aux/logos/logo-vim.info +wml: usr/share/wml/aux/logos/logo-vim.png +wml: usr/share/wml/aux/logos/logo-wml.gif +wml: usr/share/wml/aux/logos/logo-wml.info +wml: usr/share/wml/aux/logos/logo-wml.png +wml: usr/share/wml/aux/logos/logo-xemacs.gif +wml: usr/share/wml/aux/logos/logo-xemacs.info +wml: usr/share/wml/aux/logos/logo-xemacs.png +wml: usr/share/wml/aux/txt2html.dict +wml: usr/share/wml/aux/weblintrc +wml: usr/share/wml/aux/wmd.map +wml: usr/share/wml/aux/wmd.txt +wml: usr/share/wml/include/all.wml +wml: usr/share/wml/include/des/all.wml +wml: usr/share/wml/include/des/gfont.wml +wml: usr/share/wml/include/des/imgbg.wml +wml: usr/share/wml/include/des/imgdot.wml +wml: usr/share/wml/include/des/lowsrc.wml +wml: usr/share/wml/include/des/navbar.wml +wml: usr/share/wml/include/des/preload.wml +wml: usr/share/wml/include/des/rollover.wml +wml: usr/share/wml/include/des/space.wml +wml: usr/share/wml/include/des/typography.wml +wml: usr/share/wml/include/fmt/all.wml +wml: usr/share/wml/include/fmt/isolatin.wml +wml: usr/share/wml/include/fmt/pod.wml +wml: usr/share/wml/include/fmt/sdf.wml +wml: usr/share/wml/include/fmt/text.wml +wml: usr/share/wml/include/fmt/url.wml +wml: usr/share/wml/include/fmt/verbatim.wml +wml: usr/share/wml/include/fmt/xtable.wml +wml: usr/share/wml/include/imp/all.wml +wml: usr/share/wml/include/imp/csmap.wml +wml: usr/share/wml/include/imp/fsview.wml +wml: usr/share/wml/include/imp/generic.wml +wml: usr/share/wml/include/mod/MakeMaker.wml +wml: usr/share/wml/include/mod/all.wml +wml: usr/share/wml/include/mod/version.wml +wml: usr/share/wml/include/std/all.wml +wml: usr/share/wml/include/std/box.wml +wml: usr/share/wml/include/std/case.wml +wml: usr/share/wml/include/std/grid.wml +wml: usr/share/wml/include/std/href.wml +wml: usr/share/wml/include/std/info.wml +wml: usr/share/wml/include/std/label.wml +wml: usr/share/wml/include/std/lang.wml +wml: usr/share/wml/include/std/logo.wml +wml: usr/share/wml/include/std/page.wml +wml: usr/share/wml/include/std/tags.wml +wml: usr/share/wml/include/std/toc.wml +wml: usr/share/wml/include/sup/all.wml +wml: usr/share/wml/include/sup/hextriple.wml +wml: usr/share/wml/include/sup/path.wml +wml: usr/share/wml/include/sys/all.wml +wml: usr/share/wml/include/sys/bootp3.wml +wml: usr/share/wml/include/sys/bootp4.wml +wml: usr/share/wml/include/sys/compat1.wml +wmload: usr/bin/wmload +wmload: usr/share/doc/wmload/README.gz +wmload: usr/share/doc/wmload/changelog.Debian.gz +wmload: usr/share/doc/wmload/copyright +wmload: usr/share/man/man1/wmload.1x.gz +wmload: usr/share/menu/wmload +wmlongrun: usr/bin/wmlongrun +wmlongrun: usr/share/doc/wmlongrun/AUTHORS +wmlongrun: usr/share/doc/wmlongrun/NEWS.gz +wmlongrun: usr/share/doc/wmlongrun/README +wmlongrun: usr/share/doc/wmlongrun/TODO +wmlongrun: usr/share/doc/wmlongrun/changelog.Debian.gz +wmlongrun: usr/share/doc/wmlongrun/changelog.gz +wmlongrun: usr/share/doc/wmlongrun/copyright +wmlongrun: usr/share/man/man1/wmlongrun.1.gz --- wml-2.0.11.orig/etc/config.sub +++ wml-2.0.11/etc/config.sub @@ -1,9 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2002-09-05' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +22,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +72,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +85,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +101,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -118,7 +120,9 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ + uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -144,7 +148,7 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis) + -apple | -axis | -knuth | -cray) os= basic_machine=$1 ;; @@ -169,6 +173,10 @@ -hiux*) os=-hiuxwe2 ;; + -sco6) + os=-sco5v6 + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco5) os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -185,6 +193,10 @@ # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` + ;; -sco*) os=-sco3.2v2 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` @@ -228,14 +240,17 @@ | 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 \ - | clipper \ + | am33_2.0 \ + | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | bfin \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ + | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ - | m32r | m68000 | m68k | m88k | mcore \ + | ip2k | iq2000 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | mcore | mep \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -244,25 +259,33 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | mt \ + | msp430 \ + | nios | nios2 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | score \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic80 | tron \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu | strongarm \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ - | x86 | xscale | xstormy16 | xtensa \ + | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ | z8k) basic_machine=$basic_machine-unknown ;; @@ -273,6 +296,9 @@ ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) ;; + ms1) + basic_machine=mt-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and @@ -292,20 +318,20 @@ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ - | clipper-* | cydra-* \ + | avr-* | avr32-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ + | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ - | m32r-* \ + | ip2k-* | iq2000-* \ + | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -314,26 +340,36 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | xstormy16-* | xtensa-* \ | ymp-* \ | z8k-*) ;; @@ -353,6 +389,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -367,6 +406,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 @@ -426,12 +471,27 @@ basic_machine=j90-cray os=-unicos ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16) + basic_machine=cr16-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; cris | cris-* | etrax*) basic_machine=cris-axis ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -454,6 +514,10 @@ basic_machine=m88k-motorola os=-sysv3 ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx @@ -619,6 +683,10 @@ basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -632,10 +700,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 @@ -648,6 +712,9 @@ basic_machine=i386-pc os=-msdos ;; + ms1-*) + basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` + ;; mvs) basic_machine=i370-ibm os=-mvs @@ -723,9 +790,12 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 ;; OSE68000 | ose68000) basic_machine=m68000-ericsson @@ -752,24 +822,36 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -802,6 +884,10 @@ basic_machine=i586-unknown os=-pw32 ;; + rdos) + basic_machine=i386-pc + os=-rdos + ;; rom68k) basic_machine=m68k-rom68k os=-coff @@ -828,6 +914,14 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -835,6 +929,12 @@ basic_machine=sh-hitachi os=-hms ;; + sh5el) + basic_machine=sh5le-unknown + ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -901,10 +1001,6 @@ basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -913,14 +1009,18 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) 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 ;; @@ -934,6 +1034,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -977,9 +1081,9 @@ basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt + xbox) + basic_machine=i686-pc + os=-mingw32 ;; xps | xps100) basic_machine=xps100-honeywell @@ -1011,6 +1115,9 @@ romp) basic_machine=romp-ibm ;; + mmix) + basic_machine=mmix-knuth + ;; rs6000) basic_machine=rs6000-ibm ;; @@ -1027,13 +1134,10 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; - sparc | sparcv9 | sparcv9b) + sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) basic_machine=sparc-sun ;; cydra) @@ -1106,18 +1210,23 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ + | -openbsd* | -solidbsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1129,16 +1238,21 @@ ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1151,6 +1265,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1172,6 +1289,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1194,6 +1314,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1224,6 +1347,15 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; + -zvmoe) + os=-zvmoe + ;; -none) ;; *) @@ -1246,6 +1378,12 @@ # system, and we'll never get to this point. case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; *-acorn) os=-riscix1.2 ;; @@ -1255,6 +1393,9 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1280,6 +1421,9 @@ m68*-cisco) os=-aout ;; + mep-*) + os=-elf + ;; mips*-cisco) os=-elf ;; @@ -1298,9 +1442,15 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; + *-knuth) + os=-mmixware + ;; *-wec) os=-proelf ;; @@ -1433,9 +1583,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; @@ -1460,7 +1616,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- wml-2.0.11.orig/etc/config.guess +++ wml-2.0.11/etc/config.guess @@ -1,9 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, +# Inc. -timestamp='2002-09-03' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +18,15 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +56,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +69,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -98,30 +101,32 @@ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do - if ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; then + if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; 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 ; -unset files' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -156,6 +161,7 @@ arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; + sh5el) machine=sh5le-unknown ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched @@ -178,144 +184,128 @@ ;; esac # The OS release - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # Debian GNU/NetBSD machines have a different userland, and + # thus, need a distinct triplet. However, they do not need + # kernel version information, so it can be replaced with a + # suitable tag, in the style of linux-gnu. + case "${UNAME_VERSION}" in + Debian*) + release='-gnu' + ;; + *) + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + ;; + esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - arc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - pmax:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mipseb-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - wgrisc:OpenBSD:*:*) - echo mipsel-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit ;; + *:SolidBSD:*:*) + echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} + exit ;; + macppc:MirBSD:*:*) + echo powerpc-unknown-mirbsd${UNAME_RELEASE} + exit ;; + *:MirBSD:*:*) + echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} + exit ;; alpha:OSF1:*:*) - if test $UNAME_RELEASE = "V4.0"; then + case $UNAME_RELEASE in + *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - fi + ;; + *5.*) + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + ;; + esac + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac + # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD $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" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; + *:z/VM:*:*) + echo s390-ibm-zvmoe + exit ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -323,29 +313,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) + exit ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit ;; + DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) + exit ;; + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -354,10 +347,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -369,10 +362,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -383,37 +376,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -437,33 +433,33 @@ exit (-1); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS) + exit ;; + Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -479,29 +475,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -509,7 +505,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -524,15 +520,18 @@ exit(0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -546,28 +545,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -623,17 +622,37 @@ exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -661,146 +680,182 @@ exit (0); } EOF - $CC_FOR_BUILD $dummy.c -o $dummy && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; + *:UNICOS/mp:*:*) + echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) - # Determine whether the default compiler uses glibc. - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #if __GLIBC__ >= 2 - LIBC=gnu - #else - LIBC= - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} - exit 0 ;; + case ${UNAME_MACHINE} in + pc98) + echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + amd64) + echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + *) + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + esac + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) + exit ;; + *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:3*) - echo i386-pc-interix3 - exit 0 ;; + exit ;; + *:Interix*:[3456]*) + case ${UNAME_MACHINE} in + x86) + echo i586-pc-interix${UNAME_RELEASE} + exit ;; + EM64T | authenticamd) + echo x86_64-unknown-interix${UNAME_RELEASE} + exit ;; + esac ;; + [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) + echo i${UNAME_MACHINE}-pc-mks + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i386-pc-interix - exit 0 ;; + echo i586-pc-interix + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + avr32*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit ;; + crisv32:Linux:*:*) + echo crisv32-axis-linux-gnu + exit ;; + frv:Linux:*:*) + echo frv-unknown-linux-gnu + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + m32r*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -817,16 +872,45 @@ #endif #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir - test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + ;; + mips64:Linux:*:*) + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c + #undef CPU + #undef mips64 + #undef mips64el + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) + CPU=mips64el + #else + #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) + CPU=mips64 + #else + CPU= + #endif + #endif +EOF + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^CPU/{ + s: ::g + p + }'`" + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -840,7 +924,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -848,22 +932,31 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; + vax:Linux:*:*) + echo ${UNAME_MACHINE}-dec-linux-gnu + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; + xtensa:Linux:*:*) + echo xtensa-unknown-linux-gnu + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -881,15 +974,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -906,24 +999,33 @@ LIBC=gnulibc1 # endif #else - #ifdef __INTEL_COMPILER + #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) LIBC=gnu #else LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' + /^LIBC/{ + s: ::g + p + }'`" + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -931,7 +1033,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -939,15 +1061,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; - M68*:*:R3V[567]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0) + exit ;; + M680?0:D-NIX:5.3:*) + echo m68k-diab-dnix + exit ;; + M68*:*:R3V[5678]*:*) + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1042,64 +1162,81 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; + SX-7:SUPER-UX:*:*) + echo sx7-nec-superux${UNAME_RELEASE} + exit ;; + SX-8:SUPER-UX:*:*) + echo sx8-nec-superux${UNAME_RELEASE} + exit ;; + SX-8R:SUPER-UX:*:*) + echo sx8r-nec-superux${UNAME_RELEASE} + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} - exit 0 ;; + UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1107,22 +1244,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1133,36 +1273,47 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; + exit ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit ;; + *:*VMS:*:*) + UNAME_MACHINE=`(uname -p) 2>/dev/null` + case "${UNAME_MACHINE}" in + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; + esac ;; + *:XENIX:*:SysV) + echo i386-pc-xenix + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; + i*86:rdos:*:*) + echo ${UNAME_MACHINE}-pc-rdos + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1194,7 +1345,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1283,12 +1434,12 @@ } EOF -$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1297,22 +1448,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1323,7 +1474,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- wml-2.0.11.orig/wml_common/Makefile.in +++ wml-2.0.11/wml_common/Makefile.in @@ -32,16 +32,16 @@ INSTALLMAN1DIR= \ INST_MAN3DIR= \ INSTALLMAN3DIR= -PERL_OPTS = @PERL_OPTS@ +PERL_OPTS = @PERL_OPTS@ LD_RUN_PATH= INITVARS = \ - have_getoptlong=@have_getoptlong@ \ - have_bitvector=@have_bitvector@ \ - have_filepathconvert=@have_filepathconvert@ \ - have_imagesize=@have_imagesize@ \ - have_io=@have_io@ \ - have_termreadkey=@have_termreadkey@ \ - have_htmlclean=0 \ + have_getoptlong=1 \ + have_imagesize=1 \ + have_io=1 \ + have_termreadkey=1 \ + have_htmlclean=1 \ + have_bitvector=1 \ + have_filepathconvert=0 \ have_gd=0 SUBDIRS = \ --- wml-2.0.11.orig/wml_docs/wml_std_wai10.txt +++ wml-2.0.11/wml_docs/wml_std_wai10.txt @@ -1,3 +1,8 @@ +.TH WML_STD_WAI10 7 "5 May 1999" "WML" "Website META Language" +.SH NAME +WAI-WEBCONTENT-19990505 \- Web Content Accessibility Guidelines 1.0 +.RE +.nf W3C --- wml-2.0.11.orig/wml_docs/wml_std_html401.txt +++ wml-2.0.11/wml_docs/wml_std_html401.txt @@ -1,3 +1,8 @@ +.TH WML_STD_HTML401 7 "24 Dec 1999" "WML" "Website META Language" +.SH NAME +REC-html401-19991224 \- HTML 4.01 Specification +.RE +.nf W3C --- wml-2.0.11.orig/wml_docs/wml_tags.pod.in +++ wml-2.0.11/wml_docs/wml_tags.pod.in @@ -20,17 +20,17 @@ %%INCL%% -=head1 SEEALSO +=head1 SEE ALSO wml(1), -wml_p1_ipp(1), +wml_p1_ipp(3), wml_p2_mp4h(1), wml_p3_eperl(1), wml_p4_gm4(1), -wml_p5_divert(1), -wml_p6_asubst(1), -wml_p7_htmlfix(1), -wml_p8_htmlstrip(1), +wml_p5_divert(3), +wml_p6_asubst(3), +wml_p7_htmlfix(3), +wml_p8_htmlstrip(3), wml_p9_slice(1), wml::all(3) --- wml-2.0.11.orig/wml_docs/wml_std_css2.txt +++ wml-2.0.11/wml_docs/wml_std_css2.txt @@ -1,6 +1,8 @@ - ------------------------------------------------------------------------ - - REC-CSS2-19980512 +.TH WML_STD_CSS2 7 "12 May 1998" "WML" "Website META Language" +.SH NAME +REC-CSS2-19980512 \- Cascading Style Sheets, level 2 +.RE +.nf Cascading Style Sheets, level 2 CSS2 Specification --- wml-2.0.11.orig/wml_docs/wml_std_xhtml10.txt +++ wml-2.0.11/wml_docs/wml_std_xhtml10.txt @@ -1,3 +1,8 @@ +.TH WML_STD_XHTML10 7 "26 Jan 2000" "WML" "Website META Language" +.SH NAME +REC-xhtml1-20000126 \- XHTML 1.0 +.RE +.nf XHTML(TM) 1.0: The Extensible HyperText Markup Language --- wml-2.0.11.orig/wml_docs/wml_tags.L.main +++ wml-2.0.11/wml_docs/wml_tags.L.main @@ -1,15 +1,15 @@ #!wml wml(1) ... wml(1) -#include wml_p1_ipp(1) -#use wml_p1_ipp(1) -#depends wml_p1_ipp(1) -\ wml_p1_ipp(1) -__FILE__ wml_p1_ipp(1) -__LINE__ wml_p1_ipp(1) -__END__ wml_p1_ipp(1) -$(...) wml_p1_ipp(1) -# wml_p1_ipp(1) +#include wml_p1_ipp(3) +#use wml_p1_ipp(3) +#depends wml_p1_ipp(3) +\ wml_p1_ipp(3) +__FILE__ wml_p1_ipp(3) +__LINE__ wml_p1_ipp(3) +__END__ wml_p1_ipp(3) +$(...) wml_p1_ipp(3) +# wml_p1_ipp(3) <__file__> wml_p2_mp4h(1) <__line__> wml_p2_mp4h(1) @@ -89,11 +89,10 @@ wml_p2_mp4h(1) wml_p2_mp4h(1) wml_p2_mp4h(1) + wml_p2_mp4h(1) wml_p2_mp4h(1) wml_p2_mp4h(1) wml_p2_mp4h(1) - wml_p2_mp4h(1) - wml_p2_mp4h(1) wml_p2_mp4h(1) wml_p2_mp4h(1) wml_p2_mp4h(1) @@ -121,6 +120,11 @@ wml_p2_mp4h(1) wml_p2_mp4h(1) +... intl:gettext(3) + intl:gettext(3) + intl:gettext(3) + intl:gettext(3) + <: ... :> wml_p3_eperl(1) <:= ... :> wml_p3_eperl(1) @@ -131,18 +135,18 @@ m4_ifdef wml_p4_gm4(1) m4_ifelse wml_p4_gm4(1) -{#NAME#} wml_p5_divert(1) -{#NAME#: wml_p5_divert(1) -:#NAME#} wml_p5_divert(1) -<> wml_p5_divert(1) -..NAME>> wml_p5_divert(1) -<> wml_p5_divert(3) +..NAME>> wml_p5_divert(3) +<... wml_p8_htmlstrip(1) - wml_p8_htmlstrip(1) +... wml_p8_htmlstrip(3) + wml_p8_htmlstrip(3) [NAME:...:] wml_p9_slice(1) [NAME:...:NAME] wml_p9_slice(1) --- wml-2.0.11.orig/wml_docs/wml_faq.pod +++ wml-2.0.11/wml_docs/wml_faq.pod @@ -388,7 +388,7 @@ =back -=head1 SEEALSO +=head1 SEE ALSO wml_intro(7), wml_tutorial(7), --- wml-2.0.11.orig/wml_docs/wml_std_csspos.txt +++ wml-2.0.11/wml_docs/wml_std_csspos.txt @@ -1,4 +1,8 @@ - WD-positioning-19970819 +.TH WML_STD_CSSPOS 7 "19 Aug 1997" "WML" "Website META Language" +.SH NAME +WD-positioning-19970819 \- Positioning HTML Elements with Cascading Style Sheets +.RE +.nf Positioning HTML Elements with Cascading Style Sheets --- wml-2.0.11.orig/wml_docs/wml_tutorial.pod +++ wml-2.0.11/wml_docs/wml_tutorial.pod @@ -760,18 +760,18 @@ Additionally can can step through the set of available standard include files WML ships with. Start with the top-level include file wml::all(3). -=head1 SEEALSO +=head1 SEE ALSO wml_intro(7) -wml_p1_ipp(1), +wml_p1_ipp(3), wml_p2_mp4h(1), wml_p3_eperl(1), wml_p4_gm4(1), -wml_p5_divert(1), -wml_p6_asubst(1), -wml_p7_htmlfix(1), -wml_p8_htmlstrip(1), +wml_p5_divert(3), +wml_p6_asubst(3), +wml_p7_htmlfix(3), +wml_p8_htmlstrip(3), wml_p9_slice(1). wml::all(3) --- wml-2.0.11.orig/wml_docs/wml_std_html20.txt +++ wml-2.0.11/wml_docs/wml_std_html20.txt @@ -1,3 +1,8 @@ +.TH WML_STD_HTML20 7 "Nov 1995" "WML" "Website META Language" +.SH NAME +HTML 2 \- Hypertext Markup Language \- 2.0 +.RE +.nf Network Working Group T. Berners-Lee Request for Comments: 1866 MIT/W3C --- wml-2.0.11.orig/wml_docs/wml_std_html32.txt +++ wml-2.0.11/wml_docs/wml_std_html32.txt @@ -1,4 +1,8 @@ - REC-html32 +.TH WML_STD_HTML32 7 "14 Jan 1997" "WML" "Website META Language" +.SH NAME +REC-html32 \- HTML 3.2 Reference Specification +.RE +.nf HTML 3.2 Reference Specification --- wml-2.0.11.orig/wml_docs/wml_barebone.txt +++ wml-2.0.11/wml_docs/wml_barebone.txt @@ -1,3 +1,9 @@ +.TH WML_BAREBONE 7 "Jan 1999" "WML" "Website META Language" +.SH NAME +wml_barebone \- the Bare Bones Guide to HTML +.RE +.nf + +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ T H E B A R E B O N E S G U I D E T O H T M L --- wml-2.0.11.orig/wml_docs/wml_std_html40.txt +++ wml-2.0.11/wml_docs/wml_std_html40.txt @@ -1,4 +1,8 @@ - REC-html40-971218 +.TH WML_STD_HTML40 7 "18 Dec 1997" "WML" "Website META Language" +.SH NAME +REC-html40-971218 \- HTML 4.0 Specification +.RE +.nf HTML 4.0 Specification --- wml-2.0.11.orig/wml_docs/wml_intro.pod +++ wml-2.0.11/wml_docs/wml_intro.pod @@ -33,7 +33,7 @@ Processing: explicit Implementation: Include Pre-Processor (IPP) Author: Ralf S. Engelschall - See Also: wml_p1_ipp(1) + See Also: wml_p1_ipp(3) B @@ -196,7 +196,7 @@ Processing: explicit Implementation: Divert Author: Ralf S. Engelschall - See Also: wml_p5_divert(1) + See Also: wml_p5_divert(3) B @@ -255,7 +255,7 @@ Processing: explicit Implementation: Area Subst (ASubst) Author: Ralf S. Engelschall - See Also: wml_p6_asubst(1) + See Also: wml_p6_asubst(3) B @@ -285,7 +285,7 @@ Processing: implicit Implementation: HTMLfix Author: Ralf S. Engelschall - See Also: wml_p7_htmlfix(1) + See Also: wml_p7_htmlfix(3) B @@ -302,7 +302,7 @@ Processing: implicit Implementation: HTMLstrip Author: Ralf S. Engelschall - See Also: wml_p8_htmlfix(1) + See Also: wml_p8_htmlfix(3) B @@ -424,19 +424,19 @@ Additionally can can step through the set of available standard include files WML ships with. Start with the top-level include file wml::all(3). -=head1 SEEALSO +=head1 SEE ALSO wml_tutorial(7), wml_tags(7). -wml_p1_ipp(1), +wml_p1_ipp(3), wml_p2_mp4h(1), wml_p3_eperl(1), wml_p4_gm4(1), -wml_p5_divert(1), -wml_p6_asubst(1), -wml_p7_htmlfix(1), -wml_p8_htmlstrip(1), +wml_p5_divert(3), +wml_p6_asubst(3), +wml_p7_htmlfix(3), +wml_p8_htmlstrip(3), wml_p9_slice(1). wml::all(3) --- wml-2.0.11.orig/wml_docs/wml_std_css1.txt +++ wml-2.0.11/wml_docs/wml_std_css1.txt @@ -1,4 +1,8 @@ - REC-CSS1-961217 +.TH WML_STD_CSS1 7 "17 Dec 1996" "WML" "Website META Language" +.SH NAME +REC-CSS1-961217 \- Cascading Style Sheets, level 1 +.RE +.nf Cascading Style Sheets, level 1 --- wml-2.0.11.orig/wml_include/fmt/xtable.src +++ wml-2.0.11/wml_include/fmt/xtable.src @@ -66,6 +66,13 @@ which converts its advanced table syntax to plain HTML table markup code. See wml_aux_freetable(1) for more details. +=head1 CAVEATS + +An error is reported if C body contains ePerl code, so the +special variable C has to be written onto C<#include> +lines (see wml_p1_ipp(1)), and macros expanded by C(1) +must not print ePerl code. + =head1 AUTHOR Ralf S. Engelschall @@ -77,7 +84,7 @@ Internal: P1, P2, P3, wml_aux_freetable (PATH) External: -- -=head1 SEEALSO +=head1 SEE ALSO wml_aux_freetable(1), HTML CtableE> tag. --- wml-2.0.11.orig/wml_include/fmt/text.src +++ wml-2.0.11/wml_include/fmt/text.src @@ -14,15 +14,12 @@ local (*FP); # read the txt2html result - open(FP, "$(WML_LOC_LIBDIR)/exec/wml_aux_txt2html $arg->{FILE}|"); + my $txt2html = '$(WML_LOC_LIBDIR)/exec/wml_aux_'.(defined($arg->{OPTIONS}) ? 'new' : '').'txt2html'; + open(FP, "$txt2html $arg->{OPTIONS} --extract $arg->{FILE}|"); local ($/) = undef; $buf = ; close(FP); - # cut out the body - $buf =~ s|^.*||is; - $buf =~ s|.*$||is; - # give headlines a more typographically strong look if (not $arg->{NOTYPO}) { $buf =~ s|^()(.+?)()|$1$3$4|isg; @@ -34,13 +31,15 @@ - + + { my $tmpfile = "$(WML_TMPDIR)/wml.txt2html.$$.tmp"; my $notypo = (qq|| eq '' ? 1 : 0); + my $options = q{}; my $buf; %body @@ -52,12 +51,12 @@ close(TXT); $tmpfile, NOTYPO => $notypo })" /> + "&wml_fmt_text({ FILE => $tmpfile, NOTYPO => $notypo, OPTIONS => $options })" /> unlink($tmpfile); } - + @@ -72,9 +71,9 @@ #use wml::fmt::text - <: print &wml_fmt_text({ FILE => $file, ...}); :> + <: print &wml_fmt_text({ FILE => $file, OPTIONS => '--xhtml', ...}); :> - + FOO === @@ -89,12 +88,37 @@ The usage is simple: Surround the text with the CtextE> container tag and then just write plain ASCII text inside it. The corresponding HTML -code is created via F(1), a filter which gives the ASCII +code is created via F(3), a filter which gives the ASCII text nice formatting semantic which control the HTML result. +If B field is specified, a newer F(1) filter is called +instead of F, which is dead upstream. This allows for +instance generation of XGTML markup. + The core conversion function is wml_fmt_text() which also can be used by other include files. +=head1 ATTRIBUTES + +These attributes can be used both in the CtextE> tag (in +lowercase letters) and in C arguments, as shown in +examples above. + +=over 4 + +=item C + +By default, font commands are added to headings to highlight them. +This attribute prevents alteration of F output. + +=item C> + +This attribute performs two actions: select F filter instead of +F, and I arguments are passed litterally on the +command line of F. + +=back + =head1 AUTHOR Ralf S. Engelschall @@ -106,9 +130,9 @@ Internal: P1, P2, P3, wml_aux_txt2html (WML) External: -- -=head1 SEEALSO +=head1 SEE ALSO -wml_aux_txt2html(1) +txt2html(1), wml_aux_txt2html(3) =cut --- wml-2.0.11.orig/wml_include/fmt/sdf.src +++ wml-2.0.11/wml_include/fmt/sdf.src @@ -125,7 +125,7 @@ Internal: P1, P2, P3 External: sdf -=head1 SEEALSO +=head1 SEE ALSO sdf(1), http://www.mincom.com/mtr/sdf/ --- wml-2.0.11.orig/wml_include/fmt/pod.src +++ wml-2.0.11/wml_include/fmt/pod.src @@ -153,7 +153,7 @@ Internal: P1, P2, P3 External: pod2html (PATH) -=head1 SEEALSO +=head1 SEE ALSO perlpod(1), http://www.perl.com/perl/ --- wml-2.0.11.orig/wml_include/fmt/url.src +++ wml-2.0.11/wml_include/fmt/url.src @@ -47,7 +47,7 @@ Internal: P1, P2, P6 External: -- -=head1 SEEALSO +=head1 SEE ALSO HTML CaE> tag. --- wml-2.0.11.orig/wml_include/fmt/isolatin.src +++ wml-2.0.11/wml_include/fmt/isolatin.src @@ -154,7 +154,7 @@ Internal: P1, P2, P6 External: -- -=head1 SEEALSO +=head1 SEE ALSO ISO Latin 1 character table --- wml-2.0.11.orig/wml_include/fmt/all.src +++ wml-2.0.11/wml_include/fmt/all.src @@ -47,7 +47,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::fmt::isolatin(3), wml::fmt::verbatim(3), --- wml-2.0.11.orig/wml_include/fmt/verbatim.src +++ wml-2.0.11/wml_include/fmt/verbatim.src @@ -96,7 +96,7 @@ Internal: P1, P6 External: -- -=head1 SEEALSO +=head1 SEE ALSO HTML CpreE> tag --- wml-2.0.11.orig/wml_include/sys/bootp4.src +++ wml-2.0.11/wml_include/sys/bootp4.src @@ -36,7 +36,7 @@ P4 -=head1 SEEALSO +=head1 SEE ALSO wml_p4_gm4(1), m4(1) --- wml-2.0.11.orig/wml_include/sys/bootp3.src.in +++ wml-2.0.11/wml_include/sys/bootp3.src.in @@ -42,7 +42,7 @@ P3 -=head1 SEEALSO +=head1 SEE ALSO wml_p3_eperl(1), perl(1) --- wml-2.0.11.orig/wml_include/sys/compat1.src +++ wml-2.0.11/wml_include/sys/compat1.src @@ -77,7 +77,7 @@ P2 -=head1 SEEALSO +=head1 SEE ALSO wml_p2_mp4h(1) --- wml-2.0.11.orig/wml_include/sys/all.src +++ wml-2.0.11/wml_include/sys/all.src @@ -43,7 +43,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::sys::bootp3(3), wml::sys::bootp4(3), --- wml-2.0.11.orig/wml_include/des/imgbg.src +++ wml-2.0.11/wml_include/des/imgbg.src @@ -226,7 +226,7 @@ Internal: P1, P2, P3 -=head1 SEEALSO +=head1 SEE ALSO HTML ECE tag. --- wml-2.0.11.orig/wml_include/des/navbar.src +++ wml-2.0.11/wml_include/des/navbar.src @@ -1210,7 +1210,7 @@ Internal: P1, P2, P3 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/wml_include/des/lowsrc.src +++ wml-2.0.11/wml_include/des/lowsrc.src @@ -65,7 +65,7 @@ Internal: P1, P2, P3 External: convert (PATH) -=head1 SEEALSO +=head1 SEE ALSO ImageMagick --- wml-2.0.11.orig/wml_include/des/gfont.src +++ wml-2.0.11/wml_include/des/gfont.src @@ -322,7 +322,7 @@ Internal: P1, P2, P3, Image::Size (P5M) External: gfont (PATH) -=head1 SEEALSO +=head1 SEE ALSO HTML CfontE> tag, gfont(1), --- wml-2.0.11.orig/wml_include/des/rollover.src +++ wml-2.0.11/wml_include/des/rollover.src @@ -155,7 +155,7 @@ Internal: P1, P2 External: JavaScript (BROWSER) -=head1 SEEALSO +=head1 SEE ALSO HTML 3.2 CimgE> and CaE> tags, JavaScript: http://home.netscape.com/eng/mozilla/3.0/handbook/javascript/ --- wml-2.0.11.orig/wml_include/des/space.src +++ wml-2.0.11/wml_include/des/space.src @@ -81,7 +81,7 @@ Internal: P1, P2, wml::des::imgdot (WML) -=head1 SEEALSO +=head1 SEE ALSO wml::des::imgdot(3) --- wml-2.0.11.orig/wml_include/des/typography.src +++ wml-2.0.11/wml_include/des/typography.src @@ -462,7 +462,7 @@ Internal: P1, P2, P3, P8 -=head1 SEEALSO +=head1 SEE ALSO HTML CfontE> and CbrE> tags. --- wml-2.0.11.orig/wml_include/des/imgdot.src +++ wml-2.0.11/wml_include/des/imgdot.src @@ -217,7 +217,7 @@ Internal: P1, P2, P3 -=head1 SEEALSO +=head1 SEE ALSO HTML ECE tag. --- wml-2.0.11.orig/wml_include/des/preload.src +++ wml-2.0.11/wml_include/des/preload.src @@ -99,7 +99,7 @@ Internal: P1, P2 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::std::tags(3) HTML 3.2 CimgE> tag. --- wml-2.0.11.orig/wml_include/des/all.src +++ wml-2.0.11/wml_include/des/all.src @@ -51,7 +51,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::des::gfont(3), wml::des::imgbg(3), --- wml-2.0.11.orig/wml_include/mod/all.src +++ wml-2.0.11/wml_include/mod/all.src @@ -36,7 +36,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::mod::MakeMaker(3), wml::mod::version(3). --- wml-2.0.11.orig/wml_include/imp/fsview.src +++ wml-2.0.11/wml_include/imp/fsview.src @@ -192,7 +192,7 @@ Internal: P1, P2, P3 External: -- -=head1 SEEALSO +=head1 SEE ALSO - --- wml-2.0.11.orig/wml_include/imp/csmap.src +++ wml-2.0.11/wml_include/imp/csmap.src @@ -48,7 +48,7 @@ This tag converts a externally stored server-side map (either NCSA or CERN format) to an inlined client-side map. This is done via the external program -wml_aux_map2html(1). +wml_aux_map2html(3). =head1 AUTHOR @@ -61,7 +61,7 @@ Internal: P1, P2, P3 External: wml_aux_map2html (PATH) -=head1 SEEALSO +=head1 SEE ALSO wml_aux_map2html(3) --- wml-2.0.11.orig/wml_include/imp/generic.src +++ wml-2.0.11/wml_include/imp/generic.src @@ -152,7 +152,7 @@ Internal: P1, P2, P3 External: LWP::Simple::get (P5M) | lynx (PATH) | wget (PATH) | fetch (PATH) -=head1 SEEALSO +=head1 SEE ALSO LWP::Simple(3), lynx(1), wget(1), fetch(1) --- wml-2.0.11.orig/wml_include/imp/all.src +++ wml-2.0.11/wml_include/imp/all.src @@ -38,7 +38,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::imp::csmap(3), wml::imp::fsview(3), --- wml-2.0.11.orig/wml_include/sup/hextriple.src +++ wml-2.0.11/wml_include/sup/hextriple.src @@ -58,7 +58,7 @@ Internal: P1, P3 External: -- -=head1 SEEALSO +=head1 SEE ALSO HTML color attributes. --- wml-2.0.11.orig/wml_include/sup/path.src +++ wml-2.0.11/wml_include/sup/path.src @@ -103,7 +103,7 @@ Internal: P1, P3 External: -- -=head1 SEEALSO +=head1 SEE ALSO perl(1) --- wml-2.0.11.orig/wml_include/sup/all.src +++ wml-2.0.11/wml_include/sup/all.src @@ -37,7 +37,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::sup::hextriple(3), wml::sup::path(3). --- wml-2.0.11.orig/wml_include/Makefile.in +++ wml-2.0.11/wml_include/Makefile.in @@ -15,15 +15,16 @@ VPATH = @srcdir@ PATH_PERL = @PATH_PERL@ -INSTALL_PROGRAM = $(top_srcdir)/etc/shtool install -c -m 755 -s -INSTALL_DATA = $(top_srcdir)/etc/shtool install -c -m 644 -MKDIR = $(top_srcdir)/etc/shtool mkdir -f -p -m 755 +INSTALL_PROGRAM = install -c -m 755 -s +INSTALL_DATA = install -c -m 644 +MKDIR = mkdir -p -m 755 prefix = @prefix@ exec_prefix = $(prefix) bindir = $(prefix)/bin libsubdir = @libsubdir@ libdir = $(prefix)/lib$(libsubdir) +datadir = $(prefix)/share$(libsubdir) mandir = $(prefix)/man INSTALLPRIVLIB = @INSTALLPRIVLIB@ @@ -49,7 +50,7 @@ sed -e '/^=head1/,/^=cut/d' -e '/^__END__/,$$d' \ <$$base.src >$$base.wml; \ cp $$base.src $$name.pod; \ - pod2man --section=1 \ + pod2man --section=3 \ --center="EN Tools" \ --release="EN Tools" \ $$name.pod >$$base.3; \ @@ -69,13 +70,13 @@ base=`echo $$file | sed -e 's/\.wml$$//g'`; \ dir=`echo $$file | sed -e 's/[a-zA-Z0-9_]*.wml$$//g'`; \ name=`echo wml/$$base | sed -e 's/\//$(DCOLON)/g'`; \ - if [ ! -d "$(libdir)/include/$$dir" ]; then \ - echo "$(MKDIR) $(libdir)/include/$$dir"; \ - $(MKDIR) $(libdir)/include/$$dir; \ + if [ ! -d "$(datadir)/include/$$dir" ]; then \ + echo "$(MKDIR) $(datadir)/include/$$dir"; \ + $(MKDIR) $(datadir)/include/$$dir; \ else :; \ fi; \ - echo "$(INSTALL_DATA) $$file $(libdir)/include/$$file"; \ - $(INSTALL_DATA) $$file $(libdir)/include/$$file; \ + echo "$(INSTALL_DATA) $$file $(datadir)/include/$$file"; \ + $(INSTALL_DATA) $$file $(datadir)/include/$$file; \ echo "$(INSTALL_DATA) $$base.3 $(mandir)/man3/$$name.3"; \ $(INSTALL_DATA) $$base.3 $(mandir)/man3/$$name.3; \ done --- wml-2.0.11.orig/wml_include/all.src +++ wml-2.0.11/wml_include/all.src @@ -79,7 +79,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::des::all(3), wml::fmt::all(3), --- wml-2.0.11.orig/wml_include/std/box.src +++ wml-2.0.11/wml_include/std/box.src @@ -179,7 +179,7 @@ Internal: P1, P2 -=head1 SEEALSO +=head1 SEE ALSO HTML CtableE> tag. --- wml-2.0.11.orig/wml_include/std/page.src +++ wml-2.0.11/wml_include/std/page.src @@ -24,14 +24,15 @@ -" "" "[WML_STDPAGE_HEAD:" /> +" "" "[WML_STDPAGE_HEAD:" />/>> " "" />\ " " " />\ {#WML_PAGE_HEAD_#}\ - " background=\"\"" "" />\ +/>\ + " background=\"\"" "" />\ />>\ " "none" "" " bgcolor=\"\"" /> /> " bgcolor=\"#ffffff\"" />\ " text=\"\"" " text=\"#000000\"" />\ @@ -176,6 +177,11 @@ C and C. These can be used later in Pass 9 (Slice) for cutting out parts of the page. +=item :html:I=I :body:I=I + +The ``I=I'' pairs are passed along to the ChtmlE> +and CbodyE> HTML tags. + =back =head1 OTHER COMMANDS @@ -198,7 +204,7 @@ Internal: P1, P2, P5 External: -- -=head1 SEEALSO +=head1 SEE ALSO HTML CheadE>, CbodyE> and CtitleE> tags; wml::std::info(3) --- wml-2.0.11.orig/wml_include/std/href.src +++ wml-2.0.11/wml_include/std/href.src @@ -108,7 +108,7 @@ Internal: P1, P2 External: -- -=head1 SEEALSO +=head1 SEE ALSO HTML CaE> and CimgE> tags. --- wml-2.0.11.orig/wml_include/std/toc.src +++ wml-2.0.11/wml_include/std/toc.src @@ -203,7 +203,7 @@ Internal: P1, P2, P5, P6 -=head1 SEEALSO +=head1 SEE ALSO HTML CHxE> CULE> COLE> tags. --- wml-2.0.11.orig/wml_include/std/tags.src +++ wml-2.0.11/wml_include/std/tags.src @@ -407,7 +407,7 @@ Internal: P1, P2, P3, P4, P6 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/wml_include/std/info.src +++ wml-2.0.11/wml_include/std/info.src @@ -155,7 +155,7 @@ Internal: P1, P2 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/wml_include/std/grid.src +++ wml-2.0.11/wml_include/std/grid.src @@ -333,7 +333,7 @@ Internal: P1, P2, P3, P5 External: -- -=head1 SEEALSO +=head1 SEE ALSO HTML ECE-tag. --- wml-2.0.11.orig/wml_include/std/case.src +++ wml-2.0.11/wml_include/std/case.src @@ -69,9 +69,9 @@ Internal: P1, P5, P6 External: -- -=head1 SEEALSO +=head1 SEE ALSO -wml_p7_htmlfix(1). +wml_p7_htmlfix(3). =cut --- wml-2.0.11.orig/wml_include/std/lang.src +++ wml-2.0.11/wml_include/std/lang.src @@ -385,7 +385,7 @@ Internal: P1, P2, P6, P9 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml_p9_slice(1) --- wml-2.0.11.orig/wml_include/std/all.src +++ wml-2.0.11/wml_include/std/all.src @@ -55,7 +55,7 @@ Internal: P1 External: -- -=head1 SEEALSO +=head1 SEE ALSO wml::std::box(3), wml::std::case(3), --- wml-2.0.11.orig/wml_include/std/logo.src +++ wml-2.0.11/wml_include/std/logo.src @@ -195,7 +195,7 @@ logo "php" instead. Expect that the logo "php3" will be removed in future releases. -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/wml_frontend/wmd_missing.src +++ wml-2.0.11/wml_frontend/wmd_missing.src @@ -19,7 +19,7 @@ Denis Barbier barbier@engelschall.com -=head1 SEEALSO +=head1 SEE ALSO wmd(1) --- wml-2.0.11.orig/wml_frontend/wmu.src +++ wml-2.0.11/wml_frontend/wmu.src @@ -382,7 +382,7 @@ rse@engelschall.com www.engelschall.com -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/wml_frontend/wml.src +++ wml-2.0.11/wml_frontend/wml.src @@ -50,6 +50,7 @@ use Getopt::Long 2.13; use File::PathConvert; +use File::Temp; use IO::File 1.06; use Term::ReadKey; use Cwd; @@ -262,6 +263,16 @@ $arg =~ s/\\([\$"`])/$1/g; return $arg; } +# replace $(xxx) with value from -D flags +sub var_expand { + my $arg = shift; + return $arg unless $arg =~ m/\$\(/; + foreach my $v (@opt_D) { + my ($key, $value) = split /=/, $v, 2; + $arg =~ s/\$\($key\)/$value/g; + } + return $arg; +} # 1. process options in WMLOPTS variable if ($var = $ENV{'WMLOPTS'}) { @@ -423,6 +434,7 @@ print STDERR " Prefix: ".'@prefix@'."\n"; print STDERR " BinDir: ".'@bindir@'."\n"; print STDERR " LibDir: ".'@libdir@'."\n"; + print STDERR " DataDir: ".'@datadir@'."\n"; print STDERR " ManDir: ".'@mandir@'."\n"; } if ($opt_V > 2) { @@ -450,7 +462,8 @@ $opt_q = 1; } -$tmpdir = $ENV{'TMPDIR'} || '/tmp'; +my $tmpldir = ($ENV{'TMPDIR'} || '/tmp') . '/wml.XXXXXX'; +$tmpdir = mkdtemp($tmpldir) or die "Unable to create temporary directory: $!\n"; # if input is stdin we create a temporary file $src_istmp = 0; @@ -1004,6 +1017,7 @@ unshift(@opt_D, "WML_LOC_PREFIX=@prefix@"); unshift(@opt_D, "WML_LOC_BINDIR=@bindir@"); unshift(@opt_D, "WML_LOC_LIBDIR=@libdir@"); +unshift(@opt_D, "WML_LOC_DATADIR=@datadir@"); unshift(@opt_D, "WML_LOC_MANDIR=@mandir@"); unshift(@opt_D, "WML_VERSION=$VERSION"); unshift(@opt_D, "WML_TMPDIR=$tmpdir"); @@ -1062,7 +1076,7 @@ $preload = ''; foreach $p (@p) { $preload .= " -s 'sys/bootp${p}.wml'" - if -f "@libdir@/include/sys/bootp${p}.wml" and $p =~ m/^[34]$/; + if -f "@datadir@/include/sys/bootp${p}.wml" and $p =~ m/^[34]$/; } foreach $i (@opt_i) { if ($i =~ m|^<(.+)>$|) { @@ -1073,6 +1087,10 @@ } } +# replace $(xxx) with value from -D flags in prolog and epilog filters +map {$_ = &var_expand($_)} @opt_E; +map {$_ = &var_expand($_)} @opt_P; + # determine prologs $prolog = ''; foreach $p (@opt_P) { @@ -1187,7 +1205,7 @@ $out_istmp = 1; } -$opt_pass1 = "$defipp $verbose -S @libdir@/include -n $src $inc $preload $prolog"; +$opt_pass1 = "$defipp $verbose -S @datadir@/include -n $src $inc $preload $prolog"; $opt_pass2 = "$defmp4h"; $opt_pass3 = "$defeperl"; $opt_pass4 = "$defgm4"; @@ -1222,6 +1240,7 @@ unlink($tmp[2]); unlink($tmp[3]); unlink($src) if ($src_istmp); + rmdir($tmpdir); } if ($opt_M ne '-') { @@ -1478,7 +1497,7 @@ =item B<-I>, B<--include=>I Adds a I to the list of user include paths. Use this option to set the -runtime environment for pass 1. See wml_p1_ipp(1) for more details. +runtime environment for pass 1. See wml_p1_ipp(3) for more details. =item B<-i>, B<--includefile=>I @@ -1719,6 +1738,10 @@ The directory where WML's library files were installed to at built time. +=item WML_LOC_DATADIR + +The directory where WML's data files were installed to at built time. + =item WML_LOC_MANDIR The directory where WML's manual pages were installed to at built time. @@ -1861,7 +1884,7 @@ Denis Barbier barbier@engelschall.com -=head1 SEEALSO +=head1 SEE ALSO wmd(1), wml_faq(7), --- wml-2.0.11.orig/wml_frontend/wmk.src +++ wml-2.0.11/wml_frontend/wmk.src @@ -799,7 +799,7 @@ Denis Barbier barbier@engelschall.com -=head1 SEEALSO +=head1 SEE ALSO wml(1), wml_intro(1) --- wml-2.0.11.orig/wml_frontend/wmd.map +++ wml-2.0.11/wml_frontend/wmd.map @@ -0,0 +1,11 @@ +wml_p2_mp4h=mp4h +wml_p3_eperl=eperl +wml_p4_gm4=m4 +wml_p9_slice=slice +wml_aux_freetable=freetable +wml_aux_htmlclean=htmlclean +wml_aux_iselect=iselect +wml_aux_linklint=linklint +wml_aux_tidy=tidy +wml_aux_newtxt2html=txt2html +wml_aux_weblint=weblint --- wml-2.0.11.orig/wml_frontend/wmd.txt +++ wml-2.0.11/wml_frontend/wmd.txt @@ -15,18 +15,6 @@ wml_macros(7) ............ Writing WML powerful macros wml_faq(7) ............... Frequently Asked Questions on WML wml_tags(7) .............. Permuted index of defined WML tags -wml_barebone(7) .......... Bare Bones Guide to HTML 4.0 - -Standard References: -wml_std_xhtml10(7) ....... XHTML 1.0 Specification (W3C REC 26-Jan-2000) -wml_std_html401(7) ....... HTML 4.01 Specification (W3C REC 24-Dec-1999) -wml_std_html40(7) ........ HTML 4.0 Specification (W3C REC 18-Dec-1997) -wml_std_html32(7) ........ HTML 3.2 Specification (W3C REC 14-Jan-1997) -wml_std_html20(7) ........ HTML 2.0 Specification (W3C REC 22-Sep-1995) -wml_std_css1(7) .......... Cascading Style Sheets L1 (W3C REC 17-Dec-1996) -wml_std_css2(7) .......... Cascading Style Sheets L2 (W3C REC 12-May-1998) -wml_std_csspos(7) ........ HTML Positioning with CSS (W3C WD 19-Aug-1997) -wml_std_wai10(7) ......... Web Content Accessibility (W3C REC 05-May-1999) Frontends: wml(1) ................... Website META Language Control @@ -36,24 +24,25 @@ wmu(1) ................... Website META Language Upgrade Tool Backends: -wml_p1_ipp(1) ............ Include Pre-Processor +wml_p1_ipp(3) ............ Include Pre-Processor wml_p2_mp4h(1) ........... Macro Processor for HTML wml_p3_eperl(1) .......... Embedded Perl 5 Language wml_p4_gm4(1) ............ GNU m4 Macro Processor -wml_p5_divert(1) ......... Diversion Filter -wml_p6_asubst(1) ......... Area Substitution Filter -wml_p7_htmlfix(1) ........ HTML Fixup Filter -wml_p8_htmlstrip(1) ...... HTML Stripping Filter +wml_p5_divert(3) ......... Diversion Filter +wml_p6_asubst(3) ......... Area Substitution Filter +wml_p7_htmlfix(3) ........ HTML Fixup Filter +wml_p8_htmlstrip(3) ...... HTML Stripping Filter wml_p9_slice(1) .......... Slicing and Output Filter Auxiliaries: -wml_aux_htmlinfo(1) ...... HTML Information +wml_aux_htmlinfo(3) ...... HTML Information wml_aux_linklint(1) ...... Hyperlink Checker wml_aux_weblint(1) ....... HTML Checker wml_aux_tidy(1) .......... HTML Clean up wml_aux_htmlclean(1) ..... HTML Optimizer -wml_aux_map2html(1) ...... Server-Side to Client-Side Map Converter -wml_aux_txt2html(1) ...... Text to HTML Converter +wml_aux_map2html(3) ...... Server-Side to Client-Side Map Converter +wml_aux_txt2html(3) ...... Text to HTML Converter +wml_aux_newtxt2html(1) ... Text to HTML Converter, new version wml_aux_freetable(1) ..... Table to HTML Converter wml_aux_iselect(1) ....... Interactive Selection --- wml-2.0.11.orig/wml_frontend/Makefile.in +++ wml-2.0.11/wml_frontend/Makefile.in @@ -19,7 +19,8 @@ bindir = $(prefix)/bin libsubdir = @libsubdir@ libdir = $(prefix)/lib$(libsubdir) -mandir = $(prefix)/man +datadir = $(prefix)/share$(libsubdir) +mandir = @mandir@ WML_VERSION = @WML_VERSION@ WML_CONFIG_ARGS = @WML_CONFIG_ARGS@ @@ -58,6 +59,7 @@ -e 's|\@prefix\@|$(prefix)|g' \ -e 's|\@bindir\@|$(bindir)|g' \ -e 's|\@libdir\@|$(libdir)|g' \ + -e 's|\@datadir\@|$(datadir)|g' \ -e 's|\@mandir\@|$(mandir)|g' \ -e 's|\@PATH_PERL\@|$(PATH_PERL)|g' \ -e 's|\@INSTALLPRIVLIB\@|$(INSTALLPRIVLIB)|g' \ --- wml-2.0.11.orig/wml_frontend/wmb.src +++ wml-2.0.11/wml_frontend/wmb.src @@ -46,6 +46,7 @@ use Getopt::Long 2.13; use Term::ReadKey; +use File::Temp; ## @@ -202,7 +203,8 @@ # print STDERR "Creating bug report skeleton..."; -$tmpdir = $ENV{'TMPDIR'} || '/tmp'; +my $tmpldir = ($ENV{'TMPDIR'} || '/tmp') . '/wmb.XXXXXX'; +$tmpdir = mkdtemp($tmpldir) or die "Unable to create temporary directory: $!\n"; $tmpfile = "$tmpdir/wmb.$$.1.tmp"; $tmpfile2 = "$tmpdir/wmb.$$.2.tmp"; @@ -308,6 +310,7 @@ # unlink($tmpfile) if (-f $tmpfile); unlink($tmpfile2) if (-f $tmpfile2); +rmdir($tmpdir); # exit gracefully exit(0); @@ -358,7 +361,7 @@ rse@engelschall.com www.engelschall.com -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/wml_frontend/wmd.src +++ wml-2.0.11/wml_frontend/wmd.src @@ -244,7 +244,7 @@ rse@engelschall.com www.engelschall.com -=head1 SEEALSO +=head1 SEE ALSO wml(1) --- wml-2.0.11.orig/configure +++ wml-2.0.11/configure @@ -274,7 +274,7 @@ ac_unique_file="INSTALL" ac_default_prefix=/usr/local -ac_subdirs_all="$ac_subdirs_all wml_backend/p2_mp4h wml_backend/p3_eperl wml_backend/p4_gm4 wml_aux/iselect wml_common/gd" +ac_subdirs_all="$ac_subdirs_all wml_common/gd" ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS WML_VERSION VERSION WML_CONFIG_ARGS MAINT built_system built_user built_date libsubdir tmpdir build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os DCOLON CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RANLIB ac_ct_RANLIB SET_MAKE PATH_PERL perlprog perlvers PERL_OPTS have_getoptlong have_bitvector have_filepathconvert have_imagesize have_io have_termreadkey INSTALLPRIVLIB INSTALLARCHLIB catdir subdirs LIBOBJS LTLIBOBJS' ac_subst_files='' @@ -2992,7 +2992,7 @@ -subdirs="$subdirs wml_backend/p2_mp4h wml_backend/p3_eperl wml_backend/p4_gm4 wml_aux/iselect wml_common/gd " +subdirs="$subdirs wml_common/gd " echo "$as_me:$LINENO: result: " >&5 @@ -3000,7 +3000,7 @@ echo "$as_me:$LINENO: result: ${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&5 echo "${ECHO_T}${TERM_BOLD}RESULT: Substituting Files${TERM_NORM}" >&6 - ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_backend/p9_slice/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/htmlclean/Makefile wml_aux/linklint/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_aux/tidy/Makefile wml_aux/weblint/Makefile wml_aux/freetable/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile" + ac_config_files="$ac_config_files Makefile wml_frontend/Makefile wml_backend/Makefile wml_backend/p1_ipp/Makefile wml_backend/p5_divert/Makefile wml_backend/p6_asubst/Makefile wml_backend/p7_htmlfix/Makefile wml_backend/p8_htmlstrip/Makefile wml_common/Makefile wml_docs/Makefile wml_aux/Makefile wml_aux/htmlinfo/Makefile wml_aux/map2html/Makefile wml_aux/txt2html/Makefile wml_misc/Makefile wml_include/Makefile wml_test/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -3559,18 +3559,12 @@ "wml_backend/p6_asubst/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_backend/p6_asubst/Makefile" ;; "wml_backend/p7_htmlfix/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_backend/p7_htmlfix/Makefile" ;; "wml_backend/p8_htmlstrip/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_backend/p8_htmlstrip/Makefile" ;; - "wml_backend/p9_slice/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_backend/p9_slice/Makefile" ;; "wml_common/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_common/Makefile" ;; "wml_docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_docs/Makefile" ;; "wml_aux/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/Makefile" ;; "wml_aux/htmlinfo/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/htmlinfo/Makefile" ;; - "wml_aux/htmlclean/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/htmlclean/Makefile" ;; - "wml_aux/linklint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/linklint/Makefile" ;; "wml_aux/map2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/map2html/Makefile" ;; "wml_aux/txt2html/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/txt2html/Makefile" ;; - "wml_aux/tidy/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/tidy/Makefile" ;; - "wml_aux/weblint/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/weblint/Makefile" ;; - "wml_aux/freetable/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_aux/freetable/Makefile" ;; "wml_misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_misc/Makefile" ;; "wml_include/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_include/Makefile" ;; "wml_test/Makefile" ) CONFIG_FILES="$CONFIG_FILES wml_test/Makefile" ;; --- wml-2.0.11.orig/Makefile.in +++ wml-2.0.11/Makefile.in @@ -15,10 +15,10 @@ VPATH = @srcdir@ SHTOOL = $(top_srcdir)/etc/shtool -INSTALL_PROGRAM = $(SHTOOL) install -c -m 755 -s -INSTALL_SCRIPT = $(SHTOOL) install -c -m 755 -INSTALL_DATA = $(SHTOOL) install -c -m 644 -MKDIR = $(SHTOOL) mkdir -f -p -m 755 +INSTALL_PROGRAM = install -c -m 755 -s +INSTALL_SCRIPT = install -c -m 755 +INSTALL_DATA = install -c -m 644 +MKDIR = mkdir -p -m 755 VERSION_TOOL = $(SHTOOL) version FIXPERM = $(SHTOOL) fixperm TARBALL = $(SHTOOL) tarball -t @@ -28,6 +28,7 @@ bindir = $(prefix)/bin libsubdir = @libsubdir@ libdir = $(prefix)/lib$(libsubdir) +datadir = $(prefix)/share$(libsubdir) mandir = $(prefix)/man catdir = @catdir@ tmpdir = @tmpdir@ @@ -99,10 +100,11 @@ @[ -f .build-ok ] || $(MAKE) all @echo "___ INSTALL: prepare directory structure ___" $(MKDIR) $(bindir) + $(MKDIR) $(datadir) + $(MKDIR) $(datadir)/include $(MKDIR) $(libdir) $(MKDIR) $(libdir)/data $(MKDIR) $(libdir)/exec - $(MKDIR) $(libdir)/include $(MKDIR) $(libdir)/perl $(MKDIR) $(mandir) $(MKDIR) $(mandir)/man1 @@ -130,23 +132,23 @@ $(INSTALL_SCRIPT) wml_frontend/wmu.pl $(bindir)/wmu $(INSTALL_DATA) wml_frontend/wmu.1 $(mandir)/man1/wmu.1 $(INSTALL_SCRIPT) wml_backend/p1_ipp/ipp.pl $(libdir)/exec/wml_p1_ipp - $(INSTALL_DATA) wml_backend/p1_ipp/ipp.1 $(mandir)/man1/wml_p1_ipp.1 - $(INSTALL_PROGRAM) wml_backend/p2_mp4h/src/mp4h@EXEEXT@ $(libdir)/exec/wml_p2_mp4h@EXEEXT@ - $(INSTALL_DATA) wml_backend/p2_mp4h/doc/mp4h.1 $(mandir)/man1/wml_p2_mp4h.1 - $(INSTALL_PROGRAM) wml_backend/p3_eperl/eperl@EXEEXT@ $(libdir)/exec/wml_p3_eperl@EXEEXT@ - $(INSTALL_DATA) wml_backend/p3_eperl/eperl.1 $(mandir)/man1/wml_p3_eperl.1 - $(INSTALL_PROGRAM) wml_backend/p4_gm4/src/m4@EXEEXT@ $(libdir)/exec/wml_p4_gm4@EXEEXT@ - $(INSTALL_DATA) wml_backend/p4_gm4/doc/m4.txt $(mandir)/$(catdir)1/wml_p4_gm4.1 + $(INSTALL_DATA) wml_backend/p1_ipp/ipp.3 $(mandir)/man3/wml_p1_ipp.3 +# $(INSTALL_PROGRAM) wml_backend/p2_mp4h/src/mp4h@EXEEXT@ $(libdir)/exec/wml_p2_mp4h@EXEEXT@ +# $(INSTALL_DATA) wml_backend/p2_mp4h/doc/mp4h.1 $(mandir)/man1/wml_p2_mp4h.1 +# $(INSTALL_PROGRAM) wml_backend/p3_eperl/eperl@EXEEXT@ $(libdir)/exec/wml_p3_eperl@EXEEXT@ +# $(INSTALL_DATA) wml_backend/p3_eperl/eperl.1 $(mandir)/man1/wml_p3_eperl.1 +# $(INSTALL_PROGRAM) wml_backend/p4_gm4/src/m4@EXEEXT@ $(libdir)/exec/wml_p4_gm4@EXEEXT@ +# $(INSTALL_DATA) wml_backend/p4_gm4/doc/m4.txt $(mandir)/$(catdir)1/wml_p4_gm4.1 $(INSTALL_SCRIPT) wml_backend/p5_divert/divert.pl $(libdir)/exec/wml_p5_divert - $(INSTALL_DATA) wml_backend/p5_divert/divert.1 $(mandir)/man1/wml_p5_divert.1 + $(INSTALL_DATA) wml_backend/p5_divert/divert.3 $(mandir)/man3/wml_p5_divert.3 $(INSTALL_SCRIPT) wml_backend/p6_asubst/asubst.pl $(libdir)/exec/wml_p6_asubst - $(INSTALL_DATA) wml_backend/p6_asubst/asubst.1 $(mandir)/man1/wml_p6_asubst.1 + $(INSTALL_DATA) wml_backend/p6_asubst/asubst.3 $(mandir)/man3/wml_p6_asubst.3 $(INSTALL_SCRIPT) wml_backend/p7_htmlfix/htmlfix.pl $(libdir)/exec/wml_p7_htmlfix - $(INSTALL_DATA) wml_backend/p7_htmlfix/htmlfix.1 $(mandir)/man1/wml_p7_htmlfix.1 + $(INSTALL_DATA) wml_backend/p7_htmlfix/htmlfix.3 $(mandir)/man3/wml_p7_htmlfix.3 $(INSTALL_SCRIPT) wml_backend/p8_htmlstrip/htmlstrip.pl $(libdir)/exec/wml_p8_htmlstrip - $(INSTALL_DATA) wml_backend/p8_htmlstrip/htmlstrip.1 $(mandir)/man1/wml_p8_htmlstrip.1 - $(INSTALL_SCRIPT) wml_backend/p9_slice/slice $(libdir)/exec/wml_p9_slice - $(INSTALL_DATA) wml_backend/p9_slice/slice.1 $(mandir)/man1/wml_p9_slice.1 + $(INSTALL_DATA) wml_backend/p8_htmlstrip/htmlstrip.3 $(mandir)/man3/wml_p8_htmlstrip.3 +# $(INSTALL_SCRIPT) wml_backend/p9_slice/slice $(libdir)/exec/wml_p9_slice +# $(INSTALL_DATA) wml_backend/p9_slice/slice.1 $(mandir)/man1/wml_p9_slice.1 install-perl: @echo "" @@ -163,40 +165,40 @@ $(INSTALL_DATA) wml_docs/wml_macros.7 $(mandir)/man7/wml_macros.7 $(INSTALL_DATA) wml_docs/wml_faq.7 $(mandir)/man7/wml_faq.7 $(INSTALL_DATA) wml_docs/wml_tags.7 $(mandir)/man7/wml_tags.7 - $(INSTALL_DATA) wml_docs/wml_std_html20.txt $(mandir)/$(catdir)7/wml_std_html20.7 - $(INSTALL_DATA) wml_docs/wml_std_html32.txt $(mandir)/$(catdir)7/wml_std_html32.7 - $(INSTALL_DATA) wml_docs/wml_std_html40.txt $(mandir)/$(catdir)7/wml_std_html40.7 - $(INSTALL_DATA) wml_docs/wml_std_html401.txt $(mandir)/$(catdir)7/wml_std_html401.7 - $(INSTALL_DATA) wml_docs/wml_std_xhtml10.txt $(mandir)/$(catdir)7/wml_std_xhtml10.7 - $(INSTALL_DATA) wml_docs/wml_std_css1.txt $(mandir)/$(catdir)7/wml_std_css1.7 - $(INSTALL_DATA) wml_docs/wml_std_css2.txt $(mandir)/$(catdir)7/wml_std_css2.7 - $(INSTALL_DATA) wml_docs/wml_std_csspos.txt $(mandir)/$(catdir)7/wml_std_csspos.7 - $(INSTALL_DATA) wml_docs/wml_std_wai10.txt $(mandir)/$(catdir)7/wml_std_wai10.7 - $(INSTALL_DATA) wml_docs/wml_barebone.txt $(mandir)/$(catdir)7/wml_barebone.7 +# $(INSTALL_DATA) wml_docs/wml_std_html20.txt $(mandir)/$(catdir)7/wml_std_html20.7 +# $(INSTALL_DATA) wml_docs/wml_std_html32.txt $(mandir)/$(catdir)7/wml_std_html32.7 +# $(INSTALL_DATA) wml_docs/wml_std_html40.txt $(mandir)/$(catdir)7/wml_std_html40.7 +# $(INSTALL_DATA) wml_docs/wml_std_html401.txt $(mandir)/$(catdir)7/wml_std_html401.7 +# $(INSTALL_DATA) wml_docs/wml_std_xhtml10.txt $(mandir)/$(catdir)7/wml_std_xhtml10.7 +# $(INSTALL_DATA) wml_docs/wml_std_css1.txt $(mandir)/$(catdir)7/wml_std_css1.7 +# $(INSTALL_DATA) wml_docs/wml_std_css2.txt $(mandir)/$(catdir)7/wml_std_css2.7 +# $(INSTALL_DATA) wml_docs/wml_std_csspos.txt $(mandir)/$(catdir)7/wml_std_csspos.7 +# $(INSTALL_DATA) wml_docs/wml_std_wai10.txt $(mandir)/$(catdir)7/wml_std_wai10.7 +# $(INSTALL_DATA) wml_docs/wml_barebone.txt $(mandir)/$(catdir)7/wml_barebone.7 install-aux: @echo "" @echo "___ INSTALL: auxiliary programs and manpages ___" - $(INSTALL_SCRIPT) wml_aux/htmlclean/htmlclean.pl $(libdir)/exec/wml_aux_htmlclean - $(INSTALL_DATA) wml_aux/htmlclean/htmlclean.1 $(mandir)/man1/wml_aux_htmlclean.1 - $(INSTALL_PROGRAM) wml_aux/iselect/iselect@EXEEXT@ $(libdir)/exec/wml_aux_iselect@EXEEXT@ - $(INSTALL_DATA) wml_aux/iselect/iselect.1 $(mandir)/man1/wml_aux_iselect.1 +# $(INSTALL_SCRIPT) wml_aux/htmlclean/htmlclean.pl $(libdir)/exec/wml_aux_htmlclean +# $(INSTALL_DATA) wml_aux/htmlclean/htmlclean.1 $(mandir)/man1/wml_aux_htmlclean.1 +# $(INSTALL_PROGRAM) wml_aux/iselect/iselect@EXEEXT@ $(libdir)/exec/wml_aux_iselect@EXEEXT@ +# $(INSTALL_DATA) wml_aux/iselect/iselect.1 $(mandir)/man1/wml_aux_iselect.1 $(INSTALL_SCRIPT) wml_aux/map2html/map2html.pl $(libdir)/exec/wml_aux_map2html - $(INSTALL_DATA) wml_aux/map2html/map2html.1 $(mandir)/man1/wml_aux_map2html.1 + $(INSTALL_DATA) wml_aux/map2html/map2html.3 $(mandir)/man3/wml_aux_map2html.3 $(INSTALL_SCRIPT) wml_aux/txt2html/txt2html.pl $(libdir)/exec/wml_aux_txt2html - $(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(mandir)/$(catdir)1/wml_aux_txt2html.1 + $(INSTALL_DATA) wml_aux/txt2html/txt2html.txt $(mandir)/$(catdir)3/wml_aux_txt2html.3 $(INSTALL_DATA) wml_aux/txt2html/txt2html.dict $(libdir)/data/txt2html.dict - $(INSTALL_PROGRAM) wml_aux/tidy/tidy@EXEEXT@ $(libdir)/exec/wml_aux_tidy@EXEEXT@ - $(INSTALL_DATA) wml_aux/tidy/tidy.txt $(mandir)/$(catdir)1/wml_aux_tidy.1 +# $(INSTALL_PROGRAM) wml_aux/tidy/tidy@EXEEXT@ $(libdir)/exec/wml_aux_tidy@EXEEXT@ +# $(INSTALL_DATA) wml_aux/tidy/tidy.txt $(mandir)/$(catdir)1/wml_aux_tidy.1 $(INSTALL_SCRIPT) wml_aux/htmlinfo/htmlinfo.pl $(libdir)/exec/wml_aux_htmlinfo - $(INSTALL_DATA) wml_aux/htmlinfo/htmlinfo.1 $(mandir)/man1/wml_aux_htmlinfo.1 - $(INSTALL_SCRIPT) wml_aux/linklint/linklint.pl $(libdir)/exec/wml_aux_linklint - $(INSTALL_DATA) wml_aux/linklint/linklint.1 $(mandir)/man1/wml_aux_linklint.1 - $(INSTALL_SCRIPT) wml_aux/weblint/weblint.pl $(libdir)/exec/wml_aux_weblint - $(INSTALL_DATA) wml_aux/weblint/weblint.1 $(mandir)/man1/wml_aux_weblint.1 + $(INSTALL_DATA) wml_aux/htmlinfo/htmlinfo.3 $(mandir)/man3/wml_aux_htmlinfo.3 +# $(INSTALL_SCRIPT) wml_aux/linklint/linklint.pl $(libdir)/exec/wml_aux_linklint +# $(INSTALL_DATA) wml_aux/linklint/linklint.1 $(mandir)/man1/wml_aux_linklint.1 +# $(INSTALL_SCRIPT) wml_aux/weblint/weblint.pl $(libdir)/exec/wml_aux_weblint +# $(INSTALL_DATA) wml_aux/weblint/weblint.1 $(mandir)/man1/wml_aux_weblint.1 $(INSTALL_DATA) wml_aux/weblint/weblintrc $(libdir)/data/weblintrc - $(INSTALL_SCRIPT) wml_aux/freetable/freetable.pl $(libdir)/exec/wml_aux_freetable - $(INSTALL_DATA) wml_aux/freetable/freetable.1 $(mandir)/man1/wml_aux_freetable.1 +# $(INSTALL_SCRIPT) wml_aux/freetable/freetable.pl $(libdir)/exec/wml_aux_freetable +# $(INSTALL_DATA) wml_aux/freetable/freetable.1 $(mandir)/man1/wml_aux_freetable.1 install-misc: @echo "" --- wml-2.0.11.orig/debian/watch +++ wml-2.0.11/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://thewml.org/distrib/wml-([0-9].*)\.tar.gz debian uupdate --- wml-2.0.11.orig/debian/README.Debian +++ wml-2.0.11/debian/README.Debian @@ -0,0 +1,32 @@ +wml for Debian +============== + +weblint +------- + +If you intend to use weblint with WML, you might like to do the following: + + cp -i /usr/share/wml/aux/weblintrc /etc/global.weblintrc + +Please refer to the manpage of weblint(1) or wml_aux_weblint(1) for more +information. You might also like to compare the content of +/usr/doc/weblint/weblintrc.gz and /etc/global.weblintrc using +zdiff and customize /etc/global/weblintrc. + +Other pieces of software +------------------------ + +WML is shipped upstream as a bunch of many programs. Some of them are +already packaged by Debian developers, so they are not included here. +For instance, WML documentation refers to wml_aux_tidy. but this is a +link against tidy, and is only available if this package has been +installed. Links on manpages are not created to prevent dangling +symlinks, but a convenient way to browse WML documentation is to run the +wmd script. + +W3C Specs +--------- + +The W3C papers are also thrown away since they are quite large and if +they were that interesting for Debian users, they would have their own +package. --- wml-2.0.11.orig/debian/changelog +++ wml-2.0.11/debian/changelog @@ -0,0 +1,709 @@ +wml (2.0.11-3.1ubuntu1) hardy; urgency=low + + * debian/rules: + + Unexport default *FLAGS set by dpkg-buildpackage as the configure for + sub-modules tries to parse them as host types and fails. + * debian/control: + + Modify Maintainer value to match DebianMaintainerField spec. + + -- Michael Bienia Wed, 20 Feb 2008 12:48:58 +0100 + +wml (2.0.11-3.1) unstable; urgency=high + + * Non-maintainer upload by security team. + * Fix insecure temporary file creations in eperl and ipp + backends and a similar issue in the wmg.cgi contrib file + leading to possible symlink attacks. + If you already use wmg.cgi please update your copy (Closes: #463907). + + -- Nico Golde Thu, 07 Feb 2008 12:01:43 +0100 + +wml (2.0.11-3) unstable; urgency=low + + [ Luk Claes ] + * Remove me from Maintainers. + * Add zlib1g-dev to Build-Depends. + + -- Luk Claes Wed, 23 Jan 2008 22:41:02 +0000 + +wml (2.0.11-2) unstable; urgency=low + + * Bump debhelper compat level to 5. + * Add build dependency on autotools-dev. + * Copy config.{guess,sub} in clean target (Closes: #403784). + + -- Luk Claes Thu, 19 Apr 2007 22:49:49 +0200 + +wml (2.0.11-1) unstable; urgency=low + + * New upstream release (Closes: #172310). + * New maintainers. + * Bumped Standards-Version to 3.7.2. + * Add debian/compat for debhelper 4. + * Updated debian/watch. + * Fixed some typoes in debian/README.Debian. + * Use SEE ALSO instead of SEEALSO (Closes: #367552). + * Suggest tardy instead of obsolete tarcust. + + -- Luk Claes Sun, 1 Oct 2006 16:29:28 +0200 + +wml (2.0.8-11) unstable; urgency=low + + * Prolog and epilog filters may use a relative path defined by an + autoadjusted $(foo) variable, so expanding these variables before + calling filters is convenient. Closes: #292948 + Thanks Tobias Oetiker for reporting this issue and providing a patch. + * wmb wml wml_p1_ipp: Use mkdtemp() from the File::Temp module to create + a temporary directory. + * debian/control: Slight changes in description, and addition of WML + home page. + + -- Denis Barbier Mon, 7 Feb 2005 22:16:46 +0100 + +wml (2.0.8-10) unstable; urgency=low + + * In wml_p7_htmlfix, when macros are written into tags, + the imgalt fixup is confused. A workaround is to replace those + macros by arbitrary text without angle brackets when adding alt= + attributes. Closes: #188762 Thanks Tobias Gruetzmacher + * wml_aux_txt2html is dead upstream, but a new version is available + from txt2html.sourceforge.net and is already packaged in Debian. + It is unwise to switch to this new version now, so let call this + new version wml_aux_newtxt2html, and provide options in wml::fmt::text + to select old or new txt2html version. + Closes: #276099 Thanks Craig Small + * In wml::fmt::text, add --extract flag to txt2html so that + and tags do not have to be filtered out. + * Improve documentation of wml::fmt::text. + * Improve documentation of wml::fmt::xtable, body must not + contain ePerl code. Closes: #283359 Thanks Pedro Zorzenon Neto + + -- Denis Barbier Wed, 8 Dec 2004 22:32:45 +0100 + +wml (2.0.8-9) unstable; urgency=low + + * Path changes introduced in -8 broke wml::std::logo. + Closes: Bug#269070 Thanks Werner Heuser. + * Document WML_LOC_DATADIR in wml(1). + + -- Denis Barbier Mon, 30 Aug 2004 20:14:58 +0200 + +wml (2.0.8-8) unstable; urgency=low + + * In wml::std::page, add :html:* and :body:* attributes to tag + so that arbitrary attributes can be inserted in and + tahs. + Closes: Bug#248621 Thanks Davor Ocelic + * Some programs are not linked from /usr/bin, so put their manual + pages in section 3: wml_p1_ipp, wml_p5_divert, wml_p6_asubst, + wml_p7_htmlfix, wml_p8_htmlstrip. wml_aux_htmlinfo, wml_aux_map2html, + wml_aux_txt2html. + Closes: Bug#255632, #262716 Thanks Dan Jacobson + * Add links to , , and + manual pages from wml_tags(7). + Closes: Bug#209295 Thanks Andre Lehovich + * wml_include/Makefile.in: wml::* pages belong to section 3, not 1. + * Move /usr/lib/wml/aux and /usr/lib/wml/include under /usr/share/wml. + + -- Denis Barbier Wed, 4 Aug 2004 22:11:19 +0200 + +wml (2.0.8-7) unstable; urgency=low + + * Another try to fix wml::sup::path. Report and patch by Maxime Chatelle, + thanks. Closes: Bug#214045 + + -- Denis Barbier Sat, 4 Oct 2003 22:06:38 +0200 + +wml (2.0.8-6) unstable; urgency=low + + * Recommends linklint. Closes: Bug#174604 + * Move weblint from Recommends to Suggests. + * wml_p1_ipp: Fix filenames of dependency files when filenames contain + several dots. Closes: Bug#188479 Patch provided by Vincent Sanders. + Thanks. + * Fix wmg.cgi to have it deal with PNG images instead of GIF. + Closes: Bug#178798 Patch provided by Gerfried Fuchs, thanks. + * Bump Standards-Version: 3.6.1 + * Recode this changelog file into UTF-8. + + -- Denis Barbier Sun, 28 Sep 2003 00:43:38 +0200 + +wml (2.0.8-5) unstable; urgency=low + + * Add Build-Depends: perl (>= 5.8) + * Add Depends: libbit-vector-perl + * Bump Standards-Version to 3.5.7 + + -- Denis Barbier Tue, 17 Sep 2002 21:56:08 +0200 + +wml (2.0.8-4) unstable; urgency=low + + * In passes 1, 5, 6, 7 and 8, abort when an error on file operation + is detected. + * Fix documentation of wml::des::navbar. + * Minor fixes in wml::des::typography and wml::fmt::xtable. + * Rebuild with Perl 5.8 + + -- Denis Barbier Fri, 19 Apr 2002 22:52:43 +0200 + +wml (2.0.8-3) unstable; urgency=low + + * Suggests: doc-html-w3 + * Fix wml::sup::path, thanks to Tommi Vainikainen (closes: Bug#121468). + * Protect commands to display input file name and line numbers in pass 3 + against pass 2. + + -- Denis Barbier Tue, 18 Dec 2001 00:02:27 +0100 + +wml (2.0.8-2) unstable; urgency=low + + * Apply upstream patches against wml::des::navbar and wml::std::toc + * I forgot to mention in latest entry that wml 2.0.8-1 do not install IO + Perl module anymore + + -- Denis Barbier Tue, 6 Nov 2001 18:27:20 +0100 + +wml (2.0.8-1) unstable; urgency=low + + * New upstream release + * Fix -W description in wmk usage summary (closes: Bug#116645) + * Remove homepage from debian/control + + -- Denis Barbier Tue, 30 Oct 2001 22:56:21 +0100 + +wml (2.0.7-2) unstable; urgency=low + + * Fix preformatted manpages (closes: Bug#113795) + * Add a patch to wml_p5_divert, this pass may become very slow with some + large files + * Remove wml_aux_linklint, since it has its own package now + * Remove W3C reference documents from documentation + * Fix search in wmd + + -- Denis Barbier Sat, 29 Sep 2001 10:02:02 +0200 + +wml (2.0.7-1) unstable; urgency=low + + * New upstream release (closes: Bug#79294). + + -- Denis Barbier Thu, 21 Jun 2001 03:32:54 +0200 + +wml (2.0.6-3) unstable; urgency=low + + * Fix preformatted manpages (closes: #77840). + * Build against perl 5.6 + + -- Denis Barbier Mon, 12 Mar 2001 23:16:27 +0100 + +wml (2.0.6-2) unstable; urgency=low + + * White backgrounds are much more popular than black ones, so + transparent color is set to white in wml::des::imgdot. + (Suggested by Craig Small ) + * Fix debian/rules to make documentation reflect the fact that some + WML passes do have a different name in Debian (Reported by + Martin Schulze ). + * Make wml_tags(7) manpage more proeminent in documentation + (Suggested by Martin Schulze). + + -- Denis Barbier Mon, 20 Nov 2000 23:21:53 +0100 + +wml (2.0.6-1) unstable; urgency=low + + * New upstream version (closes: #74143). + * Fix Build-Depends field (closes: #74666). + * Do not use shtool when installing. + * Fix dangling symlinks in manpages (closes: #73032). + + -- Denis Barbier Mon, 6 Nov 2000 23:43:01 +0100 + +wml (2.0.4-2) unstable; urgency=low + + * Updated to Standards-Version 3.2.1 + * Fix htmlstrip freezing on large 
 blocks.  (Reported by Joey
+    Hess )
+  * Fix  and  doing strange things in certain
+    cases.
+
+ -- Brian Bassett   Fri, 29 Sep 2000 11:42:01 -0700
+
+wml (2.0.4-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Brian Bassett   Tue, 19 Sep 2000 16:28:15 -0700
+
+wml (2.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+    + New version of wml::std::href closes bug #69049
+    + Now depend on current versions of Debian packages included in WML
+      upstream tarball (closes: #70564)
+  * Remove RPM spec file from /usr/share/doc. (closes: #70474)
+
+ -- Brian Bassett   Thu,  7 Sep 2000 15:58:19 -0700
+
+wml (2.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Brian Bassett   Fri, 23 Jun 2000 22:40:36 -0700
+
+wml (2.0.1-2) unstable; urgency=low
+
+  * Depend on correct version of mp4h. (closes: #65392)
+  * Add to README.Debian documenting the problems with man pages.
+    (closes: #65394)
+  * Close bugs fixed upstream:
+    +  filenames are sane. (closes: #65171)
+
+ -- Brian Bassett   Sun, 18 Jun 2000 12:32:13 -0700
+
+wml (2.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+    + WML_*_ISOTIME are really in ISO format. (closes: #59627)
+  * Fix broken man pages. (closes: #54012)
+  * Build-depend on perl-5.005. (hopefully closes: #52468)
+
+ -- Brian Bassett   Wed,  7 Jun 2000 21:35:04 -0700
+
+wml (1.99.8-1) experimental; urgency=low
+
+  * Upload a pre-2.0 to experimental to start getting the kinks out of
+    the new WMLs.
+
+ -- Brian Bassett   Sun, 23 Apr 2000 13:08:42 -0700
+
+wml (1.7.4-6) frozen unstable; urgency=low
+
+  * Fixed va_arg cruft in mhc for powerpc. (closes: #58254)
+
+ -- Brian Bassett   Sat, 19 Feb 2000 14:16:34 -0800
+
+wml (1.7.4-5) frozen unstable; urgency=low
+
+  * Applied epilog patch from James A. Treacy .
+
+ -- Brian Bassett   Fri, 11 Feb 2000 19:34:31 -0800
+
+wml (1.7.4-4) unstable; urgency=low
+
+  * Fixed missing symbol in the internal GD module. (closes: #54773)
+  * Add Suggests: for shtool and tarcust to support wml::mod::MakeMaker
+    (closes: #43473)
+  * Don't use internal Text::Delimmatch (adds Depends: on
+    libdelimmatch-perl)
+
+ -- Brian Bassett   Tue, 11 Jan 2000 16:26:42 -0800
+
+wml (1.7.4-3) unstable; urgency=low
+
+  * Fixed man page formatting problems (Thanks, ps.1!!) (closes:
+    #53328)
+  * Build the internal GD module against the libgd-gif1 library.  The
+    libgd-perl package is moving toward linking against the PNG
+    generating libgd1g.  This is double-plus-ungood.  (At least as far as
+    wml is concerned.) (closes: #53306)
+  * Don't use the internal Getopt::Long (This is in perl-5.005, heck)
+    and Term::Readkey (brings in a Depends: on libterm-readkey-perl)
+
+ -- Brian Bassett   Sat,  1 Jan 2000 16:32:25 -0800
+
+wml (1.7.4-2) unstable; urgency=low
+
+  * New maintainer.
+  * Moved man pages in cat directories to man directories. (closes:
+    #43745)
+  * Fixed bad man page links. (closes: #43426, #45314)
+  * wml::fmt::verbatim  tag no longer protected against
+    pass 6 (the pass where all the magic happens) (closes: #51226)
+
+ -- Brian Bassett   Wed,  1 Dec 1999 13:40:18 -0800
+
+wml (1.7.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * Applied patch posted by upstream maintainer on October 11, 1999.
+    Fixes WMLOPTS quoting bug in wml.src.
+  * Added #DEBHELPER# in postinst so that the link
+    "/usr/doc/wml -> ../share/doc/wml" is made.
+
+ -- Anthony Fok   Sat, 16 Oct 1999 14:20:42 -0600
+
+wml (1.7.3-2) unstable; urgency=low
+
+  * Applied patches posted by upstream maintainer on October 3, 1999
+    (fixes wmk.src and divert.src).
+
+ -- Anthony Fok   Mon,  4 Oct 1999 04:47:46 -0600
+
+wml (1.7.3-1) unstable; urgency=low
+
+  * New upstream release (closes: Bug#34340, Bug#34360, Bug#45748).
+  * "Hi-jacked" the package :-) due to prolonged maintainer absence.
+    See Bug#39659.  This way, at least I can receive the bug reports.
+    I do hope that either Heiko or Denis could maintain this package
+    in the long run though.  :-)
+  * Standards-Version: 3.0.1.
+  * Further modularize the package: removed wml_p9_slice and HTML::Clean,
+    and instead the package depends on slice and iselect, and
+    recommends libhtml-clean-perl.  Thanks to suggestion from upstream
+    maintainer Denis Barbier.
+  * [debian/rules]: dh_perl usr/lib/wml/perl/lib, otherwise it can't find
+      the perl-5.005-specific libraries.
+
+ -- Anthony Fok   Sat,  2 Oct 1999 08:34:28 -0600
+
+wml (1.7.2-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream bugfix release.
+
+ -- Anthony Fok   Wed,  7 Jul 1999 00:20:51 -0600
+
+wml (1.7.1-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Recompiled for perl-5.005.
+  * Partially upgraded to standards version 3.0.0:
+     - Updated copyright to point to /usr/share/common-licenses
+     - FHS-compliance, with the notable exception of the
+       /usr/doc/wml -> /usr/share/doc/wml switch.
+  * [debian/rules]: Uses dh_perl to generate perl dependency instead of
+      hard-coding it in debian/control.  (Thanks Raphaël!  :-)
+  * [debian/control]: Updated dependencies to the perl-5.005-compliant
+      versions of eperl, libgd-perl, and wwwtable.
+
+ -- Anthony Fok   Tue,  6 Jul 1999 11:24:50 -0600
+
+wml (1.7.1-0.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Applied patches posted by Denis Barbier (WML upstream maintainer)
+    on the sw-wml@engelschall.com mailing list (as of 1999-06-09).
+  * [debian/control]: Now Recommends: tidy (>= 19990415-1)
+     and made appropriate changes in configure.in and Makefile.in.
+
+ -- Anthony Fok   Fri, 11 Jun 1999 08:36:31 -0600
+
+wml (1.7.1-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer upload.
+
+ -- Anthony Fok   Sun,  6 Jun 1999 00:19:33 -0600
+
+wml (1.6.8-0.1) frozen unstable; urgency=low
+
+  * New upstream release (mainly bugfixes).
+  * Non-maintainer release.
+  * [debian/copyright]: Added a note about the new official WML maintainer
+     Denis Barbier .
+  * Added the /usr/doc/wml/wml_contrib directory.
+
+ -- Anthony Fok   Fri, 15 Jan 1999 03:41:03 -0700
+
+wml (1.6.7-0.3) frozen unstable; urgency=low
+
+  * Non-maintainer release.
+  * Applied patches by Denis Barbier 
+    on the sw-wml@engelschall.com mailing list, posted on 1999-01-04:
+      - [wml_backend/p1_ipp/ipp.src]: wml-ipp.patch
+         "invokes parseblock only if a sequence '/*' is found,"
+         and gives an overall 30% speed-up.
+      - [wml_frontend/wml.src]: wml-timer.patch fixes "wrong display of
+         timers when using --pass."
+      - [wml_include/des/navbar.src]: fixes "single quotes problem."
+
+ -- Anthony Fok   Mon,  4 Jan 1999 05:17:30 -0700
+
+wml (1.6.7-0.2) frozen unstable; urgency=low
+
+  * Non-maintainer release.
+  * [wml_include/std/logo.src]: (logo.wml) Added the missing semi-colon.
+      Thanks to Stephane Bortzmeyer for the
+      bug report and patch (closes: Bug#28695).
+
+ -- Anthony Fok   Fri,  1 Jan 1999 07:22:49 -0700
+
+wml (1.6.7-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+  * [debian/control]: Now Depends: on eperl (>= 2.2.14-0.1).
+
+ -- Anthony Fok   Sun,  2 Aug 1998 18:51:03 -0600
+
+wml (1.6.6-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+
+ -- Anthony Fok   Thu, 25 Jun 1998 23:19:59 -0600
+
+wml (1.6.5-0.2) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Corrected the dates of the W3C documents in wml_frontend/wmd.txt
+    (/usr/lib/wml/aux/wmd.txt).
+
+ -- Anthony Fok   Thu, 18 Jun 1998 21:22:01 -0600
+
+wml (1.6.5-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+  * Updated ./wml_docs/wml_std_css2.txt (/usr/man/cat7/wml_std_css2.7.gz)
+    with http://www.w3.org/TR/REC-CSS2/css2.txt.  :-)
+
+ -- Anthony Fok   Wed, 17 Jun 1998 09:00:18 -0600
+
+wml (1.6.4-1.1) frozen unstable; urgency=low
+
+  * Non-maintainer release.
+  * configured w/o --with-compat because it no longer exists.  :-)
+  * Added a hack in wml_common/Makefile.in to make sure that the non-free
+    Perl GD.pm module is not compiled.  (Thanks to Heiko for the idea.)
+  * Upgraded to standards version 2.4.1.0 (no changes).
+  * WML 1.6.4 is a *bug-fix* release, and wml_1.6.4-0.1 was uploaded
+    *before* the freeze AFAIK (on March 23, 1998), so please put it in Hamm!
+
+ -- Anthony Fok   Tue, 19 May 1998 00:33:49 -0600
+
+wml (1.6.4-1) frozen unstable; urgency=low
+
+  * New upstream.
+  * Maintainer-Release -- Thanks, Anthony.
+  * configured w/o --with-openworld to make it independend
+    on other perl modules (GetOpt::Long, ...)
+  * configured w/ --with-compat
+
+ -- Heiko Schlittermann   Mon, 11 May 1998 17:05:42 +0200
+
+wml (1.6.4-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+
+ -- Anthony Fok   Mon, 23 Mar 1998 12:03:41 -0700
+
+wml (1.6.3-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+
+ -- Anthony Fok   Thu,  5 Mar 1998 08:05:39 -0700
+
+wml (1.6.2-0.2) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Editted wml.src (hence /usr/bin/wml) so that the output of `pwd`
+    is quoted to ensure the space in directory names are preserved
+    so pass 2 won't crash any more.  Thanks to Graham Hughes
+     for reporting this in Bug#17022.
+    (Will forward upstream.)
+
+ -- Anthony Fok   Tue,  3 Mar 1998 01:27:50 -0700
+
+wml (1.6.2-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+
+ -- Anthony Fok   Thu, 19 Feb 1998 04:06:22 -0700
+
+wml (1.6.1-0.2) unstable; urgency=low
+
+  * Non-maintainer release.
+  * Oops!  I mixed up the wwwtable.1.gz and wml_aux_wwwtable.1.gz symlink!
+    Fixed.  :-)
+  * debian/rules: Now uses "$(MAKE) LDLOADLIBS=-lc" to fix the
+    Lintian shlib-without-dependency-information warning with Perl
+    *.so modules.
+  * README.Debian: Added a note about the non-free wwwtable.
+  * wml 1.6.1-0.1 was missing many files because of some blunders on my
+    part.  Sorry!  :-)
+
+ -- Anthony Fok   Mon, 16 Feb 1998 15:48:59 -0700
+
+wml (1.6.1-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+  * debian/control: now also Suggests: wwwtable (>= 1.3-1)
+  * Removed the non-free wwwtable files from this package and symlinked
+    them to those in the new non-free wwwtable package.
+
+ -- Anthony Fok   Mon, 16 Feb 1998 01:37:08 -0700
+
+wml (1.6.0-0.1) unstable; urgency=low
+
+  * New upstream release.
+  * Non-maintainer release.
+  * Revised to debian/rules and various Makefile.in and configure.in
+    to accommodate for the changes in upstream source directory structure.
+  * Upgraded to standards version 2.4.0.0 (no changes).
+
+ -- Anthony Fok   Tue, 10 Feb 1998 00:36:07 -0700
+
+wml (1.5.1-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer release.
+  * Updated the package description to that in the new upstream README file.
+
+ -- Anthony Fok   Sat, 17 Jan 1998 03:40:22 -0700
+
+wml (1.5.0-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer release.
+
+ -- Anthony Fok   Sun, 11 Jan 1998 13:58:19 -0700
+
+wml (1.4.11-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer release.
+  * debian/rules: Added --with-openworld to ./configure so that wml
+    no longer compiles and packages its own Perl GD.pm module.
+  * debian/control: now also Suggests: libgd-perl (>= 1.16-1)
+  * Have a Happy New Year 1998!  :)
+
+ -- Anthony Fok   Wed, 31 Dec 1997 17:11:02 -0700
+
+wml (1.4.10-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer release.
+  * Have a Happy New Year!  :)
+
+ -- Anthony Fok   Tue, 30 Dec 1997 17:28:16 -0700
+
+wml (1.4.9-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer release.
+  * /etc/global.weblintrc is no longer installed as a conffile.  Please refer
+    to README.Debian for more information.  (Thanks to Christian Leutloff
+     for the wake-up call.  :)
+  * Modified /usr/bin/wml because the /usr/bin/wml_p9_slice's verbose option
+    had been changed from "-x" to "-v".
+  * Added "slices" attribute to  in the /usr/doc/wml/examples/demo.wml
+    to force the creation of the WML_PAGE_XXX slices, otherwise the example
+    won't build in WML 1.4.9.  You might need to make similar changes to
+    your *.wml files too if they fail to build with this new WML.  Read
+    /usr/doc/wml/changelog.gz for more information.
+  * No longer rm /usr/man/cat1/wml_*.  All WML documentation, including
+    "non-manpage manpages", should now be accessible with /usr/bin/wmd.
+  * Added wmd.postinst to run mandb to ensure that man can find the manpages
+    under /usr/man/cat1.
+
+ -- Anthony Fok   Mon, 29 Dec 1997 11:36:20 -0700
+
+wml (1.4.8-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer release.
+  * debian/control:
+     - Recommends: iselect (>= 1.0.3-1), weblint (>= 1.020-1)
+     - Suggests: gfont
+  * debian/rules: Replaced some files with symlinks to iselect and weblint.
+  * Added new debian/conffiles with the file "/etc/global.weblintrc".
+    It could be problematic if weblint's maintainer decides to conffile
+    it in the future, but that hasn't happened yet, so everything should be
+    fine for now.  
+  * Added the new /usr/doc/wml/SUPPORT from upstream.
+  * Commented out a few lines in ./Makefile.in, ./configure and
+    config/configure.in to save package build time.
+  * Closed Bug#13607 and Bug#15895.  They should have been fixed in recent
+    non-maintainer releases.  If you find otherwise, feel free to re-open
+    them.  
+
+ -- Anthony Fok   Wed, 24 Dec 1997 18:10:55 -0700
+
+wml (1.4.7-0.2) unstable; urgency=low
+
+  * Thanks to Tommi Virtanen for pointing out the solution to the eperl
+    segmentation fault problem!  WML should work now!  Please test!  
+  * debian/control: Now Depends on perl (>= 5.004.04-3), m4 (>= 1.4-8) and
+    eperl (>= 2.2.8-0.2).
+  * debian/rules:
+     - Removed --enable-compat from the command-line option of ./configure.
+       We can live without the obsolete features, can't we?  
+     - Replaced some files with symlinks to m4 and eperl.
+
+ -- Anthony Fok   Mon, 22 Dec 1997 07:10:16 -0700
+
+wml (1.4.7-0.1) unstable; urgency=low
+
+  * New upstream (non-maintainer) release.
+  * Added the new /usr/doc/wml/BUGREPORT from upstream.
+
+ -- Anthony Fok   Sat, 20 Dec 1997 18:58:22 -0700
+
+wml (1.4.6-0.1) unstable; urgency=low
+
+  * New upstream non-maintainer libc6 release.
+  * debian/rules:
+     - Now uses debhelper.
+     - Added "INSTALLDIRS=perl" to "make install" to ensure the Perl modules
+       are put into the correct directories.
+  * debian/control: Updated Standards-Version to 2.3.0.1.
+  * Other minor changes and fixes here and there.  
+
+  * Known bug: WML fails to compile the demo files in /usr/doc/wml/examples
+    and gives the error message "Error in Pass 3 (rc=139)".  Apparently,
+    /usr/bin/wml_p3_eperl gives a segmentation fault and core dump at the
+    end of Pass 3.  /usr/bin/eperl from the eperl_2.2.5-1.1 package (libc6)
+    seems to have the same problem (Bug#15818).  Hmm...
+
+ -- Anthony Fok   Tue, 16 Dec 1997 17:10:47 -0700
+
+wml (1.3.1-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Heiko Schlittermann   Tue, 28 Oct 1997 01:19:12 +0100
+
+wml (1.3.0-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Heiko Schlittermann   Mon, 27 Oct 1997 23:37:52 +0100
+
+wml (1.2.3-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Heiko Schlittermann   Sun, 5 Oct 1997 23:45:40 +0200
+
+wml (1.2.2-1) unstable; urgency=low
+
+  * new upstream version
+
+ -- Heiko Schlittermann   Tue, 9 Sep 1997 22:25:13 +0200
+
+wml (1.2.1-2) unstable; urgency=low
+
+  * installed compiled manpages in /usr/man/cat?
+
+ -- Heiko Schlittermann   Sat, 6 Sep 1997 11:14:58 +0200
+
+wml (1.2.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Heiko Schlittermann   Mon, 1 Sep 1997 22:20:36 +0200
+
+wml (1.2.0.1-2) unstable; urgency=low
+
+  * several doc files where place directly in /usr/doc/ instead
+    of /usr/doc/wml/.
+
+ -- Heiko Schlittermann   Sun, 31 Aug 1997 16:26:38 +0200
+
+wml (1.2.0.1-1) unstable; urgency=low
+
+  * initial debian release
+
+ -- Heiko Schlittermann   Sat, 23 Aug 1997 00:02:28 +0200
+
+Local variables:
+mode: debian-changelog
+End:
--- wml-2.0.11.orig/debian/control
+++ wml-2.0.11/debian/control
@@ -0,0 +1,25 @@
+Source: wml
+Section: web
+Priority: optional
+Maintainer: Ubuntu MOTU Developers 
+XSBC-Original-Maintainer: Felipe Augusto van de Wiel (faw) 
+Standards-Version: 3.7.2
+Build-Depends: perl (>= 5.8.0), libperl-dev, debhelper (>= 5), autotools-dev, zlib1g-dev
+
+Package: wml
+Architecture: any
+Depends: ${shlibs:Depends}, ${perl:Depends}, mp4h (>= 1.1.1-1), eperl (>= 2.2.14-2), m4 (>= 1.4-8), slice (>= 1.3.7-0.1), iselect (>= 1.2.0-2), libterm-readkey-perl, libimage-size-perl, libbit-vector-perl
+Recommends: tidy (>= 19990415-1), libhtml-clean-perl (>= 0.7-3), linklint, txt2html
+Suggests: gfont, freetable, imagemagick, libwww-perl, shtool (>= 1.5.1-1), tardy, doc-html-w3, weblint (>= 1.020-1)
+Description: off-line HTML generation toolkit
+ WML (Website META Language) is a free and extensible Webdesigner's
+ off-line HTML generation toolkit for Unix.  WML consists of a control
+ frontend driving up to nine backends in a sequential pass-oriented
+ filtering scheme. Each backend provides one particular core language.
+ For maximum power WML additionally ships with a well-suited set of
+ include files which provide higher-level features build on top of the
+ backends core languages. While not trivial and idiot proof WML provides
+ most of the core features real hackers always wanted for HTML
+ generation.
+ .
+  Homepage: http://www.thewml.org/
--- wml-2.0.11.orig/debian/copyright
+++ wml-2.0.11/debian/copyright
@@ -0,0 +1,12 @@
+This is Debian GNU/Linux's prepackaged version of
+Ralf S. Engelschall's  Website META Language (WML).
+As of version 1.6.8, Denis Barbier  has become the
+new official WML maintainer.
+
+This package was debianized from
+       http://www.engelschall.com/sw/wml/distrib/wml-2.0.8.tar.gz
+
+Ralf Engelschall released WML under the terms and conditions of the GNU
+General Public License (GPL).  On Debian GNU/Linux systems, the complete
+text of the GNU General Public License may be found in
+`/usr/share/common-licenses/GPL'.
--- wml-2.0.11.orig/debian/compat
+++ wml-2.0.11/debian/compat
@@ -0,0 +1 @@
+5
--- wml-2.0.11.orig/debian/links
+++ wml-2.0.11/debian/links
@@ -0,0 +1,11 @@
+usr/bin/mp4h	usr/lib/wml/exec/wml_p2_mp4h
+usr/bin/eperl	usr/lib/wml/exec/wml_p3_eperl
+usr/bin/m4	usr/lib/wml/exec/wml_p4_gm4
+usr/bin/slice	usr/lib/wml/exec/wml_p9_slice
+usr/bin/freetable	usr/lib/wml/exec/wml_aux_freetable
+usr/bin/htmlclean	usr/lib/wml/exec/wml_aux_htmlclean
+usr/bin/iselect	usr/lib/wml/exec/wml_aux_iselect
+usr/bin/linklint	usr/lib/wml/exec/wml_aux_linklint
+usr/bin/tidy	usr/lib/wml/exec/wml_aux_tidy
+usr/bin/txt2html	usr/lib/wml/exec/wml_aux_newtxt2html
+usr/bin/weblint	usr/lib/wml/exec/wml_aux_weblint
--- wml-2.0.11.orig/debian/rules
+++ wml-2.0.11/debian/rules
@@ -0,0 +1,73 @@
+#!/usr/bin/make -f
+
+SHELL = /bin/sh
+
+r = $(shell pwd)/debian/wml
+p = wml
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+unexport CFLAGS
+unexport CPPFLAGS
+unexport LDFLAGS
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+	./configure --prefix=/usr --with-catdir=man --mandir=/usr/share/man
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+	dh_clean
+	-test -r /usr/share/misc/config.sub && \
+	cp -f /usr/share/misc/config.sub etc/config.sub &&\
+	cp -f /usr/share/misc/config.sub wml_backend/p2_mp4h/config.sub
+	-test -r /usr/share/misc/config.guess && \
+	cp -f /usr/share/misc/config.guess etc/config.guess && \
+	cp -f /usr/share/misc/config.guess wml_backend/p2_mp4h/config.sub
+
+# Build architecture-independent files here.
+binary-indep: build
+# There are no architecture-independent files to be uploaded
+# generated by this package.  If there were any they would be
+# made here.
+
+# Build architecture-dependent files here.
+binary-arch: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	$(MAKE) prefix=$(r)/usr mandir=$(r)/usr/share/man INSTALLDIRS=perl install
+	dh_installdocs ANNOUNCE BUGREPORT COPYRIGHT COPYRIGHT.OTHER CREDITS \
+		MANIFEST NEWS README README.mp4h SUPPORT VERSION \
+		VERSION.HISTORY wml_contrib/
+	find $(r) -name \*.spec | xargs rm -f
+	find $(r)/usr -type f -name .packlist | xargs rm -f
+	#   Fix documentation
+	for f in $(r)/usr/share/man/*/*; do \
+	   sed -e 's|.*/\([^/	]*\)	.*/\([^/	]*\)|s/\2/\1/|' debian/links |\
+	   sed -f - $$f > $$f.new && mv $$f.new $$f; \
+	done
+	chmod 644 $(r)/usr/share/man/*/*
+	dh_installchangelogs ChangeLog
+	dh_strip
+	dh_compress
+	dh_link
+	dh_fixperms
+	dh_installdeb
+	dh_perl usr/lib/wml/perl/lib
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
--- wml-2.0.11.orig/config/configure.in
+++ wml-2.0.11/config/configure.in
@@ -172,10 +172,10 @@
 
 dnl ## more GNU autoconf scripts can be found there:
 AC_CONFIG_SUBDIRS(dnl
-wml_backend/p2_mp4h  dnl
-wml_backend/p3_eperl dnl
-wml_backend/p4_gm4 dnl
-wml_aux/iselect dnl
+dnl wml_backend/p2_mp4h  dnl
+dnl wml_backend/p3_eperl dnl
+dnl wml_backend/p4_gm4 dnl
+dnl wml_aux/iselect dnl
 wml_common/gd dnl
 )
 
@@ -190,18 +190,18 @@
 wml_backend/p6_asubst/Makefile dnl
 wml_backend/p7_htmlfix/Makefile dnl
 wml_backend/p8_htmlstrip/Makefile dnl
-wml_backend/p9_slice/Makefile dnl
+dnl wml_backend/p9_slice/Makefile dnl
 wml_common/Makefile dnl
 wml_docs/Makefile dnl
 wml_aux/Makefile dnl
 wml_aux/htmlinfo/Makefile dnl
-wml_aux/htmlclean/Makefile dnl
-wml_aux/linklint/Makefile dnl
+dnl wml_aux/htmlclean/Makefile dnl
+dnl wml_aux/linklint/Makefile dnl
 wml_aux/map2html/Makefile dnl
 wml_aux/txt2html/Makefile dnl
-wml_aux/tidy/Makefile dnl
-wml_aux/weblint/Makefile dnl
-wml_aux/freetable/Makefile dnl
+dnl wml_aux/tidy/Makefile dnl
+dnl wml_aux/weblint/Makefile dnl
+dnl wml_aux/freetable/Makefile dnl
 wml_misc/Makefile dnl
 wml_include/Makefile dnl
 wml_test/Makefile dnl
--- wml-2.0.11.orig/wml_misc/Makefile.in
+++ wml-2.0.11/wml_misc/Makefile.in
@@ -15,15 +15,15 @@
 VPATH           = @srcdir@
 
 PATH_PERL       = @PATH_PERL@
-INSTALL_PROGRAM = $(top_srcdir)/etc/shtool install -c -m 755 -s
-INSTALL_DATA    = $(top_srcdir)/etc/shtool install -c -m 644
-MKDIR           = $(top_srcdir)/etc/shtool mkdir -f -p -m 755
+INSTALL_PROGRAM = install -c -m 755 -s
+INSTALL_DATA    = install -c -m 644
+MKDIR           = mkdir -p -m 755
 
 prefix          = @prefix@
 exec_prefix     = $(prefix)
 bindir          = $(prefix)/bin
 libsubdir       = @libsubdir@
-libdir          = $(prefix)/lib$(libsubdir)
+datadir         = $(prefix)/share$(libsubdir)
 mandir          = $(prefix)/man
 
 # ------------------------------------------------
--- wml-2.0.11.orig/wml_contrib/wmg.cgi
+++ wml-2.0.11/wml_contrib/wmg.cgi
@@ -1,6 +1,5 @@
-:
-eval 'exec perl -S $0 ${1+"$@"}'
-    if $running_under_some_shell;
+#! /usr/bin/perl
+
 ##
 ##  wmg.cgi -- webdesign magnifying glass
 ##  Copyright (c) 1998,1999 Ralf S. Engelschall, All Rights Reserved. 
@@ -367,14 +366,7 @@
         ($w, $h, $t) = Image::Size::imgsize(\$contents);
         if ($w*$h == 1) {
             #   read image into GD
-            $tmpfile = "/tmp/pe.tmp.$$";
-            unlink($tmpfile);
-            open(TMP, ">$tmpfile");
-            print TMP $contents;
-            close(TMP);
-            open(TMP, "<$tmpfile");
-            $tmpimg = newFromGif GD::Image(TMP);
-            close(TMP);
+            $tmpimg = newFromGif GD::Image($contents);
             unlink($tmpfile);
             if ($tmpimg->transparent != -1) {
                 my $im = new GD::Image($w, $h);
@@ -433,8 +425,8 @@
         $im->string(gdSmallFont,1,1, sprintf("%s %dx%d", $t, $w, $h), $col3);
         $im->string(gdSmallFont,1,12, "$alt", $col3) if ($alt ne '');
         $im->string(gdSmallFont,1,12, "[$file]", $col3) if ($alt eq '');
-        $contents = $im->gif;
-        $type = 'image/gif';
+        $contents = $im->png;
+        $type = 'image/png';
     }
 }
 if ($level >= 4) {