apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: apr-util/xml/expat/conftools config.guess config.sub
Date Fri, 19 Apr 2002 21:24:39 GMT
jerenkrantz    02/04/19 14:24:39

  Modified:    xml/expat/conftools config.guess config.sub
  Log:
  Apparently, when I made the commit to update the config.guess and
  config.sub, a bad version snuck in.  Resync with our version from APR
  so that our bundled expat supports the same platforms as APR.
  
  Revision  Changes    Path
  1.2       +150 -123  apr-util/xml/expat/conftools/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/conftools/config.guess,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.guess	16 Apr 2002 08:49:03 -0000	1.1
  +++ config.guess	19 Apr 2002 21:24:39 -0000	1.2
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
  -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  -#   Free Software Foundation, Inc.
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  +#   2000, 2001, 2002 Free Software Foundation, Inc.
   
  -timestamp='2001-09-04'
  +timestamp='2002-03-20'
   
   # This file is free software; you can redistribute it and/or modify it
   # under the terms of the GNU General Public License as published by
  @@ -24,8 +24,14 @@
   # configuration script generated by Autoconf, you may include it under
   # the same distribution terms that you use for the rest of that program.
   
  -# Written by Per Bothner <bothner@cygnus.com>.
  -# Please send patches to <config-patches@gnu.org>.
  +#####################################################################
  +# This file contains changes for Apache, clearly marked below.
  +# These changes are hereby donated to the public domain.
  +#####################################################################
  +
  +# Originally written by Per Bothner <per@bothner.com>.
  +# Please send patches to <config-patches@gnu.org>.  Submit a context
  +# diff and a properly formatted ChangeLog entry.
   #
   # This script attempts to guess a canonical system name similar to
   # config.sub.  If it succeeds, it prints the system name on stdout, and
  @@ -97,7 +103,7 @@
   
   set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
    ,,)    echo "int dummy(){}" > $dummy.c ;
  -	for c in cc gcc c89 ; do
  +	for c in cc gcc c89 c99 ; do
   	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
   	  if test $? = 0 ; then
   	     CC_FOR_BUILD="$c"; break ;
  @@ -127,29 +133,29 @@
   
   case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
       *:NetBSD:*:*)
  -	# Netbsd (nbsd) targets should (where applicable) match one or
  +	# NetBSD (nbsd) targets should (where applicable) match one or
   	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
   	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
   	# switched to ELF, *-*-netbsd* would select the old
   	# object file format.  This provides both forward
   	# compatibility and a consistent mechanism for selecting the
   	# object file format.
  -	# Determine the machine/vendor (is the vendor relevant).
  -	case "${UNAME_MACHINE}" in
  -	    amiga) machine=m68k-unknown ;;
  -	    arm32) machine=arm-unknown ;;
  -	    atari*) machine=m68k-atari ;;
  -	    sun3*) machine=m68k-sun ;;
  -	    mac68k) machine=m68k-apple ;;
  -	    macppc) machine=powerpc-apple ;;
  -	    hp3[0-9][05]) machine=m68k-hp ;;
  -	    ibmrt|romp-ibm) machine=romp-ibm ;;
  -	    *) machine=${UNAME_MACHINE}-unknown ;;
  +	#
  +	# Note: NetBSD doesn't particularly care about the vendor
  +	# portion of the name.  We always set it to "unknown".
  +	sysctl="sysctl -n hw.machine_arch"
  +	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
  +	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
  +	case "${UNAME_MACHINE_ARCH}" in
  +	    arm*) machine=arm-unknown ;;
  +	    sh3el) machine=shl-unknown ;;
  +	    sh3eb) machine=sh-unknown ;;
  +	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
   	esac
   	# The Operating System including object format, if it has switched
   	# to ELF recently, or will in the future.
  -	case "${UNAME_MACHINE}" in
  -	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
  +	case "${UNAME_MACHINE_ARCH}" in
  +	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
   		eval $set_cc_for_build
   		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
   			| grep __ELF__ >/dev/null
  @@ -172,6 +178,45 @@
   	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   	echo "${machine}-${os}${release}"
   	exit 0 ;;
  +    amiga:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    arc:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    hp300:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mac68k:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    macppc:OpenBSD:*:*)
  +	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mvme68k:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mvme88k:OpenBSD:*:*)
  +	echo m88k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    mvmeppc:OpenBSD:*:*)
  +	echo powerpc-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    pmax:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    sgi:OpenBSD:*:*)
  +	echo mipseb-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    sun3:OpenBSD:*:*)
  +	echo m68k-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    wgrisc:OpenBSD:*:*)
  +	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:OpenBSD:*:*)
  +	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
  +	exit 0 ;;
       alpha:OSF1:*:*)
   	if test $UNAME_RELEASE = "V4.0"; then
   		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  @@ -247,30 +292,30 @@
       Amiga*:UNIX_System_V:4.0:*)
   	echo m68k-unknown-sysv4
   	exit 0;;
  -    amiga:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       *:[Aa]miga[Oo][Ss]:*:*)
   	echo ${UNAME_MACHINE}-unknown-amigaos
   	exit 0 ;;
  -    arc64:OpenBSD:*:*)
  -	echo mips64el-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    arc:OpenBSD:*:*)
  -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    hkmips:OpenBSD:*:*)
  -	echo mips-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    pmax:OpenBSD:*:*)
  -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    sgi:OpenBSD:*:*)
  -	echo mips-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    wgrisc:OpenBSD:*:*)
  -	echo mipsel-unknown-openbsd${UNAME_RELEASE}
  +    *:[Mm]orph[Oo][Ss]:*:*)
  +	echo ${UNAME_MACHINE}-unknown-morphos
   	exit 0 ;;
  +#########################
  +# Apache changes
  +#
  +#   *:OS/390:*:*)
  +#      echo i370-ibm-openedition
  +#      exit 0 ;;
  +    *:OS390:*:* | *:OS/390:*:*)
  +       echo s390-ibm-os390
  +       exit 0 ;; 
  +    *:OS400:*:* | *:OS/400:*:*) 
  +       echo as400-ibm-os400
  +       exit 0 ;;
  +    *:OS/2:*:*)
  +       echo "i386-pc-os2_emx"
  +       exit 0;;
  +#
  +# end Apache changes
  +#########################
       *:OS/390:*:*)
   	echo i370-ibm-openedition
   	exit 0 ;;
  @@ -319,7 +364,7 @@
   	echo m68k-sun-sunos${UNAME_RELEASE}
   	exit 0 ;;
       sun*:*:4.2BSD:*)
  -	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
  +	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
   	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
   	case "`/bin/arch`" in
   	    sun3)
  @@ -333,12 +378,6 @@
       aushp:SunOS:*:*)
   	echo sparc-auspex-sunos${UNAME_RELEASE}
   	exit 0 ;;
  -    sparc*:NetBSD:*)
  -	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    atari*:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       # The situation for MiNT is a little confusing.  The machine name
       # can be virtually everything (everything which is not
       # "atarist" or "atariste" at least should have a processor
  @@ -365,18 +404,6 @@
       *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
           echo m68k-unknown-mint${UNAME_RELEASE}
           exit 0 ;;
  -    sun3*:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mac68k:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mvme68k:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
  -    mvme88k:OpenBSD:*:*)
  -	echo m88k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       powerpc:machten:*:*)
   	echo powerpc-apple-machten${UNAME_RELEASE}
   	exit 0 ;;
  @@ -506,7 +533,7 @@
   	fi
   	exit 0 ;;
       *:AIX:*:[45])
  -	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
  +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   		IBM_ARCH=rs6000
   	else
  @@ -546,10 +573,8 @@
   	    9000/31? )            HP_ARCH=m68000 ;;
   	    9000/[34]?? )         HP_ARCH=m68k ;;
   	    9000/[678][0-9][0-9])
  -              case "${HPUX_REV}" in
  -                11.[0-9][0-9])
  -                  if [ -x /usr/bin/getconf ]; then
  -                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
  +		if [ -x /usr/bin/getconf ]; then
  +		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
                       sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
                       case "${sc_cpu_version}" in
                         523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
  @@ -558,13 +583,13 @@
                           case "${sc_kernel_bits}" in
                             32) HP_ARCH="hppa2.0n" ;;
                             64) HP_ARCH="hppa2.0w" ;;
  +			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
                           esac ;;
                       esac
  -                  fi ;;
  -              esac
  -              if [ "${HP_ARCH}" = "" ]; then
  -	      eval $set_cc_for_build
  -              sed 's/^              //' << EOF >$dummy.c
  +		fi
  +		if [ "${HP_ARCH}" = "" ]; then
  +		    eval $set_cc_for_build
  +		    sed 's/^              //' << EOF >$dummy.c
   
                 #define _HPUX_SOURCE
                 #include <stdlib.h>
  @@ -597,10 +622,10 @@
                     exit (0);
                 }
   EOF
  -	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
  -	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
  -	    rm -f $dummy.c $dummy
  -	fi ;;
  +		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
  +		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
  +		    rm -f $dummy.c $dummy
  +		fi ;;
   	esac
   	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   	exit 0 ;;
  @@ -664,9 +689,6 @@
       parisc*:Lites*:*:*)
   	echo hppa1.1-hp-lites
   	exit 0 ;;
  -    hppa*:OpenBSD:*:*)
  -	echo hppa-unknown-openbsd
  -	exit 0 ;;
       C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   	echo c1-convex-bsd
           exit 0 ;;
  @@ -685,9 +707,6 @@
       C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   	echo c4-convex-bsd
           exit 0 ;;
  -    CRAY*X-MP:*:*:*)
  -	echo xmp-cray-unicos
  -        exit 0 ;;
       CRAY*Y-MP:*:*:*)
   	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
  @@ -709,18 +728,12 @@
       CRAY*SV1:*:*:*)
   	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   	exit 0 ;;
  -    CRAY-2:*:*:*)
  -	echo cray2-cray-unicos
  -        exit 0 ;;
       F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
           FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
