diff options
| -rw-r--r-- | intl/ChangeLog | 5 | ||||
| -rwxr-xr-x | intl/configure | 40 | ||||
| -rw-r--r-- | intl/configure.ac | 2 |
3 files changed, 26 insertions, 21 deletions
diff --git a/intl/ChangeLog b/intl/ChangeLog index 60822b3..6150e7e 100644 --- a/intl/ChangeLog +++ b/intl/ChangeLog @@ -1,3 +1,8 @@ +2017-11-07 Alan Modra <amodra@gmail.com> + + * configure.ac: Invoke AM_GNU_GETTEXT with need_ngettext. + * configure: Regenerate. + 2016-11-15 Matthias Klose <doko@ubuntu.com> * configure: Regenerate. diff --git a/intl/configure b/intl/configure index d7af03f..2abbcb5 100755 --- a/intl/configure +++ b/intl/configure @@ -5813,7 +5813,7 @@ $as_echo "$nls_cv_force_use_gnu_gettext" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if test "${gt_cv_func_gnugettext1_libc+set}" = set; then : +if test "${gt_cv_func_gnugettext2_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5825,23 +5825,23 @@ int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_domain_bindings +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libc=yes + gt_cv_func_gnugettext2_libc=yes else - gt_cv_func_gnugettext1_libc=no + gt_cv_func_gnugettext2_libc=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libc" >&5 -$as_echo "$gt_cv_func_gnugettext1_libc" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext2_libc" >&5 +$as_echo "$gt_cv_func_gnugettext2_libc" >&6; } - if test "$gt_cv_func_gnugettext1_libc" != "yes"; then + if test "$gt_cv_func_gnugettext2_libc" != "yes"; then @@ -6223,7 +6223,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if test "${gt_cv_func_gnugettext1_libintl+set}" = set; then : +if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -6243,19 +6243,19 @@ int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - gt_cv_func_gnugettext1_libintl=yes + gt_cv_func_gnugettext2_libintl=yes else - gt_cv_func_gnugettext1_libintl=no + gt_cv_func_gnugettext2_libintl=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - if test "$gt_cv_func_gnugettext1_libintl" != yes && test -n "$LIBICONV"; then + if test "$gt_cv_func_gnugettext2_libintl" != yes && test -n "$LIBICONV"; then LIBS="$LIBS $LIBICONV" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -6270,7 +6270,7 @@ int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_expand_alias (0) ; return 0; } @@ -6278,7 +6278,7 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext1_libintl=yes + gt_cv_func_gnugettext2_libintl=yes fi rm -f core conftest.err conftest.$ac_objext \ @@ -6287,12 +6287,12 @@ rm -f core conftest.err conftest.$ac_objext \ CPPFLAGS="$gt_save_CPPFLAGS" LIBS="$gt_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext1_libintl" >&5 -$as_echo "$gt_cv_func_gnugettext1_libintl" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_gnugettext2_libintl" >&5 +$as_echo "$gt_cv_func_gnugettext2_libintl" >&6; } fi - if test "$gt_cv_func_gnugettext1_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext1_libintl" = "yes" \ + if test "$gt_cv_func_gnugettext2_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext2_libintl" = "yes" \ && test "$PACKAGE" != gettext-runtime \ && test "$PACKAGE" != gettext-tools; }; then gt_use_preinstalled_gnugettext=yes @@ -6340,7 +6340,7 @@ $as_echo "$USE_NLS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5 $as_echo_n "checking where the gettext function comes from... " >&6; } if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then gt_source="external libintl" else gt_source="libc" @@ -6355,7 +6355,7 @@ $as_echo "$gt_source" >&6; } if test "$USE_NLS" = "yes"; then if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + if test "$gt_cv_func_gnugettext2_libintl" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5 $as_echo_n "checking how to link with libintl... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5 diff --git a/intl/configure.ac b/intl/configure.ac index 698c330..36cf97f 100644 --- a/intl/configure.ac +++ b/intl/configure.ac @@ -4,7 +4,7 @@ AC_CONFIG_SRCDIR(gettext.c) AC_CONFIG_HEADER(config.h) AC_CONFIG_MACRO_DIR(../config) AM_GNU_GETTEXT_VERSION(0.12.1) -AM_GNU_GETTEXT +AM_GNU_GETTEXT([], [need-ngettext]) # This replaces the extensive use of DEFS in the original Makefile.in. AC_DEFINE(IN_LIBINTL, 1, [Define because this is libintl.]) |