httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-apr/apr config.guess config.sub configure.in
Date Thu, 15 Jul 1999 12:46:43 GMT
rbb         99/07/15 05:46:42

  Modified:    apr      config.guess config.sub configure.in
  Log:
  Fixup the configure problems that Ralf noticed.  Thanks Ralf.
  
  Revision  Changes    Path
  1.2       +411 -72   apache-apr/apr/config.guess
  
  Index: config.guess
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/config.guess,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.guess	1999/07/14 15:31:40	1.1
  +++ config.guess	1999/07/15 12:46:38	1.2
  @@ -1,6 +1,7 @@
   #! /bin/sh
   # Attempt to guess a canonical system name.
  -#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
  +#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
  +#   Free Software Foundation, Inc.
   #
   # 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
  @@ -23,6 +24,7 @@
   
   # Written by Per Bothner <bothner@cygnus.com>.
   # The master version of this file is at the FSF in /home/gd/gnu/lib.
  +# Please send patches to the Autoconf mailing list <autoconf@gnu.org>.
   #
   # This script attempts to guess a canonical system name similar to
   # config.sub.  If it succeeds, it prints the system name on stdout, and
  @@ -35,6 +37,20 @@
   # (but try to keep the structure clean).
   #
   
  +# Use $HOST_CC if defined. $CC may point to a cross-compiler
  +if test x"$CC_FOR_BUILD" = x; then
  +  if test x"$HOST_CC" != x; then
  +    CC_FOR_BUILD="$HOST_CC"
  +  else
  +    if test x"$CC" != x; then
  +      CC_FOR_BUILD="$CC"
  +    else
  +      CC_FOR_BUILD=cc
  +    fi
  +  fi
  +fi
  +
  +
   # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
   # (ghazi@noc.rutgers.edu 8/24/94.)
   if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
  @@ -46,17 +62,66 @@
   UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
   UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
   
  -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
  +dummy=dummy-$$
  +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
   
   # Note: order is significant - the case branches are not exclusive.
   
   case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
       alpha:OSF1:*:*)
  +	if test $UNAME_RELEASE = "V4.0"; then
  +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
  +	fi
   	# 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 alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
  +	cat <<EOF >$dummy.s
  +	.globl main
  +	.ent main
  +main:
  +	.frame \$30,0,\$26,0
  +	.prologue 0
  +	.long 0x47e03d80 # implver $0
  +	lda \$2,259
  +	.long 0x47e20c21 # amask $2,$1
  +	srl \$1,8,\$2
  +	sll \$2,2,\$2
  +	sll \$0,3,\$0
  +	addl \$1,\$0,\$0
  +	addl \$2,\$0,\$0
  +	ret \$31,(\$26),1
  +	.end main
  +EOF
  +	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
  +	if test "$?" = 0 ; then
  +		./$dummy
  +		case "$?" in
  +			7)
  +				UNAME_MACHINE="alpha"
  +				;;
  +			15)
  +				UNAME_MACHINE="alphaev5"
  +				;;
  +			14)
  +				UNAME_MACHINE="alphaev56"
  +				;;
  +			10)
  +				UNAME_MACHINE="alphapca56"
  +				;;
  +			16)
  +				UNAME_MACHINE="alphaev6"
  +				;;
  +		esac
  +	fi
  +	rm -f $dummy.s $dummy
  +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
'abcdefghijklmnopqrstuvwxyz'`
  +	exit 0 ;;
  +    Alpha\ *:Windows_NT*:*)
  +	# 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 ;;
       21064:Windows_NT:50:3)
   	echo alpha-dec-winnt3.5
  @@ -70,6 +135,9 @@
       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 ;;
  @@ -91,10 +159,13 @@
       arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   	echo arm-acorn-riscix${UNAME_RELEASE}
   	exit 0;;
  +    arm32:NetBSD:*:*)
  +	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
  +	exit 0 ;;
       SR2?01:HI-UX/MPP:*:*)
   	echo hppa1.1-hitachi-hiuxmpp
   	exit 0;;
  -    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
  +    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
  @@ -102,9 +173,12 @@
   		echo pyramid-pyramid-bsd
   	fi
   	exit 0 ;;
  -    NILE:*:*:dcosx)
  +    NILE*:*:*:dcosx)
   	echo pyramid-pyramid-svr4
   	exit 0 ;;
  +    sun4H:SunOS:5.*:*)
  +	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  +	exit 0 ;;
       sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   	exit 0 ;;
  @@ -129,6 +203,18 @@
       sun3*:SunOS:*:*)
   	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`
  +	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 0 ;;
       aushp:SunOS:*:*)
   	echo sparc-auspex-sunos${UNAME_RELEASE}
   	exit 0 ;;
  @@ -138,6 +224,32 @@
       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 
  +    # > 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 0 ;;
  +    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
  +	echo m68k-atari-mint${UNAME_RELEASE}
  +        exit 0 ;;
  +    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
  +        echo m68k-atari-mint${UNAME_RELEASE}
  +	exit 0 ;;
  +    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
  +        echo m68k-milan-mint${UNAME_RELEASE}
  +        exit 0 ;;
  +    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
  +        echo m68k-hades-mint${UNAME_RELEASE}
  +        exit 0 ;;
  +    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
  +        echo m68k-unknown-mint${UNAME_RELEASE}
  +        exit 0 ;;
       sun3*:NetBSD:*:*)
   	echo m68k-sun-netbsd${UNAME_RELEASE}
   	exit 0 ;;
  @@ -159,6 +271,9 @@
       powerpc:machten:*:*)
   	echo powerpc-apple-machten${UNAME_RELEASE}
   	exit 0 ;;
  +    macppc:NetBSD:*:*)
  +        echo powerpc-apple-netbsd${UNAME_RELEASE}
  +        exit 0 ;;
       RISC*:Mach:*:*)
   	echo mips-dec-mach_bsd4.3
   	exit 0 ;;
  @@ -168,12 +283,16 @@
       VAX*:ULTRIX*:*:*)
   	echo vax-dec-ultrix${UNAME_RELEASE}
   	exit 0 ;;
  -    2020:CLIX:*:*)
  +    2020:CLIX:*:* | 2430:CLIX:*:*)
   	echo clipper-intergraph-clix${UNAME_RELEASE}
   	exit 0 ;;
       mips:*:*:UMIPS | mips:*:*:RISCos)
  -	sed 's/^	//' << EOF >dummy.c
  -	int main (argc, argv) int argc; char **argv; {
  +	sed 's/^	//' << EOF >$dummy.c
  +#ifdef __cplusplus
  +	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);
  @@ -188,10 +307,10 @@
   	  exit (-1);
   	}
   EOF
  -	${CC-cc} dummy.c -o dummy \
  -	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  -	  && rm dummy.c dummy && exit 0
  -	rm -f dummy.c dummy
  +	$CC_FOR_BUILD $dummy.c -o $dummy \
  +	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
  +	  && rm $dummy.c $dummy && exit 0
  +	rm -f $dummy.c $dummy
   	echo mips-mips-riscos${UNAME_RELEASE}
   	exit 0 ;;
       Night_Hawk:Power_UNIX:*:*)
  @@ -243,7 +362,7 @@
   	exit 0 ;;
       *:AIX:2:3)
   	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
  -		sed 's/^		//' << EOF >dummy.c
  +		sed 's/^		//' << EOF >$dummy.c
   		#include <sys/systemcfg.h>
   
   		main()
  @@ -254,8 +373,8 @@
   			exit(0);
   			}
   EOF
  -		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit
0
  -		rm -f dummy.c dummy
  +		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy &&
exit 0
  +		rm -f $dummy.c $dummy
   		echo rs6000-ibm-aix3.2.5
   	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
   		echo rs6000-ibm-aix3.2.4
  @@ -264,7 +383,8 @@
   	fi
   	exit 0 ;;
       *:AIX:*:4)
  -	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
  +	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
  +	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
   		IBM_ARCH=rs6000
   	else
   		IBM_ARCH=powerpc
  @@ -297,18 +417,50 @@
       hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
   	echo m68k-hp-bsd4.4
   	exit 0 ;;
  -    9000/[3478]??:HP-UX:*:*)
  +    9000/[34678]??:HP-UX:*:*)
   	case "${UNAME_MACHINE}" in
   	    9000/31? )            HP_ARCH=m68000 ;;
   	    9000/[34]?? )         HP_ARCH=m68k ;;
  -	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
  -	    9000/8?? )            HP_ARCH=hppa1.0 ;;
  +	    9000/[678][0-9][0-9])
  +              sed 's/^              //' << EOF >$dummy.c
  +              #include <stdlib.h>
  +              #include <unistd.h>
  +
  +              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
  +	($CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
  +	rm -f $dummy.c $dummy
   	esac
   	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
   	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   	exit 0 ;;
       3050*:HI-UX:*:*)
  -	sed 's/^	//' << EOF >dummy.c
  +	sed 's/^	//' << EOF >$dummy.c
   	#include <unistd.h>
   	int
   	main ()
  @@ -333,8 +485,8 @@
   	  exit (0);
   	}
   EOF
  -	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit
0
  -	rm -f dummy.c dummy
  +	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy &&
exit 0
  +	rm -f $dummy.c $dummy
   	echo unknown-hitachi-hiuxwe2
   	exit 0 ;;
       9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
  @@ -343,6 +495,9 @@
       9000/8??:4.3bsd:*:*)
   	echo hppa1.0-hp-bsd
   	exit 0 ;;
  +    *9??*:MPE/iX:*:*)
  +	echo hppa1.0-hp-mpeix
  +	exit 0 ;;
       hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
   	echo hppa1.1-hp-osf
   	exit 0 ;;
  @@ -359,6 +514,9 @@
       parisc*:Lites*:*:*)
   	echo hppa1.1-hp-lites
   	exit 0 ;;
  +    hppa*:OpenBSD:*:*)
  +	echo hppa-unknown-openbsd
  +	exit 0 ;;
       C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   	echo c1-convex-bsd
           exit 0 ;;
  @@ -391,11 +549,14 @@
       CRAY*TS:*:*:*)
   	echo t90-cray-unicos${UNAME_RELEASE}
   	exit 0 ;;
  +    CRAY*T3E:*:*:*)
  +	echo t3e-cray-unicosmk${UNAME_RELEASE}
  +	exit 0 ;;
       CRAY-2:*:*:*)
   	echo cray2-cray-unicos
           exit 0 ;;
       F300:UNIX_System_V:*:*)
  -        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
  +        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'
