configure/makefile cleanup

[Eric Blake]

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

I'm considering applying something along the lines of this patch.  The
only reason against doing so is that I am now relying on automake's html
target, which is only available from automake 1.10 or newer, whereas
autoconf could previously be bootstrapped from automake 1.7.9 (or at least
that was the claim in configure.ac; although I've only tested
bootstrapping autoconf with automake 1.9.6).  The patch thus impacts the
minimum requirements for bootstrapping from git, but should not affect the
requirements for installing the resulting tarball.  I guess it boils down
to the question of whether we want to require autoconf developers to
install a new enough automake.

One further question - if applied, this patch is already requiring
automake 1.10; should we also go one step further, require automake
1.10.1, and use dist-lzma in AM_INIT_AUTOMAKE?  Note that if I don't use
dist-lzma, I will still manually create a .tar.lzma for distribution on
ftp.gnu.org.

- --
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

iEYEARECAAYFAkf3e8YACgkQ84KuGfSFAYB9awCgtfRXvB/lMDE+QVtOxq6akaNG
ducAn27ZbePBsvpuov6YaHTEXcfTEeOf
=sjhP
-----END PGP SIGNATURE-----

>From a77f10b77e810598c2c7aa25498148f9bac8c59d Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Sat, 5 Apr 2008 07:09:46 -0600
Subject: [PATCH] Avoid some autoreconf -Wall warnings.

* configure.ac (PACKAGE_NAME): Remove setting covered by
autoconf.
(AM_INIT_AUTOMAKE): Bump automake requirement, for html rules.
* doc/Makefile.am (TEXI2DVI): Remove settings covered by
automake.
(html, autoconf_1.html, standards_1.html): Likewise.
* Makefile.am (html): Likewise.
* doc/autoconf.texi (Quoting and Parameters): Add missing section
name.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog         |   13 +++++++++++++
 Makefile.am       |   10 ----------
 configure.ac      |    3 +--
 doc/.gitignore    |   25 +++++++++++++------------
 doc/Makefile.am   |   23 +++--------------------
 doc/autoconf.texi |    2 +-
 6 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index df454bc..d012f17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2008-04-05  Eric Blake  <address@hidden>
+
+       Avoid some autoreconf -Wall warnings.
+       * configure.ac (PACKAGE_NAME): Remove setting covered by
+       autoconf.
+       (AM_INIT_AUTOMAKE): Bump automake requirement, for html rules.
+       * doc/Makefile.am (TEXI2DVI): Remove settings covered by
+       automake.
+       (html, autoconf_1.html, standards_1.html): Likewise.
+       * Makefile.am (html): Likewise.
+       * doc/autoconf.texi (Quoting and Parameters): Add missing section
+       name.
+
 2008-04-03  Eric Blake  <address@hidden>
 
        Fix version number generation in man pages.
diff --git a/Makefile.am b/Makefile.am
index 5a9f5f7..9e3cd4e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,16 +31,6 @@ EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
 
 MAINTAINERCLEANFILES = $(srcdir)/INSTALL
 
-## -------------------- ##
-## Forwarding targets.  ##
-## -------------------- ##
-
-html:
-       cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
-
-.PHONY: html
-
-
 ## --------- ##
 ## INSTALL.  ##
 ## --------- ##
diff --git a/configure.ac b/configure.ac
index 13e48ab..3cf85bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,12 +23,11 @@ AC_PREREQ([2.60])
 AC_INIT([GNU Autoconf],
        m4_esyscmd([build-aux/git-version-gen .tarball-version]),
        address@hidden)
-AC_SUBST([PACKAGE_NAME])dnl
 AC_CONFIG_SRCDIR([ChangeLog])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.7.9 dist-bzip2 readme-alpha no-texinfo.tex])
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 readme-alpha no-texinfo.tex])
 
 # We use `/bin/sh -n script' to check that there are no syntax errors
 # in the scripts.  Although incredible, there are /bin/sh that go into
diff --git a/doc/.gitignore b/doc/.gitignore
index ddccc90..0a1e04a 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -2,35 +2,36 @@
 *.ACs
 *.AT
 *.ATs
+*.aux
 *.cp
 *.cps
 *.cv
 *.cvs
+*.dvi
 *.ev
 *.evs
 *.fn
 *.fns
+*.html
+*.htp
+*.info
+*.ky
+*.log
 *.MS
 *.MSs
 *.ov
 *.ovs
+*.pdf
+*.pg
 *.pr
 *.prs
+*.ps
+*.tmp
+*.toc
+*.tp
 *.vr
 *.vrs
-*.ky
-*.aux
-*.dvi
-*.info
-*.log
 Makefile
-autoconf
-*.pdf
-*.pg
-*.ps
 stamp-vti
 standards
-*.tmp
-*.toc
-*.tp
 version.texi
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c404dfd..17c2086 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
 # Make Autoconf documentation.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2007, 2008 Free Software
+# Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,7 +17,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_MAKEINFOFLAGS = --no-split
-TEXI2DVI = texi2dvi --batch
 TEXI2HTML = texi2html
 TEXI2HTML_FLAGS = -split_chapter
 TEXINFO_TEX = ../build-aux/texinfo.tex
@@ -29,21 +29,4 @@ standards_TEXINFOS = make-stds.texi
 # not know.
 CLEANFILES = autoconf.ACs  autoconf.cvs  autoconf.MSs  autoconf.prs \
             autoconf.ATs  autoconf.evs  autoconf.fns  autoconf.ovs \
-            autoconf.tmp \
-            autoconf*.html standards*.html
-
-
-## ----------------------------- ##
-## Other documentation formats.  ##
-## ----------------------------- ##
-
-html: autoconf_1.html standards_1.html
-
-autoconf_1.html: autoconf.texi install.texi
-       $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/autoconf.texi
-
-standards_1.html: standards.texi make-stds.texi
-       $(TEXI2HTML) $(TEXI2HTML_FLAGS) $(srcdir)/standards.texi
-
-
-.PHONY: html
+            autoconf.tmp
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 672e1a5..c22b822 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -9346,7 +9346,7 @@ car([[[a]]])
 @end example
 
 @node Quoting and Parameters
address@hidden
address@hidden Quoting and Parameters
 
 When M4 encounters @samp{$} within a macro definition, followed
 immediately by a character it recognizes (@address@hidden@samp{9},
-- 
1.5.4