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 <ebb9@byu.net>

diff --git a/ChangeLog b/ChangeLog
index 6b880fc48783e4ff152de9cf13729743fe7a965a..ea9a6396dde0fd3043ed171f49cb8fac1dc7dfec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-12-04  Eric Blake  <ebb9@byu.net>
+
+       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  <eggert@cs.ucla.edu>
 
        Fix AC_C_BIGENDIAN bug caused by new awk method of substitution.

diff --git a/configure.ac b/configure.ac
index 9adafa1be0523cfce191b8c96e27c7594d9974e4..cfd8643a4b21f22741112e83c34ce541768872b9 100644 (file)
--- 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 ed88e49df4b299e54303b2ed0d3b2bada207de8e..c404dfdc790821159b3fedec74d705224a487351 100644 (file)
--- 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