formatting tweaks

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Another upstream sync, plus some fixes to have 'make dvi' operate with
fewer warnings.  I'm hoping to find enough free time to release 2.63 tonight.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkjGeYsACgkQ84KuGfSFAYD4lgCgviodgTFxJMjj2oniuYrTM0K0
pHAAoKB1pBjpbAvAB2a8kvRq73jjyMN/
=Wkj7
-----END PGP SIGNATURE-----

>From 197687e808991f9b28d3f0ea8bdc765892e66ff3 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 2 Sep 2008 06:53:38 -0600
Subject: [PATCH] Resync from gnulib.

* cfg.mk (cvs_executable_files, cvs_files): Update list of files,
although for now, they are still manually sync'd.
* build-aux/gnupload: Update.
* build-aux/config.sub: Likewise.
* GNUmakefile: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog            |    9 +++++++++
 GNUmakefile          |    4 ++--
 build-aux/config.sub |   10 +++++++---
 build-aux/gnupload   |    6 +++++-
 cfg.mk               |    7 ++++++-
 5 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 35ec73c..4a633b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-09-09  Eric Blake  <address@hidden>
+
+       Resync from gnulib.
+       * cfg.mk (cvs_executable_files, cvs_files): Update list of files,
+       although for now, they are still manually sync'd.
+       * build-aux/gnupload: Update.
+       * build-aux/config.sub: Likewise.
+       * GNUmakefile: Likewise.
+
 2008-09-06  Eric Blake  <address@hidden>
 
        Mention that Automake already supports VPATH.
diff --git a/GNUmakefile b/GNUmakefile
index 7635e8d..4b4cf15 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -53,9 +53,9 @@ _autoreconf ?= autoreconf
 _have-git-version-gen := \
   $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes)
 ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL))
-  _is-dist-target = $(filter-out %clean, \
+  _is-dist-target ?= $(filter-out %clean, \
     $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
-  _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
+  _is-install-target ?= $(filter-out %check, $(filter 
install%,$(MAKECMDGOALS)))
   ifneq (,$(_is-dist-target)$(_is-install-target))
     _curr-ver := $(shell cd $(srcdir) \
                    && $(_build-aux)/git-version-gen .tarball-version)
diff --git a/build-aux/config.sub b/build-aux/config.sub
index a649350..053e738 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-06-16'
+timestamp='2008-09-08'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -288,7 +288,7 @@ case $basic_machine in
        | v850 | v850e \
        | we32k \
        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-       | z8k)
+       | z8k | z80)
                basic_machine=$basic_machine-unknown
                ;;
        m6811 | m68hc11 | m6812 | m68hc12)
@@ -375,7 +375,7 @@ case $basic_machine in
        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
        | xstormy16-* | xtensa*-* \
        | ymp-* \
-       | z8k-*)
+       | z8k-* | z80-*)
                ;;
        # Recognize the basic CPU types without company name, with glob match.
        xtensa*)
@@ -1140,6 +1140,10 @@ case $basic_machine in
                basic_machine=z8k-unknown
                os=-sim
                ;;
+       z80-*-coff)
+               basic_machine=z80-unknown
+               os=-sim
+               ;;
        none)
                basic_machine=none-none
                os=-none
diff --git a/build-aux/gnupload b/build-aux/gnupload
index 6621ebd..b90e3ae 100755
--- a/build-aux/gnupload
+++ b/build-aux/gnupload
@@ -45,7 +45,11 @@ Recognized destinations are:
                            build directive files and upload files by FTP
   address@hidden:DIRECTORY    upload files with scp
 
-Example:
+Simple single-target single-file examples:
+  gnupload --to alpha.gnu.org:automake automake-1.8.2b.tar.gz
+  gnupload --to ftp.gnu.org:automake automake-1.8.3.tar.gz
+
+Multiple-target multiple-file example:
   gnupload --to sources.redhat.com:~ftp/pub/automake \\
            --to alpha.gnu.org:automake \\
            automake-1.8.2b.tar.gz automake-1.8.2b.tar.bz2
diff --git a/cfg.mk b/cfg.mk
index 773c335..54da291 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -40,18 +40,23 @@ gpg_key_ID = F4850180
 
 # Files to update automatically.
 cvs_executable_files = \
+  $(srcdir)/build-aux/announce-gen \
   $(srcdir)/build-aux/config.guess \
   $(srcdir)/build-aux/config.sub \
   $(srcdir)/build-aux/elisp-comp \
