summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xbootstrap1
2 files changed, 2 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 57b32b281..c716782e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
2006-08-23 Paul Eggert <eggert@cs.ucla.edu>
- * bootstrap (slurp): Also put in a dummy definition for
- gl_LOCK_EARLY, introduced recently into gnulib.
+ * bootstrap (slurp): Define gl_LOCK_EARLY instead of gl_LOCK,
+ to accommodate today's gnulib change.
2006-08-23 Jim Meyering <jim@meyering.net>
diff --git a/bootstrap b/bootstrap
index 6bbdc3742..e13a7fdd0 100755
--- a/bootstrap
+++ b/bootstrap
@@ -235,7 +235,6 @@ slurp() {
/^AC_DEFUN(\[gt_INTL_SUBDIR_CORE],/,/^]/c\
AC_DEFUN([gt_INTL_SUBDIR_CORE], [])
$a\
- AC_DEFUN([gl_LOCK], [])\
AC_DEFUN([gl_LOCK_EARLY], [])
' $1/$dir/$file >$dir/$file
else