Index: ChangeLog from Akim Demaille Provide man pages for config.guess and config.sub. Explain what CC_FOR_BUILD is. * config.guess (version): Rename timestamp. (version): New variable. (--time-stamp): New option. (help): Enrich. Fix its use. (CC_FOR_BUILD): Use `case/esac' to handle its default. Minor indenting changes. * config.sub: Likewise. * man/config.guess.x: New file. * man/config.sub.x: New file. * man/Makefile.am: Adjust. Index: config.guess --- config.guess Fri, 14 Jul 2000 09:13:16 +0200 akim (ace/9_config.gue 1.6 644) +++ config.guess Sat, 22 Jul 2000 19:09:46 +0200 akim (ace/9_config.gue 1.6 644) @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -version='2000-06-13' +timestamp='2000-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 @@ -32,7 +32,7 @@ # 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 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 # (but try to keep the structure clean). @@ -43,11 +43,42 @@ usage="\ Usage: $0 [OPTION] -Output the configuration name of this system. +Output the configuration name of the system \`$me' is run on. Operation modes: - -h, --help print this help, then exit - -V, --version print version number, then exit" + -h, --help print this help, then exit + -V, --version print version number, then exit + -t, --time-stamp print time stamp, then exit + + +Environment variables: + CC_FOR_BUILD a native C compiler, defaults to \`cc' + CC a native C compiler, the previous variable is preferred + +The GNU build system distinguishes three types of machines, the +\`build' machine on which the compilers are run, the \`host' machine +on which the package being built will run, and, exclusively when you +build a compiler, assembler etc., the \`target' machine, for which the +compiler being built will produce code. + +This script will guess the type of the \`build' machine. + +Since it might need to compile and run C code, it needs a compiler for +the \`build' machine: use the environment variable \`CC_FOR_BUILD' to +specify the compiler for the build machine. If \`CC_FOR_BUILD' is not +specified, \`CC' will be used. Be sure to specify \`CC_FOR_BUILD' is +\`CC' is a cross-compiler to the \`host' machine. + +Report bugs and patches to ." + +version="\ +config.guess (GNU Config) $timestamp +Written by Per Bothner. + +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, +Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." @@ -57,6 +88,8 @@ case "$1" in --version | --vers* | -V ) echo "$version" ; exit 0 ;; + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; -- ) # Stop option processing @@ -64,9 +97,7 @@ - ) # Use stdin as input. break ;; -* ) - exec >&2 - echo "$me: invalid option $1" - echo "$help" + echo "$me: invalid option $1$help" >&2 exit 1 ;; * ) break ;; @@ -78,18 +109,14 @@ exit 1 fi -# 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 +# CC_FOR_BUILD -- compiler used by this script. +# Historrorically `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) CC_FOR_BUILD=cc;; + ,,*) 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. @@ -100,7 +127,7 @@ 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_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown dummy=dummy-$$ @@ -1267,7 +1294,7 @@ # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "version='" +# time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: Index: config.sub --- config.sub Fri, 14 Jul 2000 09:13:16 +0200 akim (ace/8_config.sub 1.5 644) +++ config.sub Sat, 22 Jul 2000 19:04:35 +0200 akim (ace/8_config.sub 1.5 644) @@ -1,9 +1,9 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. +# Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 # Free Software Foundation, Inc. -version='2000-07-06' +timestamp='2000-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 @@ -60,8 +60,19 @@ Canonicalize a configuration name. Operation modes: - -h, --help print this help, then exit - -V, --version print version number, then exit" + -h, --help print this help, then exit + -V, --version print version number, then exit + -t, --time-stamp print time stamp, then exit + +Report bugs and patches to ." + +version="\ +config.sub (GNU Config) $timestamp + +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, +Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." @@ -71,6 +82,8 @@ case "$1" in --version | --vers* | -V ) echo "$version" ; exit 0 ;; + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit 0 ;; --help | --h* | -h ) echo "$usage"; exit 0 ;; -- ) # Stop option processing @@ -78,9 +91,7 @@ - ) # Use stdin as input. break ;; -* ) - exec >&2 - echo "$me: invalid option $1" - echo "$help" + echo "$me: invalid option $1$help" exit 1 ;; *local*) @@ -1318,7 +1329,7 @@ # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "version='" +# time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: Index: man/Makefile.am --- man/Makefile.am Sat, 22 Jan 2000 23:54:10 +0100 akim (ace/b/3_Makefile.a 1.2 664) +++ man/Makefile.am Sat, 22 Jul 2000 18:47:12 +0200 akim (ace/b/3_Makefile.a 1.2 664) @@ -1,21 +1,25 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- man_MANS = autoconf.1 autoreconf.1 autoheader.1 autoupdate.1 ifnames.1 \ -autoscan.1 +autoscan.1 config.guess.1 config.sub.1 man_aux = autoconf.x autoreconf.x autoheader.x autoupdate.x ifnames.x \ -autoscan.x +autoscan.x config.guess.x config.sub.x EXTRA_DIST = $(man_MANS) $(man_aux) common.x MAINTAINERCLEANFILES = $(man_MANS) # Depend on configure.in to get version number changes. -$(man_MANS): $(top_srcdir)/configure.in $(srcdir)/common.x -autoconf.1: $(srcdir)/autoconf.x $(top_srcdir)/autoconf.sh -autoreconf.1: $(srcdir)/autoreconf.x $(top_srcdir)/autoreconf.sh -autoheader.1: $(srcdir)/autoheader.x $(top_srcdir)/autoheader.sh -autoupdate.1: $(srcdir)/autoupdate.x $(top_srcdir)/autoupdate.sh -ifnames.1: $(srcdir)/ifnames.x $(top_srcdir)/ifnames.sh -autoscan.1: $(srcdir)/autoscan.x $(top_srcdir)/autoscan.pl +common_dep = $(top_srcdir)/configure.in $(srcdir)/common.x +autoconf.1: $(common_dep) $(srcdir)/autoconf.x $(top_srcdir)/autoconf.sh +autoreconf.1: $(common_dep) $(srcdir)/autoreconf.x $(top_srcdir)/autoreconf.sh +autoheader.1: $(common_dep) $(srcdir)/autoheader.x $(top_srcdir)/autoheader.sh +autoupdate.1: $(common_dep) $(srcdir)/autoupdate.x $(top_srcdir)/autoupdate.sh +ifnames.1: $(common_dep) $(srcdir)/ifnames.x $(top_srcdir)/ifnames.sh +autoscan.1: $(common_dep) $(srcdir)/autoscan.x $(top_srcdir)/autoscan.pl + +# Independent from this package. +config.guess.1: $(srcdir)/config.guess.x $(top_srcdir)/config.guess +config.sub.1: $(srcdir)/config.sub.x $(top_srcdir)/config.sub SUFFIXES = .x .1 Index: man/common.x --- man/common.x Sat, 30 Oct 1999 00:32:38 +0200 akim (ace/b/10_common.x 1.1 664) +++ man/common.x Sat, 22 Jul 2000 18:54:45 +0200 akim (ace/b/10_common.x 1.1 664) @@ -1,7 +1,10 @@ [see also] .BR autoconf (1), +.BR automake (1), .BR autoreconf (1), .BR autoupdate (1), .BR autoheader (1), .BR autoscan (1), +.BR config.guess (1), +.BR config.sub (1), .BR ifnames (1). Index: man/config.guess.x --- man/config.guess.x Sat, 22 Jul 2000 19:15:35 +0200 akim () +++ man/config.guess.x Sat, 22 Jul 2000 19:15:23 +0200 akim (ace/b/35_config.gue 644) @@ -0,0 +1,3 @@ +[name] +config.guess \- guess the build system triplet + Index: man/config.sub.x --- man/config.sub.x Sat, 22 Jul 2000 19:15:35 +0200 akim () +++ man/config.sub.x Sat, 22 Jul 2000 18:54:45 +0200 akim (ace/b/36_config.sub 644) @@ -0,0 +1,3 @@ +[name] +config.sub \- validate and canonicalize a configuration triplet +