| sed -e 's/\///'`
           FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
           echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
           exit 0 ;;
  @@ -408,9 +569,15 @@
       hp300:OpenBSD:*:*)
   	echo m68k-unknown-openbsd${UNAME_RELEASE}
   	exit 0 ;;
  -    i?86:BSD/386:*:* | *:BSD/OS:*:*)
  +    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
   	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   	exit 0 ;;
  +    sparc*:BSD/OS:*:*)
  +	echo sparc-unknown-bsdi${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:BSD/OS:*:*)
  +	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  +	exit 0 ;;
       *:FreeBSD:*:*)
   	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   	exit 0 ;;
  @@ -421,10 +588,22 @@
   	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   	exit 0 ;;
       i*:CYGWIN*:*)
  -	echo i386-pc-cygwin32
  +	echo ${UNAME_MACHINE}-pc-cygwin
   	exit 0 ;;
  +    i*:MINGW*:*)
  +	echo ${UNAME_MACHINE}-pc-mingw32
  +	exit 0 ;;
  +    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  +	# How do we know it's Interix rather than the generic POSIX subsystem?
  +	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
  +	# UNAME_MACHINE based on the output of uname instead of i386?
  +	echo i386-pc-interix
  +	exit 0 ;;
  +    i*:UWIN*:*)
  +	echo ${UNAME_MACHINE}-pc-uwin
  +	exit 0 ;;
       p*:CYGWIN*:*)
  -	echo powerpcle-unknown-cygwin32
  +	echo powerpcle-unknown-cygwin
   	exit 0 ;;
       prep*:SunOS:5.*:*)
   	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
  @@ -433,31 +612,117 @@
   	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed
-e 's,/.*$,,'`
   	exit 0 ;;
       *:Linux:*:*)
  +	# uname on the ARM produces all sorts of strangeness, and we need to
  +	# filter it out.
  +	case "$UNAME_MACHINE" in
  +	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
  +	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
  +	esac
  +
   	# The BFD linker knows what the default object file format is, so
  -	# first see if it will tell us.
  -	ld_help_string=`ld --help 2>&1`
  -	if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86";
then
  -	  echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux";
then
  -	  echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff";
then
  -	  echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf";
then
  -	  echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux";
then
  -	  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
  -	elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc";
then
  -	  echo "powerpc-unknown-linux-gnu" ; exit 0
  -	elif test "${UNAME_MACHINE}" = "alpha" ; then
  -	  echo alpha-unknown-linux-gnu ; exit 0
  -	elif test "${UNAME_MACHINE}" = "sparc" ; then
  -	  echo sparc-unknown-linux-gnu ; exit 0
  -	elif test "${UNAME_MACHINE}" = "mips" ; then
  -	  cat >dummy.c <<EOF
  +	# 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_help_string=`cd /; ld --help 2>&1`
  +	ld_supported_emulations=`echo $ld_help_string \
  +			 | sed -ne '/supported emulations:/!d
  +				    s/[ 	][ 	]*/ /g
  +				    s/.*supported emulations: *//
  +				    s/ .*//
  +				    p'`
  +        case "$ld_supported_emulations" in
  +	  *ia64)      echo "${UNAME_MACHINE}-unknown-linux"         ; exit 0 ;;
  +	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
  +	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
  +	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
  +	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
  +	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
  +	  elf32ppc | elf32ppclinux)
  +		# Determine Lib Version
  +		cat >$dummy.c <<EOF
  +#include <features.h>
  +#if defined(__GLIBC__)
  +extern char __libc_version[];
  +extern char __libc_release[];
  +#endif
   main(argc, argv)
  -int argc;
  -char *argv[];
  +     int argc;
  +     char *argv[];
   {
  +#if defined(__GLIBC__)
  +  printf("%s %s\n", __libc_version, __libc_release);
  +#else
  +  printf("unkown\n");
  +#endif
  +  return 0;
  +}
  +EOF
  +		LIBC=""
  +		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
  +		if test "$?" = 0 ; then
  +			./$dummy | grep 1\.99 > /dev/null
  +			if test "$?" = 0 ; then
  +				LIBC="libc1"
  +			fi
  +		fi	
  +		rm -f $dummy.c $dummy
  +		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
  +	esac
  +
  +	if test "${UNAME_MACHINE}" = "alpha" ; then
  +		sed 's/^	//'  <<EOF >$dummy.s
  +		.globl main
  +		.ent main
  +	main:
  +		.frame \$30,0,\$26,0
  +		.prologue 0
  +		.long 0x47e03d80 # implver $0
  +		lda \$2,259
  +		.long 0x47e20c21 # amask $2,$1
  +		srl \$1,8,\$2
  +		sll \$2,2,\$2
  +		sll \$0,3,\$0
  +		addl \$1,\$0,\$0
  +		addl \$2,\$0,\$0
  +		ret \$31,(\$26),1
  +		.end main
  +EOF
  +		LIBC=""
  +		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
  +		if test "$?" = 0 ; then
  +			./$dummy
  +			case "$?" in
  +			7)
  +				UNAME_MACHINE="alpha"
  +				;;
  +			15)
  +				UNAME_MACHINE="alphaev5"
  +				;;
  +			14)
  +				UNAME_MACHINE="alphaev56"
  +				;;
  +			10)
  +				UNAME_MACHINE="alphapca56"
  +				;;
  +			16)
  +				UNAME_MACHINE="alphaev6"
  +				;;
  +			esac
  +
  +			objdump --private-headers $dummy | \
  +			  grep ld.so.1 > /dev/null
  +			if test "$?" = 0 ; then
  +				LIBC="libc1"
  +			fi
  +		fi
  +		rm -f $dummy.s $dummy
  +		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
  +	elif test "${UNAME_MACHINE}" = "mips" ; then
  +	  cat >$dummy.c <<EOF
  +#ifdef __cplusplus
  +	int main (int argc, char *argv[]) {
  +#else
  +	int main (argc, argv) int argc; char *argv[]; {
  +#endif
   #ifdef __MIPSEB__
     printf ("%s-unknown-linux-gnu\n", argv[1]);
   #endif
  @@ -467,35 +732,65 @@
     return 0;
   }
   EOF
  -	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" &&
rm dummy.c dummy && exit 0
  -	  rm -f dummy.c dummy
  +	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}"
