Update from gnulib.

* gnulib: Update.
* m4/gnulib-cache.m4: Use --makefile-name.
* lib/Makefile.am: Wrap the gnulib-generated file.
* tests/Makefile.am: Likewise.
* .gitignore: Track our wrappers.
* doc/m4.texinfo (Improved capitalize): Fix typo.

Signed-off-by: Eric Blake <ebb9@byu.net>

7 files changed, 66 insertions, 5 deletions

diff --git a/.gitignore b/.gitignore
index b6e029cb..b88009a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,8 @@ gendocs.sh
 GNUmakefile
 gnupload
 /install-sh
-lib
+/lib/*
+!/lib/Makefile.am
 link-warning.h
 m4-*
 Makefile.in
@@ -31,4 +32,5 @@ Makefile
 stamp-h
 stamp-h1
 stamp-h.in
-tests
+/tests/*
+!/tests/Makefile.am
diff --git a/ChangeLog b/ChangeLog
index b22db9e5..6a35474e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-11-25  Eric Blake  <ebb9@byu.net>
+
+	Update from gnulib.
+	* gnulib: Update.
+	* m4/gnulib-cache.m4: Use --makefile-name.
+	* lib/Makefile.am: Wrap the gnulib-generated file.
+	* tests/Makefile.am: Likewise.
+	* .gitignore: Track our wrappers.
+	* doc/m4.texinfo (Improved capitalize): Fix typo.
+
 2009-10-05  Eric Blake  <ebb9@byu.net>
 
 	Update from gnulib.
diff --git a/doc/m4.texinfo b/doc/m4.texinfo
index 89a80a78..2cf86d4a 100644
--- a/doc/m4.texinfo
+++ b/doc/m4.texinfo
@@ -8529,7 +8529,7 @@ string.  In turn, that means the replacement text has unbalanced quotes,
 necessitating another round of @code{changequote}.
 
 In the fixed version below, (also shipped as
-@file{m4-@value{VERSION}/@/examples/@/capitalize.m4}), @code{capitalize}
+@file{m4-@value{VERSION}/@/examples/@/capitalize2.m4}), @code{capitalize}
 uses the alternate quotes of @samp{<<[} and @samp{]>>} (the longer
 strings are chosen so as to be less likely to appear in the text being
 converted).  The helpers @code{_to_alt} and @code{_from_alt} merely
diff --git a/gnulib b/gnulib
-Subproject c844d0cacce3176e8ca09d890bfb21a77819243
+Subproject 23cd74133c81b80d335c701848b71d85a53402c
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 00000000..eb04128f
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,29 @@
+## Makefile.am - template for generating Makefile via Automake
+##
+## Copyright (C) 2009 Free Software Foundation, Inc.
+##
+## This file is part of GNU M4.
+##
+## GNU M4 is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## GNU M4 is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST =
+MOSTLYCLEANDIRS =
+MOSTLYCLEANFILES =
+SUFFIXES =
+
+noinst_LIBRARIES = libm4.a
+
+include gnulib.mk
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index a2dade30..10458b35 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 intprops memchr2 mkstemp obstack pipe progname regex sigaction stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xprintf xvasprintf-posix
+#   gnulib-tool --import --dir=. --local-dir=local --lib=libm4 --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --avoid=lock-tests --avoid=tls-tests --makefile-name=gnulib.mk --no-libtool --macro-prefix=M4 announce-gen assert autobuild avltree-oset binary-io c-stack clean-temp cloexec close-stream closein config-h dirname error execute fdl-1.3 fflush filenamecat fopen fopen-safer fseeko gendocs getopt-gnu git-version-gen gnu-web-doc-update gnumakefile gnupload gpl-3.0 intprops memchr2 mkstemp obstack pipe progname regex sigaction stdbool stdint stdlib-safer strsignal strstr strtod strtol unlocked-io update-copyright vc-list-files verror version-etc version-etc-fsf wait-process xalloc xprintf xvasprintf-posix
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([local])
@@ -81,6 +81,6 @@ gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
 gl_WITH_TESTS
 gl_LIB([libm4])
-gl_MAKEFILE_NAME([])
+gl_MAKEFILE_NAME([gnulib.mk])
 gl_MACRO_PREFIX([M4])
 gl_PO_DOMAIN([])
diff --git a/tests/Makefile.am b/tests/Makefile.am
new file mode 100644
index 00000000..2cdfaf02
--- /dev/null
+++ b/tests/Makefile.am
@@ -0,0 +1,20 @@
+## Makefile.am - template for generating Makefile via Automake
+##
+## Copyright (C) 2009 Free Software Foundation, Inc.
+##
+## This file is part of GNU M4.
+##
+## GNU M4 is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation, either version 3 of the License, or
+## (at your option) any later version.
+##
+## GNU M4 is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+include gnulib.mk