--- a/ChangeLog	Mon Jun 30 01:18:28 2008 +0200
+++ b/ChangeLog	Mon Jun 30 01:28:02 2008 +0200
@@ -1,3 +1,8 @@
+2008-06-29  Bruno Haible  <bruno@clisp.org>
+
+	* doc/gnulib-tool.texi (VCS Issues): Mention --no-vc-files option.
+	* m4/gnulib-tool.m4: Update to match current gnulib-tool.
+
 2008-06-29  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool (func_import): Recommend to put gnulib-cache.m4 into

--- a/doc/gnulib-tool.texi	Mon Jun 30 01:18:28 2008 +0200
+++ b/doc/gnulib-tool.texi	Mon Jun 30 01:28:02 2008 +0200
@@ -511,6 +511,8 @@
 @item
 In projects which commit all source files, whether generated or not, into
 their VCS, the @code{gnulib-tool} generated files should all be committed.
+In this case, you also pass the option @samp{--no-vc-files} to
+@code{gnulib-tool}.
 
 Gnulib also contains files generated by @command{make} (and removed by
 @code{make clean}), using information determined by @command{configure}.

--- a/m4/gnulib-tool.m4	Mon Jun 30 01:18:28 2008 +0200
+++ b/m4/gnulib-tool.m4	Mon Jun 30 01:28:02 2008 +0200
@@ -1,4 +1,4 @@
-# gnulib-tool.m4 serial 1
+# gnulib-tool.m4 serial 2
 dnl Copyright (C) 2004-2005 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -8,6 +8,9 @@
 dnl Invoking them does nothing except to declare default arguments
 dnl for "gnulib-tool --import".
 
+dnl Usage: gl_LOCAL_DIR([DIR])
+AC_DEFUN([gl_LOCAL_DIR], [])
+
 dnl Usage: gl_MODULES([module1 module2 ...])
 AC_DEFUN([gl_MODULES], [])
 
@@ -20,14 +23,35 @@
 dnl Usage: gl_M4_BASE([DIR])
 AC_DEFUN([gl_M4_BASE], [])
 
+dnl Usage: gl_PO_BASE([DIR])
+AC_DEFUN([gl_PO_BASE], [])
+
+dnl Usage: gl_DOC_BASE([DIR])
+AC_DEFUN([gl_DOC_BASE], [])
+
+dnl Usage: gl_TESTS_BASE([DIR])
+AC_DEFUN([gl_TESTS_BASE], [])
+
+dnl Usage: gl_WITH_TESTS
+AC_DEFUN([gl_WITH_TESTS], [])
+
 dnl Usage: gl_LIB([LIBNAME])
 AC_DEFUN([gl_LIB], [])
 
-dnl Usage: gl_LGPL
+dnl Usage: gl_LGPL or gl_LGPL([VERSION])
 AC_DEFUN([gl_LGPL], [])
 
+dnl Usage: gl_MAKEFILE_NAME([FILENAME])
+AC_DEFUN([gl_MAKEFILE_NAME], [])
+
 dnl Usage: gl_LIBTOOL
 AC_DEFUN([gl_LIBTOOL], [])
 
 dnl Usage: gl_MACRO_PREFIX([PREFIX])
 AC_DEFUN([gl_MACRO_PREFIX], [])
+
+dnl Usage: gl_PO_DOMAIN([DOMAIN])
+AC_DEFUN([gl_PO_DOMAIN], [])
+
+dnl Usage: gl_VC_FILES([BOOLEAN])
+AC_DEFUN([gl_VC_FILES], [])