diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2005-05-02 04:28:20 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2005-05-02 04:28:20 +0000 |
| commit | ecf466971422be32abdc137c2262d0216d161ab2 (patch) | |
| tree | 1ca6df0fd3ace15edd1b2c6259ca5b12a9de7173 /m4 | |
| parent | e9d60320abd1c7552c2446c61434d3057ce05ba9 (diff) | |
| download | coreutils-ecf466971422be32abdc137c2262d0216d161ab2.tar.xz | |
Sync from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ChangeLog | 4 | ||||
| -rw-r--r-- | m4/getpass.m4 | 2 | ||||
| -rw-r--r-- | m4/gettext.m4 | 8 |
3 files changed, 10 insertions, 4 deletions
diff --git a/m4/ChangeLog b/m4/ChangeLog index a592ef244..432914ef9 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,7 @@ +2005-05-01 Paul Eggert <eggert@cs.ucla.edu> + + * getpass.m4, gettext.m4: Sync from gnulib. + 2005-04-28 Paul Eggert <eggert@cs.ucla.edu> * euidaccess.m4 (gl_PREREQ_EUIDACCESS): Don't require AC_HEADER_STAT. diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 29d15e884..3816253fd 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. # Provide a getpass() function if the system doesn't have it. AC_DEFUN([gl_FUNC_GETPASS], [ + AC_LIBSOURCES([getpass.c, getpass.h]) + AC_REPLACE_FUNCS(getpass) AC_CHECK_DECLS_ONCE(getpass) if test $ac_cv_func_getpass = no; then diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 626102613..624a80785 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,4 +1,4 @@ -# gettext.m4 serial 36 (gettext-0.14.3) +# gettext.m4 serial 37 (gettext-0.14.4) dnl Copyright (C) 1995-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -139,7 +139,7 @@ changequote([,])dnl ], [])[extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings;], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], gt_cv_func_gnugettext_libc=yes, gt_cv_func_gnugettext_libc=no)]) @@ -175,7 +175,7 @@ extern #endif const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], gt_cv_func_gnugettext_libintl=yes, gt_cv_func_gnugettext_libintl=no) dnl Now see whether libintl exists and depends on libiconv. @@ -196,7 +196,7 @@ extern #endif const char *_nl_expand_alias (const char *);], [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], +return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")], [LIBINTL="$LIBINTL $LIBICONV" LTLIBINTL="$LTLIBINTL $LTLIBICONV" gt_cv_func_gnugettext_libintl=yes |