building with older Automake

[Eric Blake]

I was annoyed that a with fresh git checkout, 'autoreconf -fi' downgraded 
texinfo.tex; I traced it to the fact that I was not using bleeding-edge 
automake.  This fixes it, so I'm committing.

But it does raise the question - does autoconf's configure.ac really work with 
automake as old as 1.7.9, or should we up our minimum requirement to 1.9.6 or 
1.10?  It also raises a documentation bug against Automake - the manual 
mentions no-texinfo.tex, but neither the manual nor NEWS mention when it was 
added.

And someday, we should spend more time getting Makefile.maint more like 
coreutils (although I didn't have time for it today), since we now use git and 
not CVS.

>From 3832e8e30351f28106417c3ab990896ff9e17b48 Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 4 Dec 2007 10:14:35 -0700
Subject: [PATCH] When using older automake, don't downgrade build-
aux/texinfo.tex.

* configure.ac (AM_INIT_AUTOMAKE): Add no-texinfo.tex option.
* doc/Makefile.am (TEXINFO_TEX): Add.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog       |    6 ++++++
 configure.ac    |    2 +-
 doc/Makefile.am |    3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b880fc..ea9a639 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Eric Blake  <address@hidden>
+
+       When using older automake, don't downgrade build-aux/texinfo.tex.
+       * configure.ac (AM_INIT_AUTOMAKE): Add no-texinfo.tex option.
+       * doc/Makefile.am (TEXINFO_TEX): Add.
+
 2007-11-27  Paul Eggert  <address@hidden>
 
        Fix AC_C_BIGENDIAN bug caused by new awk method of substitution.
diff --git a/configure.ac b/configure.ac
index 9adafa1..cfd8643 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ AC_CONFIG_SRCDIR([ChangeLog])
 
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([1.7.9 dist-bzip2 readme-alpha])
+AM_INIT_AUTOMAKE([1.7.9 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/Makefile.am b/doc/Makefile.am
index ed88e49..c404dfd 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 # Make Autoconf documentation.
 
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2007 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
@@ -19,6 +19,7 @@ AM_MAKEINFOFLAGS = --no-split
 TEXI2DVI = texi2dvi --batch
 TEXI2HTML = texi2html
 TEXI2HTML_FLAGS = -split_chapter
+TEXINFO_TEX = ../build-aux/texinfo.tex
 
 info_TEXINFOS = autoconf.texi standards.texi
 autoconf_TEXINFOS = fdl.texi install.texi
-- 
1.5.3.5


>From 73a757c58c9f367b871945342891cf05d2bc688c Mon Sep 17 00:00:00 2001
From: Eric Blake <address@hidden>
Date: Tue, 4 Dec 2007 10:20:04 -0700
Subject: [PATCH] Manually resync with gnulib, since 'make cvs-update' no longer 
works.

* build-aux/config.guess: New upstream version.
* build-aux/config.sub: Likewise.

Signed-off-by: Eric Blake <address@hidden>
---
 ChangeLog              |    4 ++++
 build-aux/config.guess |    6 +++---
 build-aux/config.sub   |    8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ea9a639..757a19b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-04  Eric Blake  <address@hidden>
 
+       Manually resync with gnulib, since 'make cvs-update' no longer works.
+       * build-aux/config.guess: New upstream version.
+       * build-aux/config.sub: Likewise.
+
        When using older automake, don't downgrade build-aux/texinfo.tex.
        * configure.ac (AM_INIT_AUTOMAKE): Add no-texinfo.tex option.
        * doc/Makefile.am (TEXINFO_TEX): Add.