Work around yet another automake bug. This is an incredibly shitty tool.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index c3d72ff41a1ed34626cb19b00d68a3968b3238f3..1fb11f1593390426ce28dffb2d82effe9b383827 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,11 @@
+2001-04-12  Bruno Haible  <haible@clisp.cons.org>
+
+       * gettext.m4: Workaround an automake-1.4 bug: Don't write
+       AM_DISABLE_SHARED, even in comments, because that causes 'aclocal'
+       to pull in the libtool.m4 macros, which causes 'automake' to use
+       @LIBTOOL@ in its rules, even for packages that haven't called
+       AM_PROG_LIBTOOL.
+
 2001-04-12  Bruno Haible  <haible@clisp.cons.org>
 
        * gettext.m4 (AM_WITH_NLS): Fix syntax error in 'case'. Change

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 90b34c609cac71375b916983e20422d801a55164..37fc43c83d355ad4b6d3f7d0d1cf5179e2022214 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -6,13 +6,13 @@
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
-# serial 8
+# serial 9
 
 dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
 dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
 dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
 dnl    depending on --{enable,disable}-{shared,static} and on the presence of
-dnl    AM_DISABLE_SHARED). Otherwise, a static library
+dnl    AM-DISABLE-SHARED). Otherwise, a static library
 dnl    $(top_builddir)/intl/libintl.a will be created.
 dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
 dnl    implementations (in libc or libintl) without the ngettext() function