diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 5 | ||||
| -rw-r--r-- | m4/gettext.m4 | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index 3106b48..7a19b95 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2001-05-04 Bruno Haible <haible@clisp.cons.org> + + * gettext.m4 (AM_WITH_NLS): Let the GNU gettext package install its + libintl when a GNU libintl is already preinstalled. + 2001-04-30 Bruno Haible <haible@clisp.cons.org> * gettext.m4 (AM_GNU_GETTEXT): Also check for the getegid, geteuid, diff --git a/m4/gettext.m4 b/m4/gettext.m4 index c91dac9..a9fce69 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -94,8 +94,13 @@ return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "" LIBS="$gt_save_LIBS"]) fi + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || test "$gt_cv_func_gnugettext_libintl" = "yes"; then + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then AC_DEFINE(HAVE_GETTEXT, 1, [Define if the GNU gettext() function is already present or preinstalled.]) AC_CHECK_FUNCS(dcgettext) |