minor patches

Two minor patches here: one borrowed from a recent patch by Ralf to the 
autoconf manual (both master and branch-1.6); the other being a dependency 
regression detected by Joel Denny on the bison list for only the master branch.

From 46b57220ee19890aea59e790c7e03f7291f13f07 Mon Sep 17 00:00:00 2001
From: Eric Blake <[email protected]>
Date: Fri, 11 Jul 2008 07:34:30 -0600
Subject: [PATCH] Avoid bogus whitespace in @ovar, @dvar.

* doc/m4.texinfo (ovar, dvar): Add @c.
Based on patch by Ralf Wildenhues to Autoconf manual.

Signed-off-by: Eric Blake <[email protected]>
---
 ChangeLog      |    6 ++++++
 doc/m4.texinfo |    8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4c07a80..a2ea250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-11  Eric Blake  <[email protected]>
+
+	Avoid bogus whitespace in @ovar, @dvar.
+	* doc/m4.texinfo (ovar, dvar): Add @c.
+	Based on patch by Ralf Wildenhues to Autoconf manual.
+
 2008-06-23  Eric Blake  <[email protected]>
 
 	Adjust to new gnulib-tool layout.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 1c7e4ef..871679a 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -23,17 +23,17 @@
 @c @ovar{ARG}
 @c -------------------
 @c The ARG is an optional argument.  To be used for macro arguments in
-@c their documentation.
+@c their documentation (@defmac).
 @macro ovar{varname}
-@r{[}@var{\varname\}@r{]}
+@r{[}@var{\varname\}@r{]}@c
 @end macro
 
 @c @dvar{ARG, DEFAULT}
 @c -------------------
 @c The ARG is an optional argument, defaulting to DEFAULT.  To be used
-@c for macro arguments in their documentation.
+@c for macro arguments in their documentation (@defmac).
 @macro dvar{varname, default}
-@r{[}@var{\varname\} = @samp{\default\}@r{]}
+@r{[}@var{\varname\} = @samp{\default\}@r{]}@c
 @end macro
 
 @comment %**end of header
-- 
1.5.6


From 3f65aa84e013948949e674e3970b5569383e7455 Mon Sep 17 00:00:00 2001
From: Eric Blake <[email protected]>
Date: Fri, 11 Jul 2008 07:43:03 -0600
Subject: [PATCH] Bump required automake to 1.10a; regression introduced 2008-01-
22.

* configure.ac (AM_INIT_AUTOMAKE): Undo requirement downgrade to
1.10.1, since we also rely on pkglibexecdir.
* HACKING: Fix minimum requirement.
* bootstrap: Likewise.
* THANKS: Update.
Reported by Joel E. Denny.

Signed-off-by: Eric Blake <[email protected]>
---
 ChangeLog    |    8 ++++++++
 HACKING      |    2 +-
 THANKS       |    1 +
 bootstrap    |    4 ++--
 configure.ac |    2 +-
 5 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a2ea250..e28fcc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-07-11  Eric Blake  <[email protected]>
 
+	Bump required automake to 1.10a; regression introduced 2008-01-22.
+	* configure.ac (AM_INIT_AUTOMAKE): Undo requirement downgrade to
+	1.10.1, since we also rely on pkglibexecdir.
+	* HACKING: Fix minimum requirement.
+	* bootstrap: Likewise.
+	* THANKS: Update.
+	Reported by Joel E. Denny.
+
 	Avoid bogus whitespace in @ovar, @dvar.
 	* doc/m4.texinfo (ovar, dvar): Add @c.
 	Based on patch by Ralf Wildenhues to Autoconf manual.
diff --git a/HACKING b/HACKING
index 799b11a..1c2ff82 100644
--- a/HACKING
+++ b/HACKING
@@ -65,7 +65,7 @@ and is not part of a release distribution.
   - A pre-installed version of GNU M4 1.4.5 or later, built from a
     package (recommend 1.4.11 or later)
   - Autoconf 2.62 or later
-  - Automake 1.10.1 or later
+  - Automake 1.10a or later
   - Libtool 2.2 or later
   - Gettext 0.16 or later
   - Gperf 3.0 or later
diff --git a/THANKS b/THANKS
index f6a22d6..6e7e706 100644
--- a/THANKS
+++ b/THANKS
@@ -65,6 +65,7 @@ Jean-Charles Longuet	[email protected]
 Jim Avera		[email protected]
 Jim Kingdom		[email protected]
 Jim Meyering		[email protected]
+Joel E. Denny		[email protected]
 Joel Sherrill		[email protected]
 John Brzustowski	[email protected]
 John David Anglin	[email protected]
diff --git a/bootstrap b/bootstrap
index d169d30..591cd37 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# bootstrap (GNU M4) version 2008-06-23
+# bootstrap (GNU M4) version 2008-07-11
 # Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 # This is free software: you are free to change and redistribute it.
@@ -37,7 +37,7 @@
 # This script bootstraps a git or CVS checkout of GNU M4 by correctly calling
 # out to parts of the GNU Build Platform.  Currently this requires GNU
 # Gettext 0.16 or better, Autoconf 2.62 or better, GNU M4 1.4.5 or better,
-# Automake 1.10.1 or better, Libtool 2.2 or better,
+# the latest git Automake 1.10a or better, Libtool 2.2 or better,
 # and the latest git or CVS checkout of Gnulib.
 # Libtool must be installed; either with the same --prefix as
 # automake, or made accessible to aclocal's search path via
diff --git a/configure.ac b/configure.ac
index 8591b61..1aa9397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,7 +53,7 @@ M4_default_preload="M4_DEFAULT_PRELOAD"
 ## ------------------------ ##
 ## Automake Initialization. ##
 ## ------------------------ ##
-AM_INIT_AUTOMAKE([1.10.1 subdir-objects dist-bzip2 dist-lzma]
+AM_INIT_AUTOMAKE([1.10a subdir-objects dist-bzip2 dist-lzma]
 m4_bmatch(m4_defn([M4_VERSION]), [-], [gnu], [gnits]))
 
 
-- 
1.5.6