+  $(srcdir)/build-aux/git-version-gen \
+  $(srcdir)/build-aux/gnupload \
   $(srcdir)/build-aux/install-sh \
   $(srcdir)/build-aux/mdate-sh \
   $(srcdir)/build-aux/missing \
+  $(srcdir)/build-aux/vc-list-files
 
 cvs_files = $(cvs_executable_files) \
   $(srcdir)/build-aux/texinfo.tex \
   $(srcdir)/doc/fdl.texi \
   $(srcdir)/doc/make-stds.texi \
-  $(srcdir)/doc/standards.texi
+  $(srcdir)/doc/standards.texi \
+  $(srcdir)/GNUmakefile
 
 # Keep executables executable.  Make it robust to parallel makes.
 local_updates = executable-update
-- 
1.6.0


>From f111a6e116ba4930e38c138beb7c187f1bd0e301 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 6 Sep 2008 16:19:55 -0600
Subject: [PATCH] Formatting tweaks to the manual.

* doc/autoconf.texi (Introduction, Systemology)
(File System Conventions, Portable C and C++)
(Floating Point Portability): Allow URLs to split as needed.
(Indices): Add entries, to work around texinfo bug on indices that
start too close to a page break.
(Particular Functions): Mention ftello.
(Introduction, Language Choice): Use @enddots at sentence end.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog         |    9 +++++
 doc/autoconf.texi |   95 +++++++++++++++++++++++++++++-----------------------
 2 files changed, 62 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4a633b5..1eeb941 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-09-09  Eric Blake  <address@hidden>
 
+       Formatting tweaks to the manual.
+       * doc/autoconf.texi (Introduction, Systemology)
+       (File System Conventions, Portable C and C++)
+       (Floating Point Portability): Allow URLs to split as needed.
+       (Indices): Add entries, to work around texinfo bug on indices that
+       start too close to a page break.
+       (Particular Functions): Mention ftello.
+       (Introduction, Language Choice): Use @enddots at sentence end.
+
        Resync from gnulib.
        * cfg.mk (cvs_executable_files, cvs_files): Update list of files,
        although for now, they are still manually sync'd.
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index f3f4b7d..76bf746 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -643,10 +643,10 @@ Introduction
 nature of God.  ``Surely a Physicist,'' said the physicist, ``because
 early in the Creation, God made Light; and you know, Maxwell's
 equations, the dual nature of electromagnetic waves, the relativistic
address@hidden'' ``An Engineer!,'' said the engineer, ``because
address@hidden'' ``An Engineer!,'' said the engineer, ``because
 before making Light, God split the Chaos into Land and Water; it takes a
 hell of an engineer to handle that big amount of mud, and orderly
-separation of solids from address@hidden'' The computer scientist
+separation of solids from address@hidden'' The computer scientist
 shouted: ``And the Chaos, where do you think it was coming from, hmm?''
 
 ---Anonymous
@@ -726,17 +726,17 @@ Introduction
 @xref{History}, for the story of Autoconf's development.  @xref{FAQ},
 for answers to some common questions about Autoconf.
 
-See the @uref{http://www.gnu.org/software/autoconf/,
+See the @uref{http://@/www.gnu.org/@/software/@/autoconf/,
 Autoconf web page} for up-to-date information, details on the mailing
 lists, pointers to a list of known bugs, etc.
 
 Mail suggestions to @email{autoconf@@gnu.org, the Autoconf mailing
 list}.  Past suggestions are
address@hidden://lists.gnu.org/archive/html/autoconf/, archived}.
address@hidden://@/lists.gnu.org/@/archive/@/html/@/autoconf/, archived}.
 
 Mail bug reports to @email{bug-autoconf@@gnu.org, the
 Autoconf Bugs mailing list}.  Past bug reports are
address@hidden://lists.gnu.org/archive/html/bug-autoconf/, archived}.
address@hidden://@/lists.gnu.org/@/archive/@/html/@/bug-autoconf/, archived}.
 
 If possible, first check that your bug is
 not already solved in current development versions, and that it has not
@@ -744,25 +744,25 @@ Introduction
 short @file{configure.ac} that demonstrates the problem.
 
 Autoconf's development tree is accessible via @command{git}; see the
address@hidden://savannah.gnu.org/projects/autoconf/, Autoconf
address@hidden://@/savannah.gnu.org/@/projects/@/autoconf/, Autoconf
 Summary} for details, or view
