From: Eric Blake <eblake@redhat.com>
Date: Mon, 22 Feb 2010 19:13:22 +0000 (-0700)
Subject: bootstrap: interoperate with gettext 0.14.1
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=073a21a6916b858e9e6758c94dfa59ea401d4599;p=pspp

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 2056add81f..2c6dfecca6 100644
--- 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 4b947ebefd..d37567c279 100755
--- 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\