bootstrap: interoperate with gettext 0.14.1

Without this patch, the modified gettext.m4 aborts autoconf due
to an unterminated m4 string.

* build-aux/bootstrap (slurp): Fix typo when using older gettext.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 2056add81f91e15933495391b101f23ec3aca918..2c6dfecca61f9b213b00d95762dd0e6ced67d2f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-02-22  Eric Blake  <eblake@redhat.com>
 
+       bootstrap: interoperate with gettext 0.14.1
+       * build-aux/bootstrap (slurp): Fix typo when using older gettext.
+
        bootstrap: allow for alternate submodule location
        * build-aux/bootstrap (gnulib_path): New variable; use instead of
        hardcoding submodule location.

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 4b947ebefdd1d395b511846e18986eba95d92078..d37567c279654f5d22825f37dfe19266f13effc8 100755 (executable)
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -653,7 +653,7 @@ slurp() {
           rm -f $dir/$file
           sed '
             /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-              AC_DEFUN([AM_INTL_SUBDIR], [
+              AC_DEFUN([AM_INTL_SUBDIR], [])
             /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
               AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
             $a\