address@hidden://git.sv.gnu.org/gitweb/?p=autoconf.git, the actual
address@hidden://@/git.sv.gnu.org/@/gitweb/@/?p=autoconf.git, the actual
 repository}.  Anonymous @acronym{CVS} access is also available, see
 @file{README} for more details.  Patches relative to the
 current @command{git} version can be sent for review to the
address@hidden@@gnu.org, Autoconf Patches mailing list}.
-Discussions on past patches are
address@hidden://lists.gnu.org/@/archive/@/html/@/autoconf-patches/,
-archived}, and all commits are archived in the read-only
address@hidden@@gnu.org, Autoconf Patches mailing list}, with
+discussion on prior patches
address@hidden://@/lists.gnu.org/@/archive/@/html/@/autoconf-@/patches/,
+archived}; and all commits are posted in the read-only
 @email{autoconf-commit@@gnu.org, Autoconf Commit mailing list}, which is
-also @uref{http://lists.gnu.org/@/archive/@/html/@/autoconf-commit/,
+also @uref{http://@/lists.gnu.org/@/archive/@/html/@/autoconf-commit/,
 archived}.
 
 Because of its mission, the Autoconf package itself
 includes only a set of often-used
 macros that have already demonstrated their usefulness.  Nevertheless,
 if you wish to share your macros, or find existing ones, see the
address@hidden://autoconf-archive.cryp.to/, Autoconf Macro
address@hidden://@/autoconf-archive.cryp.to/, Autoconf Macro
 Archive}, which is kindly run by @email{simons@@cryp.to,
 Peter Simons}.
 
@@ -903,11 +903,11 @@ Pointers
 
 @item Web
 
-The home pages for
address@hidden://www.gnu.org/@/software/@/autoconf/, Autoconf},
address@hidden://www.gnu.org/@/software/@/automake/, Automake},
address@hidden://www.gnu.org/@/software/@/gnulib/, Gnulib}, and
address@hidden://www.gnu.org/@/software/@/libtool/, Libtool}.
+The project home pages for
address@hidden://@/www@/.gnu@/.org/@/software/@/autoconf/, Autoconf},
address@hidden://@/www@/.gnu@/.org/@/software/@/automake/, Automake},
address@hidden://@/www@/.gnu@/.org/@/software/@/gnulib/, Gnulib}, and
address@hidden://@/www@/.gnu@/.org/@/software/@/libtool/, Libtool}.
 
 @item Automake Manual
 
@@ -921,7 +921,7 @@ Pointers
 by G. V. Vaughan, B. Elliston, T. Tromey, and I. L. Taylor.  SAMS (originally
 New Riders), 2000, ISBN 1578701902.} describes the complete @acronym{GNU}
 build environment.  You can also find
address@hidden://sources.redhat.com/@/autobook/, the entire book on-line}.
address@hidden://@/sources.redhat.com/@/autobook/, the entire book on-line}.
 
 @end itemize
 
@@ -1189,7 +1189,7 @@ Autoconf Language
 @end example
 
 You are now able to understand one of the constructs of Autoconf that
-has been continually address@hidden  The rule of thumb is that
+has been continually address@hidden  The rule of thumb is that
 @emph{whenever you expect macro expansion, expect quote expansion};
 i.e., expect one level of quotes to be lost.  For instance:
 
@@ -4702,12 +4702,14 @@ Particular Functions
 @cvindex HAVE_FSEEKO
 @c @fuindex fseeko
 @prindex @code{fseeko}
address@hidden @fuindex ftello
address@hidden @code{ftello}
 If the @code{fseeko} function is available, define @code{HAVE_FSEEKO}.
 Define @code{_LARGEFILE_SOURCE} if necessary to make the prototype
 visible on some systems (e.g., glibc 2.2).  Otherwise linkage problems
 may occur when compiling with @code{AC_SYS_LARGEFILE} on
 largefile-sensitive systems where @code{off_t} does not default to a
-64bit entity.
+64bit entity.  All systems with @code{fseeko} also supply @code{ftello}.
 @end defmac
 
 @defmac AC_FUNC_GETGROUPS
@@ -5094,6 +5096,8 @@ Particular Functions
 @cvindex HAVE_DOPRNT
 @c @fuindex vprintf
 @prindex @code{vprintf}
