Re: gnulib configure.ac and autopoint?

[Paul Eggert]

We should alter gnulib-tool to not indent that line,
in the short term.  In the longer term autopoint should be fixed
to work even if the AM_GNU_GETTEXT_VERSION line is indented,
so I'll CC: this message to bug-gnu-gettext.

By the way, I'm puzzled that this problem was discovered just now.
Isn't there a similar problem with autopoint 0.18.1?

Anyway, here's the patch I installed into gnulib.

>From 5eaf72020c5165f9445d58e66a59868191b87c45 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sat, 5 Jan 2013 08:03:10 -0800
Subject: [PATCH] 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>.
---
 ChangeLog   | 7 +++++++
 gnulib-tool | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f036ac1..42952cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-01-05  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        fprintftime: bring back and reword fwrite comment
diff --git a/gnulib-tool b/gnulib-tool
index 2e7f1da..c5ab13b 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3930,7 +3930,9 @@ func_emit_autoconf_snippet ()
       | { 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
-- 
1.7.11.7