From fbbfbf5b52cbac1472be29b2c33e23cd1cb0193b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 13 Apr 2001 02:37:55 +0000 Subject: [PATCH] Work around yet another automake bug. This is an incredibly shitty tool. --- m4/ChangeLog | 8 ++++++++ m4/gettext.m4 | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index c3d72ff41..1fb11f159 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,11 @@ +2001-04-12 Bruno Haible + + * 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 * gettext.m4 (AM_WITH_NLS): Fix syntax error in 'case'. Change diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 90b34c609..37fc43c83 100644 --- 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 -- 2.47.3