&& rm $dummy.c $dummy && exit 0
  +	  rm -f $dummy.c $dummy
   	else
  -	  # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
  -	  # useful --help.  Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
  -	  test ! -d /usr/lib/ldscripts/. \
  -	    && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
  +	  # Either a pre-BFD a.out linker (linux-gnuoldld)
  +	  # or one that does not give us useful --help.
  +	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
  +	  # If ld does not provide *any* "supported emulations:"
  +	  # that means it is gnuoldld.
  +	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
  +	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
  +
  +	  case "${UNAME_MACHINE}" in
  +	  i?86)
  +	    VENDOR=pc;
  +	    ;;
  +	  *)
  +	    VENDOR=unknown;
  +	    ;;
  +	  esac
   	  # Determine whether the default compiler is a.out or elf
  -	  cat >dummy.c <<EOF
  -main(argc, argv)
  -int argc;
  -char *argv[];
  -{
  +	  cat >$dummy.c <<EOF
  +#include <features.h>
  +#ifdef __cplusplus
  +	int main (int argc, char *argv[]) {
  +#else
  +	int main (argc, argv) int argc; char *argv[]; {
  +#endif
   #ifdef __ELF__
  -  printf ("%s-pc-linux-gnu\n", argv[1]);
  +# ifdef __GLIBC__
  +#  if __GLIBC__ >= 2
  +    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
  +#  else
  +    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
  +#  endif
  +# else
  +   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
  +# endif
   #else
  -  printf ("%s-pc-linux-gnuaout\n", argv[1]);
  +  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
   #endif
     return 0;
   }
   EOF
  -	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" &&
rm dummy.c dummy && exit 0
  -	  rm -f dummy.c dummy
  +	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}"
&& rm $dummy.c $dummy && exit 0
  +	  rm -f $dummy.c $dummy
   	fi ;;
   # 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.
       i?86:DYNIX/ptx:4*:*)
   	echo i386-sequent-sysv4
   	exit 0 ;;
  +    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 0 ;;
       i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
   	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
   		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
  @@ -503,6 +798,14 @@
   		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
   	fi
   	exit 0 ;;
  +    i?86:*:5:7*)
  +	UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
  +	(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
  +	(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) && UNAME_MACHINE=i586
  +	(/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) && UNAME_MACHINE=i686
  +	(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) && UNAME_MACHINE=i585
  +	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
  +	exit 0 ;;
       i?86:*:3.2:*)
   	if test -f /usr/options/cb.name; then
   		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
  @@ -512,11 +815,20 @@
   		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
   		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
   			&& UNAME_MACHINE=i586
  +		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
  +			&& UNAME_MACHINE=i686
  +		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
  +			&& UNAME_MACHINE=i686
   		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
   	else
   		echo ${UNAME_MACHINE}-pc-sysv32
   	fi
   	exit 0 ;;
  +    pc:*:*:*)
  +        # 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 0 ;;
       Intel:Mach:3*:*)
   	echo i386-pc-mach3
   	exit 0 ;;
  @@ -553,7 +865,7 @@
       mc68030:UNIX_System_V:4.*:*)
   	echo m68k-atari-sysv4
   	exit 0 ;;
  -    i?86:LynxOS:2.*:*)
  +    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
   	echo i386-unknown-lynxos${UNAME_RELEASE}
   	exit 0 ;;
       TSUNAMI:LynxOS:2.*:*)
  @@ -565,6 +877,9 @@
       SM[BE]S:UNIX_SV:*:*)
   	echo mips-dde-sysv${UNAME_RELEASE}
   	exit 0 ;;
  +    RM*:ReliantUNIX-*:*:*)
  +	echo mips-sni-sysv4
  +	exit 0 ;;
       RM*:SINIX-*:*:*)
   	echo mips-sni-sysv4
   	exit 0 ;;
  @@ -576,9 +891,6 @@
   		echo ns32k-sni-sysv
   	fi
   	exit 0 ;;
  -    BS2000:POSIX-BC:*:*)	# EBCDIC based mainframe with POSIX subsystem
  -	echo bs2000-siemens-sysv4
  -	exit 0 ;;
       PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
                              # says <Richard.M.Bartel@ccMail.Census.GOV>
           echo i586-unisys-sysv4
  @@ -595,19 +907,43 @@
       mc68*:A/UX:*:*)
   	echo m68k-apple-aux${UNAME_RELEASE}
   	exit 0 ;;
  -    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
  +    news*:NEWS-OS:*:6*)
  +	echo mips-sony-newsos6
  +	exit 0 ;;
  +    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 ;;
  +    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
  +	echo powerpc-be-beos
  +	exit 0 ;;
  +    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
  +	echo powerpc-apple-beos
  +	exit 0 ;;
  +    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  +	echo i586-pc-beos
  +	exit 0 ;;
  +    SX-4:SUPER-UX:*:*)
  +	echo sx4-nec-superux${UNAME_RELEASE}
  +	exit 0 ;;
  +    SX-5:SUPER-UX:*:*)
  +	echo sx5-nec-superux${UNAME_RELEASE}
  +	exit 0 ;;
  +    Power*:Rhapsody:*:*)
  +	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  +	exit 0 ;;
  +    *:Rhapsody:*:*)
  +	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
  +	exit 0 ;;
   esac
   
   #echo '(No uname command or uname output not recognized.)' 1>&2
   #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
   
  -cat >dummy.c <<EOF
  +cat >$dummy.c <<EOF
   #ifdef _SEQUENT_
   # include <sys/types.h>
   # include <sys/utsname.h>
  @@ -645,7 +981,10 @@
   #endif
     int version;
     version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  -  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  +  if (version < 4)
  +    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  +  else
  +    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
     exit (0);
   #endif
   
  @@ -705,8 +1044,8 @@
   }
   EOF
   
  -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy
