From 418e7f89f3a87621bea9c40ee61f9aaceebef7b9 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 6 Aug 2008 08:22:14 -0600 Subject: [PATCH] Update some files from upstream. * GNUmakefile: Update. * build-aux/announce-gen: Likewise. * build-aux/config.guess: Likewise. * build-aux/config.sub: Likewise. * build-aux/git-version-gen: Likewise. * build-aux/texinfo.tex: Likewise. * build-aux/vc-list-files: Likewise. * doc/make-stds.texi: Likewise. * doc/standards.texi: Likewise. Signed-off-by: Eric Blake --- ChangeLog | 13 ++++++ GNUmakefile | 26 ++++++----- build-aux/announce-gen | 4 +- build-aux/config.guess | 5 +- build-aux/config.sub | 15 +++++- build-aux/git-version-gen | 5 +- build-aux/texinfo.tex | 24 +++++++--- build-aux/vc-list-files | 11 +++-- doc/make-stds.texi | 2 + doc/standards.texi | 96 ++++++++++++++++++++++----------------- 10 files changed, 128 insertions(+), 73 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71abf0f7a..155637b53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-08-06 Eric Blake + + Update some files from upstream. + * GNUmakefile: Update. + * build-aux/announce-gen: Likewise. + * build-aux/config.guess: Likewise. + * build-aux/config.sub: Likewise. + * build-aux/git-version-gen: Likewise. + * build-aux/texinfo.tex: Likewise. + * build-aux/vc-list-files: Likewise. + * doc/make-stds.texi: Likewise. + * doc/standards.texi: Likewise. + 2008-08-04 Ralf Wildenhues Fix AC_CONFIG_FILES([$var]) 2.62 regression. diff --git a/GNUmakefile b/GNUmakefile index ea5e72c44..7635e8dc5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -62,19 +62,21 @@ ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) ifneq ($(_curr-ver),$(VERSION)) ifeq ($(_curr-ver),UNKNOWN) $(info WARNING: unable to verify if $(VERSION) is correct version) - else ifneq (,$(_is-install-target)) - # GNU Coding Standards state that 'make install' should not cause - # recompilation after 'make all'. But as long as changing the version - # string alters config.h, the cost of having 'make all' always have an - # up-to-date version is prohibitive. So, as a compromise, we merely - # warn when installing a version string that is out of date; the user - # should run 'autoreconf' (or something like 'make distcheck') to - # fix the version, 'make all' to propagate it, then 'make install'. - $(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it) else - $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \ - && $(_autoreconf)) + ifneq (,$(_is-install-target)) + # GNU Coding Standards state that 'make install' should not cause + # recompilation after 'make all'. But as long as changing the version + # string alters config.h, the cost of having 'make all' always have an + # up-to-date version is prohibitive. So, as a compromise, we merely + # warn when installing a version string that is out of date; the user + # should run 'autoreconf' (or something like 'make distcheck') to + # fix the version, 'make all' to propagate it, then 'make install'. + $(info WARNING: version string $(VERSION) is out of date; run autoreconf -f to fix it) + else + $(info INFO: running autoreconf for new version string: $(_curr-ver)) + _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache .version \ + && $(_autoreconf)) + endif endif endif endif diff --git a/build-aux/announce-gen b/build-aux/announce-gen index c642ef8e1..385ce8c3c 100755 --- a/build-aux/announce-gen +++ b/build-aux/announce-gen @@ -1,7 +1,7 @@ #!/usr/bin/perl -w # Generate a release announcement message. -my $VERSION = '2008-02-08 10:34'; # UTC +my $VERSION = '2008-06-02 08:18'; # UTC # The definition above must lie within the first 8 lines in order # for the Emacs time-stamp write hook (at end) to update it. # If you change this file with Emacs, please let the write hook @@ -474,7 +474,7 @@ Then, run a command like this: If that command fails because you don't have the required public key, then run this command to import it: - gpg --keyserver wwwkeys.pgp.net --recv-keys $gpg_key_id + gpg --keyserver keys.gnupg.net --recv-keys $gpg_key_id and rerun the \`gpg --verify' command. EOF diff --git a/build-aux/config.guess b/build-aux/config.guess index 6603908c2..c7607c74f 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-03-12' +timestamp='2008-04-14' # 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 @@ -985,9 +985,6 @@ EOF a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" exit ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. diff --git a/build-aux/config.sub b/build-aux/config.sub index 087f29bc5..a649350a6 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 # Free Software Foundation, Inc. -timestamp='2008-03-26' +timestamp='2008-06-16' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -463,6 +463,10 @@ case $basic_machine in basic_machine=c90-cray os=-unicos ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; convex-c1) basic_machine=c1-convex os=-bsd @@ -530,6 +534,10 @@ case $basic_machine in basic_machine=m88k-motorola os=-sysv3 ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; djgpp) basic_machine=i586-pc os=-msdosdjgpp @@ -1252,7 +1260,7 @@ case $os in | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ + | -chorusos* | -chorusrdb* | -cegcc* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1392,6 +1400,9 @@ case $os in -zvmoe) os=-zvmoe ;; + -dicos*) + os=-dicos + ;; -none) ;; *) diff --git a/build-aux/git-version-gen b/build-aux/git-version-gen index 7aa025365..710870cdb 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -1,6 +1,6 @@ #!/bin/sh # Print a version string. -scriptversion=2008-04-03.22 +scriptversion=2008-04-08.07 # Copyright (C) 2007-2008 Free Software Foundation # @@ -95,7 +95,8 @@ if test -n "$v" then : # use $v elif test -d .git \ - && v=`git describe --abbrev=4 HEAD 2>/dev/null` \ + && v=`git describe --abbrev=4 --match='v*' HEAD 2>/dev/null \ + || git describe --abbrev=4 HEAD 2>/dev/null` \ && case $v in v[0-9]*) ;; *) (exit 1) ;; diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 175c320de..bac072602 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2008-03-31.10} +\def\texinfoversion{2008-04-18.10} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -650,8 +650,8 @@ \def\jmacro{j} \def\dotless#1{% \def\temp{#1}% - \ifx\temp\imacro \ptexi - \else\ifx\temp\jmacro \j + \ifx\temp\imacro \ifmmode\imath \else\ptexi \fi + \else\ifx\temp\jmacro \ifmmode\jmath \else\j \fi \else \errmessage{@dotless can be used only with i or j}% \fi\fi } @@ -924,7 +924,7 @@ where each line of input produces a line of output.} \pushthisfilestack \def\thisfile{#1}% {% - \makevalueexpandable % we want to expand any @value in FILE. + \makevalueexpandable % we want to expand any @value in FILE. \turnoffactive % and allow special characters in the expansion \edef\temp{\noexpand\input #1 }% % @@ -1119,6 +1119,16 @@ where each line of input produces a line of output.} \mathunderscore \let\\ = \mathbackslash \mathactive + % make the texinfo accent commands work in math mode + \let\"=\ddot + \let\'=\acute + \let\==\bar + \let\^=\hat + \let\`=\grave + \let\u=\breve + \let\v=\check + \let\~=\tilde + \let\dotaccent=\dot $\finishmath } \def\finishmath#1{#1$\endgroup} % Close the group opened by \tex. @@ -1140,9 +1150,11 @@ where each line of input produces a line of output.} } } -% @bullet and @minus need the same treatment as @math, just above. +% Some math mode symbols. \def\bullet{$\ptexbullet$} -\def\minus{$-$} +\def\geq{\ifmmode \ge\else $\ge$\fi} +\def\leq{\ifmmode \le\else $\le$\fi} +\def\minus{\ifmmode -\else $-$\fi} % @dots{} outputs an ellipsis using the current font. % We do .5em per period so that it has the same spacing in the cm diff --git a/build-aux/vc-list-files b/build-aux/vc-list-files index 762d7eeb3..419ab2aca 100755 --- a/build-aux/vc-list-files +++ b/build-aux/vc-list-files @@ -2,7 +2,7 @@ # List version-controlled file names. # Print a version string. -scriptversion=2008-04-03.17 +scriptversion=2008-07-11.19 # Copyright (C) 2006-2008 Free Software Foundation, Inc. @@ -75,7 +75,11 @@ if test -d .git; then eval exec git ls-files '"$dir"' $postprocess elif test -d .hg; then eval exec hg locate '"$dir/*"' $postprocess +elif test -d .bzr; then + test "$postprocess" = '' && postprocess="| sed 's|^\./||'" + eval exec bzr ls --versioned '"$dir"' $postprocess elif test -d CVS; then + test "$postprocess" = '' && postprocess="| sed 's|^\./||'" if test -x build-aux/cvsu; then eval build-aux/cvsu --find --types=AFGM '"$dir"' $postprocess elif (cvsu --help) >/dev/null 2>&1; then @@ -84,10 +88,11 @@ elif test -d CVS; then eval awk -F/ \''{ \ if (!$1 && $3 !~ /^-/) { \ f=FILENAME; \ - sub(/CVS\/Entries/, "", f); \ + if (f ~ /CVS\/Entries$/) \ + f = substr(f, 0, length(f)-11); \ print f $2; \ }}'\'' \ - $(find ${*-*} -name Entries -print) /dev/null' $postprocess + `find "$dir" -name Entries -print` /dev/null' $postprocess fi else echo "$0: Failed to determine type of version control used in `pwd`" 1>&2 diff --git a/doc/make-stds.texi b/doc/make-stds.texi index 041a08515..bd4df50d8 100644 --- a/doc/make-stds.texi +++ b/doc/make-stds.texi @@ -968,6 +968,8 @@ then @code{tar} that subdirectory. Compress the tar file with @code{gzip}. For example, the actual distribution file for GCC version 1.40 is called @file{gcc-1.40.tar.gz}. +It is ok to support other free compression formats as well, such as +@code{bzip2} and @code{lzma}. The @code{dist} target should explicitly depend on all non-source files that are in the distribution, to make sure they are up to date in the diff --git a/doc/standards.texi b/doc/standards.texi index 4cb5ed3a6..75205914e 100644 --- a/doc/standards.texi +++ b/doc/standards.texi @@ -3,7 +3,7 @@ @setfilename standards.info @settitle GNU Coding Standards @c This date is automagically updated when you save this file: -@set lastupdate February 23, 2008 +@set lastupdate July 25, 2008 @c %**end of header @dircategory GNU organization @@ -305,13 +305,17 @@ for a language that is higher level than C. Often much of the program is written in that language, too. The Emacs editor pioneered this technique. -@cindex GUILE -The standard extensibility interpreter for GNU software is GUILE +@cindex Guile +@cindex GNOME and Guile +The standard extensibility interpreter for GNU software is Guile (@uref{http://www.gnu.org/@/software/@/guile/}), which implements the -language Scheme (an especially clean and simple dialect of Lisp). We -don't reject programs written in other ``scripting languages'' such as -Perl and Python, but using GUILE is very important for the overall -consistency of the GNU system. +language Scheme (an especially clean and simple dialect of Lisp). +Guile also includes bindings for GTK+/GNOME, making it practical to +write modern GUI functionality within Guile. We don't reject programs +written in other ``scripting languages'' such as Perl and Python, but +using Guile is very important for the overall consistency of the GNU +system. + @node Compatibility @section Compatibility with Other Implementations @@ -1022,6 +1026,7 @@ GNU Lesser General Public License, @url{http://www.gnu.org/@/licenses/@/lgpl.htm GNU GPL with the exception for Guile; for example, GPLv3+/Guile means the GNU GPL version 3 or later, with the extra exception for Guile. +@item GPL/Ada GNU GPL with the exception for Ada. @item Apache @@ -1140,10 +1145,10 @@ and @code{unexpand}. @samp{-v} in @code{gawk}. @item assume-new -@samp{-W} in Make. +@samp{-W} in @code{make}. @item assume-old -@samp{-o} in Make. +@samp{-o} in @code{make}. @item auto-check @samp{-a} in @code{recode}. @@ -1265,7 +1270,7 @@ Used in @code{tar} and @code{cpio}. @samp{-d} in @code{touch}. @item debug -@samp{-d} in Make and @code{m4}; +@samp{-d} in @code{make} and @code{m4}; @samp{-t} in Bison. @item define @@ -1312,7 +1317,7 @@ specially. @samp{-X} in @code{strip}. @item dry-run -@samp{-n} in Make. +@samp{-n} in @code{make}. @item ed @samp{-e} in @code{diff}. @@ -1330,7 +1335,7 @@ specially. @samp{-N} in @code{diff}. @item environment-overrides -@samp{-e} in Make. +@samp{-e} in @code{make}. @item eof @samp{-e} in @code{xargs}. @@ -1382,9 +1387,8 @@ Used in GDB. @samp{-E} in @code{m4}. @item file -@samp{-f} in @code{info}, @code{gawk}, Make, @code{mt}, and @code{tar}; -@samp{-n} in @code{sed}; -@samp{-r} in @code{touch}. +@samp{-f} in @code{gawk}, @code{info}, @code{make}, @code{mt}, +@code{sed}, and @code{tar}. @item field-separator @samp{-F} in @code{gawk}. @@ -1496,7 +1500,7 @@ In @code{makeinfo}, output HTML. @samp{-i} in @code{diff} and @code{wdiff}. @item ignore-errors -@samp{-i} in Make. +@samp{-i} in @code{make}. @item ignore-file @samp{-i} in @code{ptx}. @@ -1524,7 +1528,7 @@ In @code{makeinfo}, output HTML. @samp{-I} in @code{m4}. @item include-dir -@samp{-I} in Make. +@samp{-I} in @code{make}. @item incremental @samp{-G} in @code{tar}. @@ -1558,13 +1562,13 @@ init file. Used in @code{date} @item jobs -@samp{-j} in Make. +@samp{-j} in @code{make}. @item just-print -@samp{-n} in Make. +@samp{-n} in @code{make}. @item keep-going -@samp{-k} in Make. +@samp{-k} in @code{make}. @item keep-files @samp{-k} in @code{csplit}. @@ -1605,7 +1609,7 @@ Used in @code{gawk}. @samp{-N} in @code{ls}. @item load-average -@samp{-l} in Make. +@samp{-l} in @code{make}. @item login Used in @code{su}. @@ -1623,7 +1627,7 @@ Used in @code{uname}. @samp{-d} in @code{cpio}. @item makefile -@samp{-f} in Make. +@samp{-f} in @code{make}. @item mapped Used in GDB. @@ -1638,7 +1642,7 @@ Used in GDB. @samp{-l} in @code{xargs}. @item max-load -@samp{-l} in Make. +@samp{-l} in @code{make}. @item max-procs @samp{-P} in @code{xargs}. @@ -1674,10 +1678,10 @@ Used in GDB. @samp{-a} in @code{shar}. @item new-file -@samp{-W} in Make. +@samp{-W} in @code{make}. @item no-builtin-rules -@samp{-r} in Make. +@samp{-r} in @code{make}. @item no-character-count @samp{-w} in @code{shar}. @@ -1704,7 +1708,7 @@ Used in GDB. @samp{-2} in @code{wdiff}. @item no-keep-going -@samp{-S} in Make. +@samp{-S} in @code{make}. @item no-lines @samp{-l} in Bison. @@ -1779,7 +1783,7 @@ Used in GDB. @samp{-o} in @code{tar}. @item old-file -@samp{-o} in Make. +@samp{-o} in @code{make}. @item one-file-system @samp{-l} in @code{tar}, @code{cp}, and @code{du}. @@ -1864,10 +1868,10 @@ Used in @code{tar} and @code{cp}. @samp{-L} in @code{cmp}. @item print-data-base -@samp{-p} in Make. +@samp{-p} in @code{make}. @item print-directory -@samp{-w} in Make. +@samp{-w} in @code{make}. @item print-file-name @samp{-o} in @code{nm}. @@ -1888,7 +1892,7 @@ Specify an HTTP proxy. @samp{-X} in @code{shar}. @item question -@samp{-q} in Make. +@samp{-q} in @code{make}. @item quiet Used in many programs to inhibit the usual output. Every @@ -1914,7 +1918,7 @@ Used in @code{gawk}. Used in GDB. @item recon -@samp{-n} in Make. +@samp{-n} in @code{make}. @item record-number @samp{-R} in @code{tar}. @@ -1923,8 +1927,8 @@ Used in GDB. Used in @code{chgrp}, @code{chown}, @code{cp}, @code{ls}, @code{diff}, and @code{rm}. -@item reference-limit -Used in @code{makeinfo}. +@item reference +@samp{-r} in @code{touch}. @item references @samp{-r} in @code{ptx}. @@ -2056,7 +2060,7 @@ a directory to start processing with. @samp{-S} in @code{shar}. @item stop -@samp{-S} in Make. +@samp{-S} in @code{make}. @item strict @samp{-s} in @code{recode}. @@ -2126,7 +2130,7 @@ Specify how long to wait before giving up on some operation. @samp{-c} in @code{du}. @item touch -@samp{-t} in Make, @code{ranlib}, and @code{recode}. +@samp{-t} in @code{make}, @code{ranlib}, and @code{recode}. @item trace @samp{-t} in @code{m4}. @@ -2191,7 +2195,7 @@ Print the version number. @samp{-V} in @code{tar}. @item what-if -@samp{-W} in Make. +@samp{-W} in @code{make}. @item whole-size-limit @samp{-l} in @code{shar}. @@ -3770,15 +3774,23 @@ all GNU software. Each GNU distribution should come with a shell script named @code{configure}. This script is given arguments which describe the kind of machine and system you want to compile the program for. - The @code{configure} script must record the configuration options so that they affect compilation. -One way to do this is to make a link from a standard name such as -@file{config.h} to the proper configuration file for the chosen system. -If you use this technique, the distribution should @emph{not} contain a -file named @file{config.h}. This is so that people won't be able to -build the program without configuring it first. +The description here is the specification of the interface for the +@code{configure} script in GNU packages. Many packages implement it +using GNU Autoconf (@pxref{Top,, Introduction, autoconf, Autoconf}) +and/or GNU Automake (@pxref{Top,, Introduction, automake, Automake}), +but you do not have to use these tools. You can implement it any way +you like; for instance, by making @code{configure} be a wrapper around +a completely different configuration system. + +Another way for the @code{configure} script to operate is to make a +link from a standard name such as @file{config.h} to the proper +configuration file for the chosen system. If you use this technique, +the distribution should @emph{not} contain a file named +@file{config.h}. This is so that people won't be able to build the +program without configuring it first. Another thing that @code{configure} can do is to edit the Makefile. If you do this, the distribution should @emph{not} contain a file named -- 2.47.3