From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 11 Aug 2011 17:48:28 +0000 (-0700)
Subject: * build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch.
X-Git-Tag: v0.1~2012
X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=d2b8ab669f3129ac0d349eead1217adc38d795eb

* build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch.
---

diff --git a/ChangeLog b/ChangeLog
index 3a798cfe0..ea534b9cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-11  Paul Eggert  <eggert@cs.ucla.edu>
 
+	* build-aux/bootstrap (slurp): Remove obsolescent gettext.m4 patch.
+
 	po/Makefile.in.in: fix make -q problem
 	* build-aux/po/Makefile.in.in (check-macro-version): Remove this
 	rule, since there's no file named 'check-macro-version' and its
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index b286beb53..f76db9aea 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2011-06-22.06; # UTC
+scriptversion=2011-08-11.17; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -800,20 +800,7 @@ slurp() {
         echo "$me: $dir/$file overrides $1/$dir/$file"
       else
         copied=$copied$sep$file; sep=$nl
-        if test $file = gettext.m4; then
-          echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
-          rm -f $dir/$file
-          sed '
-            /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
-              AC_DEFUN([AM_INTL_SUBDIR], [])
-            /^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
-              AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
-            $a\
-              AC_DEFUN([gl_LOCK_EARLY], [])
-          ' $1/$dir/$file >$dir/$file
-        else
-          cp_mark_as_generated $1/$dir/$file $dir/$file
-        fi
+        cp_mark_as_generated $1/$dir/$file $dir/$file
       fi || exit
     done