diff options
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/gettext.m4 | 15 |
2 files changed, 12 insertions, 7 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index b58b6a2..317a056 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,8 +1,8 @@ -2002-01-03 Bruno Haible <bruno@clisp.org> +2002-01-04 Bruno Haible <bruno@clisp.org> * gettext.m4 (AM_GNU_GETTEXT): If no intl directory exists and GNU gettext was not found in libc or preinstalled libintl, don't define - ENABLE_NLS. + ENABLE_NLS, and set USE_NLS to 'no'. 2001-12-12 Bruno Haible <bruno@clisp.org> diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 327f0ba..0783a94 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -177,7 +177,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if translation of program messages to the user's native language is requested.]) + else + USE_NLS=no fi + fi + + if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then if test "$gt_cv_func_gnugettext_libintl" = "yes"; then @@ -238,9 +243,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", ]) -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. +dnl Checks for all prerequisites of the po subdirectory, +dnl except for USE_NLS. AC_DEFUN([AM_PO_SUBDIRS], [ AC_REQUIRE([AC_PROG_MAKE_SET])dnl @@ -397,8 +401,9 @@ AC_DEFUN([AM_PO_SUBDIRS], ]) -dnl Checks for all prerequisites of the po subdirectory, -dnl except for USE_NLS. +dnl Checks for all prerequisites of the intl subdirectory, +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. AC_DEFUN([AM_INTL_SUBDIR], [ AC_REQUIRE([AC_PROG_INSTALL])dnl |