Bruno Haible <[EMAIL PROTECTED]> writes:
> 2006-08-23 Bruno Haible <[EMAIL PROTECTED]>
>
> * m4/lock.m4 (gl_LOCK_EARLY): Renamed from gl_LOCK.
Thanks for the heads-up. I installed the patch below to coreutils to
accommodate this.
This leads to one of the issues I had when converting coreutils to use
gnulib (I had several issues, but one at a time): what is the
recommended way to use AM_GNU_GETTEXT([external], ...), gnulib-tool,
and autopoint/autoreconf in such a way that you don't get the
following files into your m4 directory afterwards?
glibc2.m4 intdiv0.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4
lock.m4 printf-posix.m4 size_max.m4 uintmax_t.m4 ulonglong.m4
visibility.m4 xsize.m4
These files are unnecessary in coreutils, because of the [external],
and yet they're listed in modules/gettext, and autopoint brings in
yet another (incompatible) copy of them.
Currently coreutils attacks this problem by editing gettext.m4 to
discard the contents of AM_INTL_SUBDIR and gt_INTL_SUBDIR_CORE
(otherwise, the autotools will complain about unresolved dependencies)
and by defining an empty gl_LOCK_EARLY. It also comments out this line:
AM_CPPFLAGS += -I$(top_builddir)/intl
to simplify the output of "make". Finally, it removes the
above-mentioned files before invoking aclocal. But this is all a bit
of a kludge.
2006-08-23 Paul Eggert <[EMAIL PROTECTED]>
* bootstrap (slurp): Define gl_LOCK_EARLY instead of gl_LOCK,
to accommodate today's gnulib change.
--- bootstrap 22 Aug 2006 19:19:57 -0000 1.2
+++ bootstrap 23 Aug 2006 18:09:40 -0000 1.4
@@ -235,7 +235,7 @@ 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
cp $1/$dir/$file $dir/$file