| sed -e 's/\///'`
           FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
           echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
           exit 0 ;;
  -    hp300:OpenBSD:*:*)
  -	echo m68k-unknown-openbsd${UNAME_RELEASE}
  -	exit 0 ;;
       i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   	exit 0 ;;
  @@ -733,9 +746,6 @@
       *:FreeBSD:*:*)
   	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   	exit 0 ;;
  -    *:OpenBSD:*:*)
  -	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  -	exit 0 ;;
       i*:CYGWIN*:*)
   	echo ${UNAME_MACHINE}-pc-cygwin
   	exit 0 ;;
  @@ -745,6 +755,9 @@
       i*:PW*:*)
   	echo ${UNAME_MACHINE}-pc-pw32
   	exit 0 ;;
  +    x86:Interix*:3*)
  +	echo i386-pc-interix3
  +	exit 0 ;;
       i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
   	# How do we know it's Interix rather than the generic POSIX subsystem?
   	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  @@ -770,16 +783,30 @@
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
       ia64:Linux:*:*)
  -	echo ${UNAME_MACHINE}-unknown-linux
  +	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
       m68*:Linux:*:*)
   	echo ${UNAME_MACHINE}-unknown-linux-gnu
   	exit 0 ;;
       mips:Linux:*:*)
  -	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
  -	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
  -	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
  -	esac
  +	eval $set_cc_for_build
  +	sed 's/^	//' << EOF >$dummy.c
  +	#undef CPU
  +	#undef mips
  +	#undef mipsel
  +	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
  +	CPU=mipsel
  +	#else
  +	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
  +	CPU=mips
  +	#else
  +	CPU=
  +	#endif
  +	#endif
  +EOF
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
  +	rm -f $dummy.c
  +	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
   	;;
       ppc:Linux:*:*)
   	echo powerpc-unknown-linux-gnu
  @@ -828,7 +855,8 @@
   	# The BFD linker knows what the default object file format is, so
   	# first see if it will tell us. cd to the root directory to prevent
   	# problems with other programs or directories called `ld' in the path.
  -	ld_supported_targets=`cd /; ld --help 2>&1 \
  +	# Set LC_ALL=C to ensure ld outputs messages in English.
  +	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
   			 | sed -ne '/supported targets:/!d
   				    s/[ 	][ 	]*/ /g
   				    s/.*supported targets: *//
  @@ -852,32 +880,29 @@
   	esac
   	# Determine whether the default compiler is a.out or elf
   	eval $set_cc_for_build
  -	cat >$dummy.c <<EOF
  -#include <features.h>
  -#ifdef __cplusplus
  -#include <stdio.h>  /* for printf() prototype */
  -	int main (int argc, char *argv[]) {
  -#else
  -	int main (argc, argv) int argc; char *argv[]; {
  -#endif
  -#ifdef __ELF__
  -# ifdef __GLIBC__
  -#  if __GLIBC__ >= 2
  -    printf ("%s-pc-linux-gnu\n", argv[1]);
  -#  else
  -    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
  -#  endif
  -# else
  -   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
  -# endif
  -#else
  -  printf ("%s-pc-linux-gnuaout\n", argv[1]);
  -#endif
  -  return 0;
  -}
  +	sed 's/^	//' << EOF >$dummy.c
  +	#include <features.h>
  +	#ifdef __ELF__
  +	# ifdef __GLIBC__
  +	#  if __GLIBC__ >= 2
  +	LIBC=gnu
  +	#  else
  +	LIBC=gnulibc1
  +	#  endif
  +	# else
  +	LIBC=gnulibc1
  +	# endif
  +	#else
  +	#ifdef __INTEL_COMPILER
  +	LIBC=gnu
  +	#else
  +	LIBC=gnuaout
  +	#endif
  +	#endif
   EOF
  -	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}"
&& rm -f $dummy.c $dummy && exit 0
  -	rm -f $dummy.c $dummy
  +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
  +	rm -f $dummy.c
  +	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit
0
   	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
   	;;
       i*86:DYNIX/ptx:4*:*)
  @@ -956,7 +981,7 @@
   	exit 0 ;;
       M68*:*:R3V[567]*:*)
   	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
  -    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
  +    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0
| 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
   	OS_REL=''
   	test -r /etc/.relid \
   	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
  @@ -1057,15 +1082,17 @@
   	echo `uname -p`-apple-darwin${UNAME_RELEASE}
   	exit 0 ;;
       *:procnto*:*:* | *:QNX:[0123456789]*:*)
  -	if test "${UNAME_MACHINE}" = "x86pc"; then
  +	UNAME_PROCESSOR=`uname -p`
  +	if test "$UNAME_PROCESSOR" = "x86"; then
  +		UNAME_PROCESSOR=i386
   		UNAME_MACHINE=pc
   	fi
  -	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
  +	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
   	exit 0 ;;
       *:QNX:*:4*)
   	echo i386-pc-qnx
   	exit 0 ;;
  -    NSR-[KW]:NONSTOP_KERNEL:*:*)
  +    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
   	echo nsr-tandem-nsk${UNAME_RELEASE}
   	exit 0 ;;
       *:NonStop-UX:*:*)
  
  
  
  1.2       +157 -61   apr-util/xml/expat/conftools/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/conftools/config.sub,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.sub	16 Apr 2002 08:49:03 -0000	1.1
  +++ config.sub	19 Apr 2002 21:24:39 -0000	1.2
  @@ -1,9 +1,9 @@
   #! /bin/sh
   # Configuration validation subroutine script.
  -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
  -#   Free Software Foundation, Inc.
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
  +#   2000, 2001, 2002 Free Software Foundation, Inc.
   
  -timestamp='2001-09-07'
  +timestamp='2002-03-07'
   
   # This file is (in principle) common to ALL GNU software.
   # The presence of a machine in this file suggests that SOME GNU software
  @@ -29,7 +29,13 @@
   # 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 <config-patches@gnu.org>.
  +#####################################################################
  +# This file contains changes for Apache, clearly marked below.
  +# These changes are hereby donated to the public domain.
  +#####################################################################
  +
  +# Please send patches to <config-patches@gnu.org>.  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.
  @@ -117,10 +123,28 @@
   # Here we must recognize all the valid KERNEL-OS combinations.
   maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
   case $maybe_os in
  -  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
  +  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
       os=-$maybe_os
       basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
       ;;
  +########################
  +# changes for Apache
  +#
  +  tpf | os390 | vmcms)
  +    os=-$maybe_os
  +    basic_machine=s390;
  +    ;;
  +  os400)
  +    os=-$maybe_os
  +    basic_machine=as400;
  +    ;;
  +  mvs)
  +    os=-mvs
  +    basic_machine=i370;
  +    ;;
  +#
  +# end Apache changes
  +########################
     *)
       basic_machine=`echo $1 | sed 's/-[^-]*$//'`
       if [ $basic_machine != $1 ]
  @@ -226,6 +250,7 @@
   	1750a | 580 \
   	| a29k \
   	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  +	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
   	| c4x | clipper \
   	| d10v | d30v | dsp16xx \
  @@ -233,25 +258,24 @@
   	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   	| i370 | i860 | i960 | ia64 \
   	| m32r | m68000 | m68k | m88k | mcore \
  -	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
  +	| mips | mips16 | mips64 | mips64el | mips64orion | mips64orionel \
   	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
   	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
   	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
  -	| mipsisa32 \
  +	| mipsisa32 | mipsisa64 \
   	| mn10200 | mn10300 \
   	| ns16k | ns32k \
  -	| openrisc \
  +	| openrisc | or32 \
   	| pdp10 | pdp11 | pj | pjl \
   	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   	| pyramid \
  -	| s390 | s390x \
  -	| sh | sh[34] | sh[34]eb | shbe | shle \
  -	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
  -	| stormy16 | strongarm \
  +	| sh | sh[34] | sh[34]eb | shbe | shle | sh64 \
  +	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
  +	| strongarm \
   	| tahoe | thumb | tic80 | tron \
  -	| v850 \
  +	| v850 | v850e \
   	| we32k \
  -	| x86 | xscale \
  +	| x86 | xscale | xstormy16 | xtensa \
   	| z8k)
   		basic_machine=$basic_machine-unknown
   		;;
  @@ -278,11 +302,13 @@
   	580-* \
   	| a29k-* \
   	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
  -	| alphapca5[67]-* | arc-* \
  +	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   	| arm-*  | armbe-* | armle-* | armv*-* \
  +	| avr-* \
   	| bs2000-* \
   	| c[123]* | c30-* | [cjt]90-* | c54x-* \
  -	| clipper-* | cray2-* | cydra-* \
  +	| clipper-* | cydra-* \
   	| d10v-* | d30v-* \
   	| elxsi-* \
   	| f30[01]-* | f700-* | fr30-* | fx80-* \
  @@ -290,7 +316,7 @@
   	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   	| i*86-* | i860-* | i960-* | ia64-* \
   	| m32r-* \
  -	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
  +	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   	| m88110-* | m88k-* | mcore-* \
   	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
   	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
  @@ -302,14 +328,14 @@
   	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   	| pyramid-* \
   	| romp-* | rs6000-* \
  -	| s390-* | s390x-* \
  -	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
  -	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
  -	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
  -	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
  -	| v850-* | vax-* \
  +	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* | sh64-* \
  +	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
  +	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
  +	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
  +	| v850-* | v850e-* | vax-* \
   	| we32k-* \
  -	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
  +	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
  +	| xtensa-* \
   	| ymp-* \
   	| z8k-*)
   		;;
  @@ -374,6 +400,10 @@
   		basic_machine=ns32k-sequent
   		os=-dynix
   		;;
  +	c90)
  +		basic_machine=c90-cray
  +		os=-unicos
  +		;;
   	convex-c1)
   		basic_machine=c1-convex
   		os=-bsd
  @@ -394,16 +424,8 @@
   		basic_machine=c38-convex
   		os=-bsd
   		;;
  -	cray | ymp)
  -		basic_machine=ymp-cray
  -		os=-unicos
  -		;;
  -	cray2)
  -		basic_machine=cray2-cray
  -		os=-unicos
  -		;;
  -	[cjt]90)
  -		basic_machine=${basic_machine}-cray
  +	cray | j90)
  +		basic_machine=j90-cray
   		os=-unicos
   		;;
   	crds | unos)
  @@ -418,6 +440,14 @@
   	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
  @@ -598,14 +628,6 @@
   		basic_machine=m68k-atari
   		os=-mint
   		;;
  -	mipsel*-linux*)
  -		basic_machine=mipsel-unknown
  -		os=-linux-gnu
  -		;;
  -	mips*-linux*)
  -		basic_machine=mips-unknown
  -		os=-linux-gnu
  -		;;
   	mips3*-*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
   		;;
  @@ -620,6 +642,10 @@
   		basic_machine=m68k-rom68k
   		os=-coff
   		;;
  +	morphos)
  +		basic_machine=powerpc-unknown
  +		os=-morphos
  +		;;
   	msdos)
   		basic_machine=i386-pc
   		os=-msdos
  @@ -699,6 +725,10 @@
   		basic_machine=hppa1.1-oki
   		os=-proelf
   		;;
  +	or32 | or32-*)
  +		basic_machine=or32-unknown
  +		os=-coff
  +		;;
   	OSE68000 | ose68000)
   		basic_machine=m68000-ericsson
   		os=-ose
  @@ -724,7 +754,7 @@
           pc532 | pc532-*)
   		basic_machine=ns32k-pc532
   		;;
  -	pentium | p5 | k5 | k6 | nexgen)
  +	pentium | p5 | k5 | k6 | nexgen | viac3)
   		basic_machine=i586-pc
   		;;
   	pentiumpro | p6 | 6x86 | athlon)
  @@ -733,7 +763,7 @@
   	pentiumii | pentium2)
   		basic_machine=i686-pc
   		;;
  -	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
  +	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
   		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
   	pentiumpro-* | p6-* | 6x86-* | athlon-*)
  @@ -784,10 +814,25 @@
   	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
   		;;
  +########################
  +# changes for Apache
  +#
  +	as400*)
  +		basic_machine=as400-ibm
  +		;;
  +# 
  +# end Apache changes
  +########################
   	sequent)
   		basic_machine=i386-sequent
   		;;
  @@ -795,7 +840,7 @@
   		basic_machine=sh-hitachi
   		os=-hms
   		;;
  -	sparclite-wrs)
  +	sparclite-wrs | simso-wrs)
   		basic_machine=sparclite-wrs
   		os=-vxworks
   		;;
  @@ -853,7 +898,7 @@
   	sun386 | sun386i | roadrunner)
   		basic_machine=i386-sun
   		;;
  -	sv1)
  +        sv1)
   		basic_machine=sv1-cray
   		os=-unicos
   		;;
  @@ -861,8 +906,16 @@
   		basic_machine=i386-sequent
   		os=-dynix
   		;;
  +	t3d)
  +		basic_machine=alpha-cray
  +		os=-unicos
  +		;;
   	t3e)
  -		basic_machine=t3e-cray
  +		basic_machine=alphaev5-cray
  +		os=-unicos
  +		;;
  +	t90)
  +		basic_machine=t90-cray
   		os=-unicos
   		;;
   	tic54x | c54x*)
  @@ -875,6 +928,10 @@
   	tx39el)
   		basic_machine=mipstx39el-unknown
   		;;
  +	toad1)
  +		basic_machine=pdp10-xkl
  +		os=-tops20
  +		;;
   	tower | tower-32)
   		basic_machine=m68k-ncr
   		;;
  @@ -925,13 +982,13 @@
   		basic_machine=i386-pc
   		os=-windows32-msvcrt
   		;;
  -	xmp)
  -		basic_machine=xmp-cray
  -		os=-unicos
  -		;;
           xps | xps100)
   		basic_machine=xps100-honeywell
   		;;
  +	ymp)
  +		basic_machine=ymp-cray
  +		os=-unicos
  +		;;
   	z8k-*-coff)
   		basic_machine=z8k-unknown
   		os=-sim
  @@ -952,13 +1009,6 @@
   	op60c)
   		basic_machine=hppa1.1-oki
   		;;
  -	mips)
  -		if [ x$os = x-linux-gnu ]; then
  -			basic_machine=mips-unknown
  -		else
  -			basic_machine=mips-mips
  -		fi
  -		;;
   	romp)
   		basic_machine=romp-ibm
   		;;
  @@ -981,6 +1031,9 @@
   	sh3 | sh4 | sh3eb | sh4eb)
   		basic_machine=sh-unknown
   		;;
  +	sh64)
  +		basic_machine=sh64-unknown
  +		;;
   	sparc | sparcv9 | sparcv9b)
   		basic_machine=sparc-sun
   		;;
  @@ -1047,6 +1100,14 @@
   	-gnu/linux*)
   		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
   		;;
  +########################
  +# changes for Apache
  +#
  +	-os2_emx | -tpf* | -os390* | -vmcms* | -os400* )
  +        	;;
  +#
  +# end Apache changes
  +########################
   	# First accept the basic system types.
   	# The portable systems comes first.
   	# Each alternative MUST END IN A *, to match a version number.
  @@ -1068,7 +1129,8 @@
   	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
   	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
   	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
  -	      | -os2* | -vos*)
  +	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  +	      | -morphos* | -superux* | -rtmk* | -rtmk-nova*)
   	# Remember, each alternative MUST END IN *, to match a version number.
   		;;
   	-qnx*)
  @@ -1120,12 +1182,18 @@
   	-acis*)
   		os=-aos
   		;;
  +	-atheos*)
  +		os=-atheos
  +		;;
   	-386bsd)
   		os=-bsd
   		;;
   	-ctix* | -uts*)
   		os=-sysv
   		;;
  +	-nova*)
  +		os=-rtmk-nova
  +		;;
   	-ns2 )
   	        os=-nextstep2
   		;;
  @@ -1200,6 +1268,7 @@
   	arm*-semi)
   		os=-aout
   		;;
  +	# This must come before the *-dec entry.
   	pdp10-*)
   		os=-tops20
   		;;
  @@ -1230,6 +1299,9 @@
   	mips*-*)
   		os=-elf
   		;;
  +	or32-*)
  +		os=-coff
  +		;;
   	*-tti)	# must be before sparc entry or we get the wrong os.
   		os=-sysv3
   		;;
  @@ -1239,9 +1311,33 @@
   	*-be)
   		os=-beos
   		;;
  +########################
  +# changes for Apache
  +#
  +#	*-ibm)
  +#		os=-aix
  +#		;;
  +#
   	*-ibm)
  -		os=-aix
  -		;;
  +		case $basic_machine in
  +			s390*)
  +				os=-os390;
  +				;;
  +			i370*)
  +				os=-mvs;
  +				;;
  +			as400*)
  +				os=-os400;
  +				;;
  +			*)
  +				os=-aix
  +				;;
  +		esac
  +                ;;
  +# 
  +# end Apache changes
  +########################
  +
   	*-wec)
   		os=-proelf
   		;;
  
  
  

Mime
View raw message