address@hidden @fuindex vsprintf
address@hidden @code{vsprintf}
 If @code{vprintf} is found, define @code{HAVE_VPRINTF}.  Otherwise, if
 @code{_doprnt} is found, define @code{HAVE_DOPRNT}.  (If @code{vprintf}
 is available, you may assume that @code{vfprintf} and @code{vsprintf}
@@ -6530,7 +6534,7 @@ Generic Compiler Characteristics
 @ovindex OPENMP_CXXFLAGS
 @ovindex OPENMP_FFLAGS
 @ovindex OPENMP_FCFLAGS
-OpenMP (@url{http://www.openmp.org/}) specifies extensions of C, C++,
+OpenMP (@url{http://@/www.openmp.org/}) specifies extensions of C, C++,
 and Fortran that simplify optimization of shared memory parallelism,
 which is a common problem on multicore CPUs.
 
@@ -7593,8 +7597,8 @@ System Services
 @ovindex CC
 @cindex Large file support
 @cindex LFS
-Arrange for
address@hidden://www.unix-systems.org/@/version2/@/whatsnew/@/lfs20mar.html,
+Arrange for 64-bit file offsets, known as
address@hidden://@/www.unix-systems@/.org/@/version2/@/whatsnew/@/lfs20mar.html,
 large-file support}.  On some hosts, one must use special compiler
 options to build programs that can access large files.  Append any such
 options to the output variable @code{CC}.  Define
@@ -7907,7 +7911,7 @@ Language Choice
 your code, rather, require from the user to run the macro with a
 correct current language, and check it with @code{AC_LANG_ASSERT}.
 And anyway, that may help the user understand she is running a Fortran
-macro while expecting a result about her Fortran 77 address@hidden
+macro while expecting a result about her Fortran 77 address@hidden
 @end defmac
 
 
@@ -8468,17 +8472,17 @@ Systemology
 documentation.  It may help you addressing particular problems reported
 by users.
 
address@hidden://www.opengroup.org/susv3, Posix-conforming systems} are
-derived from the @uref{http://www.bell-labs.com/history/unix/, Unix
address@hidden://@/www.opengroup.org/@/susv3, Posix-conforming systems} are
+derived from the @uref{http://@/www.bell-labs.com/@/history/@/unix/, Unix
 operating system}.
 
-The @uref{http://bhami.com/rosetta.html, Rosetta Stone for Unix}
+The @uref{http://@/bhami.com/@/rosetta.html, Rosetta Stone for Unix}
 contains a table correlating the features of various Posix-conforming
-systems.  @uref{http://www.levenez.com/unix/, Unix History} is a
+systems.  @uref{http://@/www.levenez.com/@/unix/, Unix History} is a
 simplified diagram of how many Unix systems were derived from each
 other.
 
address@hidden://heirloom.sourceforge.net/, The Heirloom Project}
address@hidden://@/heirloom.sourceforge.net/, The Heirloom Project}
 provides some variants of traditional implementations of Unix utilities.
 
 @table @asis
@@ -8506,11 +8510,11 @@ Systemology
 meant to be scalable from the small embedded systems to the hundred
 processor super-computer.  It claims to be Posix certified.  More
 information is available on the
address@hidden://www.qnx.com/, @acronym{QNX} home page}.
address@hidden://@/www.qnx.com/, @acronym{QNX} home page}.
 
 @item Tru64
 @cindex Tru64
address@hidden://h30097.www3.hp.com/@/docs/,
address@hidden://@/h30097.www3.hp.com/@/docs/,
 Documentation of several versions of Tru64} is available in different
 formats.
 
@@ -8520,7 +8524,7 @@ Systemology
 Officially this was called the ``Seventh Edition'' of ``the @sc{unix}
 time-sharing system'' but we use the more-common name ``Unix version 7''.
 Documentation is available in the
address@hidden://plan9.bell-labs.com/@/7thEdMan/, Unix Seventh Edition Manual}.
address@hidden://@/plan9.bell-labs.com/@/7thEdMan/, Unix Seventh Edition 
Manual}.
 Previous versions of Unix are called ``Unix version 6'', etc., but
 they were not as widely used.
 @end table
@@ -12658,10 +12662,10 @@ Portable Shell
 
 There are other sources of documentation about shells.  The
 specification for the Posix
address@hidden://www.opengroup.org/@/susv3/@/utilities/@/xcu_chap02.html, Shell
address@hidden://@/www.opengroup.org/@/susv3/@/utilities/@/xcu_chap02@/.html, 
Shell
 Command Language}, though more generous than the restrictive shell
 subset described above, is fairly portable nowadays.  Also please see
address@hidden://www.faqs.org/@/faqs/@/unix-faq/@/shell/, the Shell FAQs}.
address@hidden://@/www.faqs.org/@/faqs/@/unix-faq/@/shell/, the Shell FAQs}.
 
 @menu
 * Shellology::                  A zoology of shells
@@ -12686,7 +12690,7 @@ Shellology
 There are several families of shells, most prominently the Bourne family
 and the C shell family which are deeply incompatible.  If you want to
 write portable shell scripts, avoid members of the C shell family.  The
address@hidden://www.faqs.org/@/faqs/@/unix-faq/@/shell/@/shell-differences/, 
the
address@hidden://@/www.faqs.org/@/faqs/@/unix-faq/@/shell/@/shell-differences/, 
the
 Shell difference FAQ} includes a small history of Posix shells, and a
 comparison between several of them.
 
@@ -13145,7 +13149,7 @@ File System Conventions
 are usually able to handle long file names properly, there are still
 limitations that can seriously break packages.  Several of these issues
 can be easily detected by the
address@hidden://ftp.gnu.org/gnu/non-gnu/doschk/doschk-1.1.tar.gz, doschk}
address@hidden://@/ftp.gnu.org/@/gnu/@/non-gnu/@/doschk/@/doschk-1.1.tar.gz, 
doschk}
 package.
 
 A short overview follows; problems are marked with @sc{sfn}/@sc{lfn} to
@@ -17048,7 +17052,7 @@ Portable C and C++
 @acronym{GCC}, gcc, Using the @acronym{GNU} Compiler Collection
 (@acronym{GCC})}, for a list of C-related
 standards.  Many programs also assume the
address@hidden://www.opengroup.org/susv3, Posix standard}.
address@hidden://@/www.opengroup.org/@/susv3, Posix standard}.
 
 Some old code is written to be portable to K&R C, which predates any C
 standard.  K&R C compilers are no longer of practical interest, though,
@@ -17478,7 +17482,7 @@ Buffer Overruns
 potential portability problem, e.g., by allocating an extra unused array
 element at the start or end.
 
address@hidden://valgrind.org/, Valgrind} can catch many overruns.
address@hidden://@/valgrind.org/, Valgrind} can catch many overruns.
 @acronym{GCC}
 users might also consider using the @option{-fmudflap} option to catch
 overruns.
@@ -17632,7 +17636,7 @@ Floating Point Portability
 Almost all modern systems use IEEE-754 floating point, and it is safe to
 assume IEEE-754 in most portable code these days.  For more information,
 please see David Goldberg's classic paper
address@hidden://www.validlab.com/goldberg/paper.pdf, What Every Computer
address@hidden://@/www.validlab.com/@/goldberg/@/paper.pdf, What Every Computer
 Scientist Should Know About Floating-Point Arithmetic}.
 
 @node Exiting Portably
@@ -19206,6 +19210,8 @@ Obsolete Macros
 @defmac AC_FUNC_WAIT3
 @acindex{FUNC_WAIT3}
 @cvindex HAVE_WAIT3
address@hidden @fuindex wait3
address@hidden @code{wait3}
 If @code{wait3} is found and fills in the contents of its third argument
 (a @samp{struct rusage *}), which @acronym{HP-UX} does not do, define
 @code{HAVE_WAIT3}.
@@ -21070,6 +21076,11 @@ Making testsuite Scripts
 
 @item
 @cindex @file{package.m4}
address@hidden
address@hidden
address@hidden
address@hidden
address@hidden
 Make sure to create the file @file{package.m4}, which defines the
 identity of the package.  It must define @code{AT_PACKAGE_STRING}, the
 full signature of the package, and @code{AT_PACKAGE_BUGREPORT}, the
@@ -21427,8 +21438,8 @@ Defining Directories
 @item
 Use @code{AC_DEFINE} but have @command{configure} compute the literal
 value of @code{datadir} and others.  Many people have wrapped macros to
-automate this task.  For instance, the macro @code{AC_DEFINE_DIR} from
-the @uref{http://autoconf-archive.cryp.to/, Autoconf Macro
+automate this task; for an example, see the macro @code{AC_DEFINE_DIR} from
+the @uref{http://@/autoconf-archive@/.cryp.to/, Autoconf Macro
 Archive}.
 
 This solution does not conform to the @acronym{GNU} Coding Standards.
-- 
1.6.0