From 073a21a6916b858e9e6758c94dfa59ea401d4599 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 22 Feb 2010 12:13:22 -0700 Subject: [PATCH] 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 --- ChangeLog | 3 +++ build-aux/bootstrap | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2056add81..2c6dfecca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-02-22 Eric Blake + 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 4b947ebef..d37567c27 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\ -- 2.11.0