&& exit 0
  -rm -f dummy.c dummy
  +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c
$dummy && exit 0
  +rm -f $dummy.c $dummy
   
   # Apollos put the system type in the environment.
   
  
  
  
  1.2       +326 -49   apache-apr/apr/config.sub
  
  Index: config.sub
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/config.sub,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- config.sub	1999/07/14 15:31:40	1.1
  +++ config.sub	1999/07/15 12:46:38	1.2
  @@ -1,6 +1,6 @@
   #! /bin/sh
   # Configuration validation subroutine script, version 1.1.
  -#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
  +#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
   # 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.
  @@ -98,11 +98,21 @@
   		os=
   		basic_machine=$1
   		;;
  +	-sim | -cisco | -oki | -wec | -winbond)
  +		os=
  +		basic_machine=$1
  +		;;
  +	-scout)
  +		;;
  +	-wrs)
  +		os=vxworks
  +		basic_machine=$1
  +		;;
   	-hiux*)
   		os=-hiuxwe2
   		;;
   	-sco5)
  -		os=sco3.2v5
  +		os=-sco3.2v5
   		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   		;;
   	-sco4)
  @@ -121,6 +131,9 @@
   		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/'`
  @@ -149,19 +162,27 @@
   case $basic_machine in
   	# Recognize the basic CPU types without company name.
   	# Some are omitted here because they have special meanings below.
  -	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arm \
  -		| arme[lb] | pyramid | mn10300 \
  -		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
  -		| alpha | we32k | ns16k | clipper | i370 | sh \
  -		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
  -		| pdp11 | mips64el | mips64orion | mips64orionel \
  -		| sparc | sparclet | sparclite | sparc64)
  +	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
  +		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
  +		| 580 | i960 | h8300 \
  +		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
  +		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
  +		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
  +		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
  +		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
  +		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
  +		| mips64vr5000 | miprs64vr5000el | mcore \
  +		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
  +		| thumb | d10v)
   		basic_machine=$basic_machine-unknown
   		;;
  +	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65)
  +		;;
  +
   	# 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[3456]86)
  +	i[34567]86)
   	  basic_machine=$basic_machine-pc
   	  ;;
   	# Object if more than one company name word.
  @@ -170,23 +191,45 @@
   		exit 1
   		;;
   	# Recognize the basic CPU types with company name.
  -	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
  -	      | m88k-* | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
  -	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
  -	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
  -	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
  -	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
  -	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
  -	      | mips64el-* | mips64orion-* | mips64orionel-* | f301-*)
  +	# FIXME: clean up the formatting here.
  +	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
  +	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
  +	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
  +	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
  +	      | xmp-* | ymp-* \
  +	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
  +	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
  +	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
  +	      | clipper-* | orion-* \
  +	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
  +	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
  +	      | mips64el-* | mips64orion-* | mips64orionel-* \
  +	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
  +	      | mipstx39-* | mipstx39el-* | mcore-* \
  +	      | f301-* | armv*-* | t3e-* \
  +	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
  +	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* )
   		;;
   	# 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
  +		;;
  +	adobe68k)
  +		basic_machine=m68010-adobe
  +		os=-scout
  +		;;
   	alliant | fx80)
   		basic_machine=fx80-alliant
   		;;
  @@ -204,9 +247,9 @@
   	amiga | amiga-*)
   		basic_machine=m68k-cbm
   		;;
  -	amigados)
  +	amigaos | amigados)
   		basic_machine=m68k-cbm
  -		os=-amigados
  +		os=-amigaos
   		;;
   	amigaunix | amix)
   		basic_machine=m68k-cbm
  @@ -216,6 +259,10 @@
   		basic_machine=m68k-apollo
   		os=-sysv
   		;;
  +	apollo68bsd)
  +		basic_machine=m68k-apollo
  +		os=-bsd
  +		;;
   	aux)
   		basic_machine=m68k-apple
   		os=-aux
  @@ -292,6 +339,10 @@
   	encore | umax | mmax)
   		basic_machine=ns32k-encore
   		;;
  +	es1800 | OSE68k | ose68k | ose | OSE)
  +		basic_machine=m68k-ericsson
  +		os=-ose
  +		;;
   	fx2800)
   		basic_machine=i860-alliant
   		;;
  @@ -310,6 +361,14 @@
   		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
  @@ -325,42 +384,83 @@
   		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-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
  +	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
   		os=-mvs
   		;;
   # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
  -	i[3456]86v32)
  +	i[34567]86v32)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv32
   		;;
  -	i[3456]86v4*)
  +	i[34567]86v4*)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv4
   		;;
  -	i[3456]86v)
  +	i[34567]86v)
   		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   		os=-sysv
   		;;
  -	i[3456]86sol2)
  +	i[34567]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
  +		;;
  +	i386-go32 | go32)
  +		basic_machine=i386-unknown
  +		os=-go32
  +		;;
  +	i386-mingw32 | mingw32)
  +		basic_machine=i386-unknown
  +		os=-mingw32
  +		;;
   	iris | iris4d)
   		basic_machine=mips-sgi
   		case $os in
  @@ -389,13 +489,17 @@
   	miniframe)
   		basic_machine=m68000-convergent
   		;;
  +	*mint | *MiNT)
  +		basic_machine=m68k-atari
  +		os=-mint
  +		;;
   	mipsel*-linux*)
   		basic_machine=mipsel-unknown
  -		os=-linux
  +		os=-linux-gnu
   		;;
   	mips*-linux*)
   		basic_machine=mips-unknown
  -		os=-linux
  +		os=-linux-gnu
   		;;
   	mips3*-*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
  @@ -403,10 +507,26 @@
   	mips3*)
   		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
   		;;
  +	monitor)
  +		basic_machine=m68k-rom68k
  +		os=-coff
  +		;;
  +	msdos)
  +		basic_machine=i386-unknown
  +		os=-msdos
  +		;;
   	ncr3000)
   		basic_machine=i486-ncr
   		os=-sysv4
   		;;
  +	netbsd386)
  +		basic_machine=i386-unknown
  +		os=-netbsd
  +		;;
  +	netwinder)
  +		basic_machine=armv4l-corel
  +		os=-linux
  +		;;
   	news | news700 | news800 | news900)
   		basic_machine=m68k-sony
   		os=-newsos
  @@ -419,6 +539,10 @@
   		basic_machine=mips-sony
   		os=-newsos
   		;;
  +	necv70)
  +		basic_machine=v70-nec
  +		os=-sysv
  +		;;
   	next | m*-next )
   		basic_machine=m68k-next
   		case $os in
  @@ -444,9 +568,25 @@
   		basic_machine=i960-intel
   		os=-nindy
   		;;
  +	mon960)
  +		basic_machine=i960-intel
  +		os=-mon960
  +		;;
   	np1)
   		basic_machine=np1-gould
   		;;
  +	op50n-* | op60c-*)
  +		basic_machine=hppa1.1-oki
  +		os=-proelf
  +		;;
  +	OSE68000 | ose68000)
  +		basic_machine=m68000-ericsson
  +		os=-ose
  +		;;
  +	os68k)
  +		basic_machine=m68k-none
  +		os=-os68k
  +		;;
   	pa-hitachi)
   		basic_machine=hppa1.1-hitachi
   		os=-hiuxwe2
  @@ -464,25 +604,23 @@
           pc532 | pc532-*)
   		basic_machine=ns32k-pc532
   		;;
  -	pentium | p5)
  -		basic_machine=i586-intel
  +	pentium | p5 | k5 | k6 | nexen)
  +		basic_machine=i586-pc
   		;;
  -	pentiumpro | p6)
  -		basic_machine=i686-intel
  +	pentiumpro | p6 | 6x86)
  +		basic_machine=i686-pc
   		;;
  -	pentium-* | p5-*)
  +	pentiumii | pentium2)
  +		basic_machine=i786-pc
  +		;;
  +	pentium-* | p5-* | k5-* | k6-* | nexen-*)
   		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  -	pentiumpro-* | p6-*)
  +	pentiumpro-* | p6-* | 6x86-*)
   		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
  -	k5)
  -		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
  -		basic_machine=i586-amd
  -		;;
  -	nexen)
  -		# We don't have specific support for Nexgen yet, so just call it a Pentium
  -		basic_machine=i586-nexgen
  +	pentiumii-* | pentium2-*)
  +		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
   		;;
   	pn)
   		basic_machine=pn-gould
  @@ -502,12 +640,20 @@
   	ps2)
   		basic_machine=i386-ibm
   		;;
  +	rom68k)
  +		basic_machine=m68k-rom68k
  +		os=-coff
  +		;;
   	rm[46]00)
   		basic_machine=mips-siemens
   		;;
   	rtpc | rtpc-*)
   		basic_machine=romp-ibm
   		;;
  +	sa29200)
  +		basic_machine=a29k-amd
  +		os=-udi
  +		;;
   	sequent)
   		basic_machine=i386-sequent
   		;;
  @@ -515,6 +661,10 @@
   		basic_machine=sh-hitachi
   		os=-hms
   		;;
  +	sparclite-wrs)
  +		basic_machine=sparclite-wrs
  +		os=-vxworks
  +		;;
   	sps7)
   		basic_machine=m68k-bull
   		os=-sysv2
  @@ -522,6 +672,13 @@
   	spur)
   		basic_machine=spur-unknown
   		;;
  +	st2000)
  +		basic_machine=m68k-tandem
  +		;;
  +	stratus)
  +		basic_machine=i860-stratus
  +		os=-sysv4
  +		;;
   	sun2)
   		basic_machine=m68000-sun
   		;;
  @@ -566,6 +723,16 @@
   		basic_machine=i386-sequent
   		os=-dynix
   		;;
  +	t3e)
  +		basic_machine=t3e-cray
  +		os=-unicos
  +		;;
  +	tx39)
  +		basic_machine=mipstx39-unknown
  +		;;
  +	tx39el)
  +		basic_machine=mipstx39el-unknown
  +		;;
   	tower | tower-32)
   		basic_machine=m68k-ncr
   		;;
  @@ -577,6 +744,10 @@
   		basic_machine=a29k-nyu
   		os=-sym1
   		;;
  +	v810 | necv810)
  +		basic_machine=v810-nec
  +		os=-none
  +		;;
   	vaxv)
   		basic_machine=vax-dec
   		os=-sysv
  @@ -585,7 +756,7 @@
   		basic_machine=vax-dec
   		os=-vms
   		;;
  -       vpp*|vx|vx-*)
  +	vpp*|vx|vx-*)
                  basic_machine=f301-fujitsu
                  ;;
   	vxworks960)
  @@ -600,6 +771,14 @@
   		basic_machine=a29k-wrs
   		os=-vxworks
   		;;
  +	w65*)
  +		basic_machine=w65-wdc
  +		os=-none
  +		;;
  +	w89k-*)
  +		basic_machine=hppa1.1-winbond
  +		os=-proelf
  +		;;
   	xmp)
   		basic_machine=xmp-cray
   		os=-unicos
  @@ -607,6 +786,10 @@
           xps | xps100)
   		basic_machine=xps100-honeywell
   		;;
  +	z8k-*-coff)
  +		basic_machine=z8k-unknown
  +		os=-sim
  +		;;
   	none)
   		basic_machine=none-none
   		os=-none
  @@ -614,8 +797,17 @@
   
   # 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
  +		;;
   	mips)
  -		if [ x$os = x-linux ]; then
  +		if [ x$os = x-linux-gnu ]; then
   			basic_machine=mips-unknown
   		else
   			basic_machine=mips-mips
  @@ -636,7 +828,7 @@
   	we32k)
   		basic_machine=we32k-att
   		;;
  -	sparc)
  +	sparc | sparcv9)
   		basic_machine=sparc-sun
   		;;
           cydra)
  @@ -648,6 +840,16 @@
   	orion105)
   		basic_machine=clipper-highlevel
   		;;
  +	mac | mpw | mac-mpw)
  +		basic_machine=m68k-apple
  +		;;
  +	pmac | pmac-mpw)
  +		basic_machine=powerpc-apple
  +		;;
  +	c4x*)
  +		basic_machine=c4x-none
  +		os=-coff
  +		;;
   	*)
   		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
   		exit 1
  @@ -680,9 +882,12 @@
   	-solaris)
   		os=-solaris2
   		;;
  -	-unixware* | svr4*)
  +	-svr4*)
   		os=-sysv4
   		;;
  +	-unixware*)
  +		os=-sysv4.2uw
  +		;;
   	-gnu/linux*)
   		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
   		;;
  @@ -693,17 +898,26 @@
   	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
   	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
   	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
  -	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
  +	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
  +	      | -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* \
  +	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
   	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
   	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  -	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  -	      | -linux-gnu* | -uxpv*)
  +	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  +	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
  +	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
   	# Remember, each alternative MUST END IN *, to match a version number.
   		;;
  +	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
  +	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
  +	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
  +		;;
  +	-mac*)
  +		os=`echo $os | sed -e 's|mac|macos|'`
  +		;;
   	-linux*)
   		os=`echo $os | sed -e 's|linux|linux-gnu|'`
   		;;
  @@ -728,6 +942,9 @@
   	-acis*)
   		os=-aos
   		;;
  +	-386bsd)
  +		os=-bsd
  +		;;
   	-ctix* | -uts*)
   		os=-sysv
   		;;
  @@ -759,9 +976,18 @@
   	# This must come after -sysvr4.
   	-sysv*)
   		;;
  +	-ose*)
  +		os=-ose
  +		;;
  +	-es1800*)
  +		os=-ose
  +		;;
   	-xenix)
   		os=-xenix
   		;;
  +        -*mint | -*MiNT)
  +	        os=-mint
  +		;;
   	-none)
   		;;
   	*)
  @@ -787,6 +1013,9 @@
   	*-acorn)
   		os=-riscix1.2
   		;;
  +	arm*-corel)
  +		os=-linux
  +		;;
   	arm*-semi)
   		os=-aout
   		;;
  @@ -808,15 +1037,36 @@
   		# default.
   		# os=-sunos4
   		;;
  +	m68*-cisco)
  +		os=-aout
  +		;;
  +	mips*-cisco)
  +		os=-elf
  +		;;
  +	mips*-*)
  +		os=-elf
  +		;;
   	*-tti)	# must be before sparc entry or we get the wrong os.
   		os=-sysv3
   		;;
   	sparc-* | *-sun)
   		os=-sunos4.1.1
   		;;
  +	*-be)
  +		os=-beos
  +		;;
   	*-ibm)
   		os=-aix
   		;;
  +	*-wec)
  +		os=-proelf
  +		;;
  +	*-winbond)
  +		os=-proelf
  +		;;
  +	*-oki)
  +		os=-proelf
  +		;;
   	*-hp)
   		os=-hpux
   		;;
  @@ -827,7 +1077,7 @@
   		os=-sysv
   		;;
   	*-cbm)
  -		os=-amigados
  +		os=-amigaos
   		;;
   	*-dg)
   		os=-dgux
  @@ -880,6 +1130,18 @@
   	f301-fujitsu)
   		os=-uxpv
   		;;
  +	*-rom68k)
  +		os=-coff
  +		;;
  +	*-*bug)
  +		os=-coff
  +		;;
  +	*-apple)
  +		os=-macos
  +		;;
  +	*-atari*)
  +		os=-mint
  +		;;
   	*)
   		os=-none
   		;;
  @@ -901,9 +1163,15 @@
   			-aix*)
   				vendor=ibm
   				;;
  +			-beos*)
  +				vendor=be
  +				;;
   			-hpux*)
   				vendor=hp
   				;;
  +			-mpeix*)
  +				vendor=hp
  +				;;
   			-hiux*)
   				vendor=hitachi
   				;;
  @@ -930,6 +1198,15 @@
   				;;
   			-aux*)
   				vendor=apple
  +				;;
  +			-hms*)
  +				vendor=hitachi
  +				;;
  +			-mpw* | -macos*)
  +				vendor=apple
  +				;;
  +			-*mint | -*MiNT)
  +				vendor=atari
   				;;
   		esac
   		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
  
  
  
  1.29      +7 -1      apache-apr/apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apache-apr/apr/configure.in,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- configure.in	1999/07/14 15:31:40	1.28
  +++ configure.in	1999/07/15 12:46:39	1.29
  @@ -23,6 +23,13 @@
   AC_CHECK_PROG(RM, rm, rm)
   AC_CHECK_PROG(AR, ar, ar)
   
  +dnl # this is the place to put specific options for platform/compiler
  +dnl # combinations
  +case "$PLATFORM:$CC" in
  +    *-hp-hpux*:cc ) CFAGS="$CFLAGS -Ae +DAportable" ;;
  +esac
  +
  +
   # This macro needs to be here in case we are on an AIX box.
   AC_AIX
   
  @@ -217,7 +224,6 @@
   AC_SUBST(OSDIR)
   AC_SUBST(LIBPREFIX)
   AC_SUBST(EXEEXT)
  -AC_SUBST(SET_MAKE)
   AC_OUTPUT(Makefile lib/Makefile file_io/$OSDIR/Makefile 
             network_io/$OSDIR/Makefile threadproc/$OSDIR/Makefile 
             locks/$OSDIR/Makefile misc/$OSDIR/Makefile 
  
  
  

Mime
View raw message