changeset 17272:c9d7491e3e78

gnulib-tool: fix incompatibility with autopoint 0.18.2 * gnulib-tool: Don't indent AM_GNU_GETTEXT_VERSION line. Problem reported by Tom G. Christensen in <http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00053.html>.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 05 Jan 2013 08:03:10 -0800
parents a9accc6ede49
children 7be3e941fb5b
files ChangeLog gnulib-tool
diffstat 2 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+	gnulib-tool: fix incompatibility with autopoint 0.18.2
+	* gnulib-tool: Don't indent AM_GNU_GETTEXT_VERSION line.
+	Problem reported by Tom G. Christensen in
+	<http://lists.gnu.org/archive/html/bug-gnulib/2013-01/msg00053.html>.
+
 2013-01-04  Paul Eggert  <eggert@cs.ucla.edu>
 
 	fprintftime: bring back and reword fwrite comment
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3930,7 +3930,9 @@
       | { if $disable_gettext; then
             sed -e 's/AM_GNU_GETTEXT(\[external\])/dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac./'
           else
-            cat
+            # Don't indent AM_GNU_GETTEXT_VERSION line, as that confuses
+            # autopoint through at least GNU gettext version 0.18.2.
+            sed -e 's/^ *AM_GNU_GETTEXT_VERSION/AM_GNU_GETTEXT_VERSION/'
           fi
         }
     if test "$module" = 'alloca' && test "$libtool" = true && ! $disable_libtool; then