2000-11-23 Ben Elliston <bje@redhat.com>

Patches from Akim Demaille <akim@epita.fr>.
	* config.sub (version): Rename from this ..
	(timestamp): .. to this.
	(usage): Replace --version with --time-stamp. Add additional help
	and copyleft notice.
	(time-stamp-start): Replace with "timestamp=".
	* config.guess (version): Rename from this ..
	(timestamp): .. to this.
	(usage): Replace --version with --time-stamp. Add additional help
	and copyleft notice.
	(CC_FOR_BUILD): Rework this logic.
	(time-stamp-start): Replace with "timestamp=".
This commit is contained in:
Ben Elliston 2000-11-23 08:47:27 +00:00
parent 10a24621d6
commit 045c3cc312
3 changed files with 65 additions and 46 deletions

View File

@ -1,3 +1,18 @@
2000-11-23 Ben Elliston <bje@redhat.com>
Patches from Akim Demaille <akim@epita.fr>.
* config.sub (version): Rename from this ..
(timestamp): .. to this.
(usage): Replace --version with --time-stamp. Add additional help
and copyleft notice.
(time-stamp-start): Replace with "timestamp=".
* config.guess (version): Rename from this ..
(timestamp): .. to this.
(usage): Replace --version with --time-stamp. Add additional help
and copyleft notice.
(CC_FOR_BUILD): Rework this logic.
(time-stamp-start): Replace with "timestamp=".
2000-11-21 Ben Elliston <bje@redhat.com> 2000-11-21 Ben Elliston <bje@redhat.com>
* config.guess: Detect EMX on OS/2. Reported by Ilya Zakharevich * config.guess: Detect EMX on OS/2. Reported by Ilya Zakharevich

71
config.guess vendored
View File

@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
version='2000-11-21' timestamp='2000-11-23'
# This file is free software; you can redistribute it and/or modify it # 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 # under the terms of the GNU General Public License as published by
@ -32,7 +32,7 @@ version='2000-11-21'
# exits with 0. Otherwise, it exits with 1. # exits with 0. Otherwise, it exits with 1.
# #
# The plan is that this can be called by configure scripts if you # The plan is that this can be called by configure scripts if you
# don't specify an explicit system type (host/target name). # don't specify an explicit build system type.
# #
# Only a few systems have been added to this list; please add others # Only a few systems have been added to this list; please add others
# (but try to keep the structure clean). # (but try to keep the structure clean).
@ -43,20 +43,26 @@ me=`echo "$0" | sed -e 's,.*/,,'`
usage="\ usage="\
Usage: $0 [OPTION] Usage: $0 [OPTION]
Output the configuration name of this system. Output the configuration name of the system \`$me' is run on.
Operation modes: Operation modes:
-h, --help print this help, then exit -h, --help print this help, then exit
-V, --version print version number, then exit" -t, --time-stamp print date of last modification, then exit
Report bugs and patches to <config-patches@gnu.org>.
Written by Per Bothner.
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
Free Software Foundation, Inc. See the source for copying conditions."
help=" help="
Try \`$me --help' for more information." Try \`$me --help' for more information."
# Parse command line # Parse command line
while test $# -gt 0 ; do while test $# -gt 0 ; do
case "$1" in case $1 in
--version | --vers* | -V ) --time-stamp | --time* | -t)
echo "$version" ; exit 0 ;; echo "$timestamp" ; exit 0 ;;
--help | --h* | -h ) --help | --h* | -h )
echo "$usage"; exit 0 ;; echo "$usage"; exit 0 ;;
-- ) # Stop option processing -- ) # Stop option processing
@ -64,9 +70,7 @@ while test $# -gt 0 ; do
- ) # Use stdin as input. - ) # Use stdin as input.
break ;; break ;;
-* ) -* )
exec >&2 echo "$me: invalid option $1$help" >&2
echo "$me: invalid option $1"
echo "$help"
exit 1 ;; exit 1 ;;
* ) * )
break ;; break ;;
@ -82,29 +86,26 @@ fi
dummy=dummy-$$ dummy=dummy-$$
trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
# Use $HOST_CC if defined. $CC may point to a cross-compiler # CC_FOR_BUILD -- compiler used by this script.
if test x"$CC_FOR_BUILD" = x; then # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
if test x"$HOST_CC" != x; then # use `HOST_CC' if defined, but it is deprecated.
CC_FOR_BUILD="$HOST_CC"
else
if test x"$CC" != x; then
CC_FOR_BUILD="$CC"
else
echo 'int dummy(){}' >$dummy.c
for c in cc c89 gcc; do
($c $dummy.c -c) >/dev/null 2>&1
if test $? = 0; then
CC_FOR_BUILD="$c"; break
fi
done
rm -f $dummy.c $dummy.o
if test x"$CC_FOR_BUILD" = x; then
CC_FOR_BUILD=no_compiler_found
fi
fi
fi
fi
case $CC_FOR_BUILD,$HOST_CC,$CC in
,,) echo "int dummy(){}" > $dummy.c
for c in cc gcc c89 ; do
($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
if test $? = 0 ; then
CC_FOR_BUILD="$c"; break
fi
done
rm -f $dummy.c $dummy.o
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
# This is needed to find uname on a Pyramid OSx when run in the BSD universe. # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi@noc.rutgers.edu 8/24/94.) # (ghazi@noc.rutgers.edu 8/24/94.)
@ -114,7 +115,7 @@ fi
UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
# Note: order is significant - the case branches are not exclusive. # Note: order is significant - the case branches are not exclusive.
@ -1341,7 +1342,7 @@ exit 1
# Local variables: # Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "version='" # time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d" # time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'" # time-stamp-end: "'"
# End: # End:

25
config.sub vendored
View File

@ -1,9 +1,9 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script, version 1.1. # Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
# Free Software Foundation, Inc. # Free Software Foundation, Inc.
version='2000-11-15' timestamp='2000-11-23'
# This file is (in principle) common to ALL GNU software. # This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software # The presence of a machine in this file suggests that SOME GNU software
@ -60,17 +60,22 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS
Canonicalize a configuration name. Canonicalize a configuration name.
Operation modes: Operation modes:
-h, --help print this help, then exit -h, --help print this help, then exit
-V, --version print version number, then exit" -t, --time-stamp print date of last modification, then exit
Report bugs and patches to <config-patches@gnu.org>.
Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
Free Software Foundation, Inc. See the source for copying conditions."
help=" help="
Try \`$me --help' for more information." Try \`$me --help' for more information."
# Parse command line # Parse command line
while test $# -gt 0 ; do while test $# -gt 0 ; do
case "$1" in case $1 in
--version | --vers* | -V ) --time-stamp | --time* | -t )
echo "$version" ; exit 0 ;; echo "$timestamp" ; exit 0 ;;
--help | --h* | -h ) --help | --h* | -h )
echo "$usage"; exit 0 ;; echo "$usage"; exit 0 ;;
-- ) # Stop option processing -- ) # Stop option processing
@ -78,9 +83,7 @@ while test $# -gt 0 ; do
- ) # Use stdin as input. - ) # Use stdin as input.
break ;; break ;;
-* ) -* )
exec >&2 echo "$me: invalid option $1$help"
echo "$me: invalid option $1"
echo "$help"
exit 1 ;; exit 1 ;;
*local*) *local*)
@ -1326,7 +1329,7 @@ exit 0
# Local variables: # Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp) # eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "version='" # time-stamp-start: "timestamp='"
# time-stamp-format: "%:y-%02m-%02d" # time-stamp-format: "%:y-%02m-%02d"
# time-stamp-end: "'" # time-stamp-end: "'"
# End: # End: