summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--doc/gnulib-tool.texi8
2 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0a4c6a4cb..5413efc5dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-05 Bruno Haible <bruno@clisp.org>
+
+ doc: Improve doc regarding autopoint vs. gnulib.
+ * doc/gnulib-tool.texi (gettextize and autopoint): Recommend to
+ disable autopoint while running autoreconf.
+ Suggested by Ralf Wildenhues.
+
2011-03-05 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Update AC_OPENMP macro for Lahey compiler on GNU/Linux.
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index a483d03ab5..8e38c38e99 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -483,6 +483,14 @@ it means that a new GNU gettext release was made, and its autoconf macros
were integrated into Gnulib and now mismatch the @file{po/} infrastructure.
In this case, fetch and install the new GNU gettext release and run
@code{gettextize} followed by @code{gnulib-tool}.
+
+@item
+When you invoke @code{autoreconf} after @code{gnulib-tool}, make sure to
+not invoke @code{autopoint} a second time, by setting the @code{AUTOPOINT}
+environment variable, like this:
+@smallexample
+$ env AUTOPOINT=true autoreconf --install
+@end smallexample
@end enumerate