[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
update to gettext-0.16
|
From: |
Bruno Haible |
|
Subject: |
update to gettext-0.16 |
|
Date: |
Fri, 27 Oct 2006 16:03:51 +0200 |
|
User-agent: |
KMail/1.9.1 |
Hi,
I'm upgrading the gettext module to gettext-0.16.
2006-10-27 Bruno Haible <address@hidden>
Update to GNU gettext 0.16.
* modules/gettext (Files): Add m4/intl.m4, m4/intldir.m4. Remove
m4/inttypes-h.m4, m4/signed.m4.
* m4/gettext.m4: Update to GNU gettext 0.16.
* m4/intl.m4: New file, from GNU gettext.
* m4/intldir.m4: New file, from GNU gettext.
diff -c -3 -r1.8 codeset.m4
*** m4/codeset.m4 28 Aug 2006 13:14:09 -0000 1.8
--- m4/codeset.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # codeset.m4 serial 2 (gettext-0.15.1)
dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # codeset.m4 serial 2 (gettext-0.16)
dnl Copyright (C) 2000-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff -c -3 -r1.34 gettext.m4
*** m4/gettext.m4 18 Sep 2006 19:23:59 -0000 1.34
--- m4/gettext.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # gettext.m4 serial 53.1
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # gettext.m4 serial 58 (gettext-0.16)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
***************
*** 15,23 ****
dnl Authors:
dnl Ulrich Drepper <address@hidden>, 1995-2000.
! dnl Bruno Haible <address@hidden>, 2000-2005.
!
! AC_PREREQ(2.52)
dnl Macro to add for using GNU gettext.
--- 15,21 ----
dnl Authors:
dnl Ulrich Drepper <address@hidden>, 1995-2000.
! dnl Bruno Haible <address@hidden>, 2000-2006.
dnl Macro to add for using GNU gettext.
***************
*** 65,72 ****
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2],
[need-formatstring-macros], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])])
! define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [
--- 63,75 ----
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2],
[need-formatstring-macros], ,
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
])])])])
! define([gt_included_intl],
! ifelse([$1], [external],
! ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
! [yes]))
define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
+ gt_NEEDS_INIT
+ AM_GNU_GETTEXT_NEED([$2])
AC_REQUIRE([AM_PO_SUBDIRS])dnl
ifelse(gt_included_intl, yes, [
***************
*** 80,86 ****
dnl Sometimes libintl requires libiconv, so first search for libiconv.
dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then
! dnl if test "$gt_cv_func_gnugettext_libc" != "yes"; then
dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
dnl the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions:
--- 83,89 ----
dnl Sometimes libintl requires libiconv, so first search for libiconv.
dnl Ideally we would do this search only after the
dnl if test "$USE_NLS" = "yes"; then
! dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" !=
"yes"; }; then
dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
dnl the configure script would need to contain the same shell code
dnl again, outside any 'if'. There are two solutions:
***************
*** 106,111 ****
--- 109,123 ----
LTLIBINTL=
POSUB=
+ dnl Add a version number to the cache macros.
+ case " $gt_needs " in
+ *" need-formatstring-macros "*) gt_api_version=3 ;;
+ *" need-ngettext "*) gt_api_version=2 ;;
+ *) gt_api_version=1 ;;
+ esac
+ gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
+ gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
+
dnl If we use NLS figure out what method
if test "$USE_NLS" = "yes"; then
gt_use_preinstalled_gnugettext=no
***************
*** 124,149 ****
dnl to use. If GNU gettext is available we use this. Else we have
dnl to fall back to GNU NLS library.
! dnl Add a version number to the cache macros.
! define([gt_api_version], ifelse([$2], [need-formatstring-macros], 3,
ifelse([$2], [need-ngettext], 2, 1)))
! define([gt_cv_func_gnugettext_libc],
[gt_cv_func_gnugettext]gt_api_version[_libc])
! define([gt_cv_func_gnugettext_libintl],
[gt_cv_func_gnugettext]gt_api_version[_libintl])
!
! AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
! [AC_TRY_LINK([#include <libintl.h>
! ]ifelse([$2], [need-formatstring-macros],
! [[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
! ]], [])[extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],
[bindtextdomain ("", "");
! 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)])
! if test "$gt_cv_func_gnugettext_libc" != "yes"; then
dnl Sometimes libintl requires libiconv, so first search for
libiconv.
ifelse(gt_included_intl, yes, , [
AM_ICONV_LINK
--- 136,168 ----
dnl to use. If GNU gettext is available we use this. Else we have
dnl to fall back to GNU NLS library.
! if test $gt_api_version -ge 3; then
! gt_revision_test_code='[[
! #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
#endif
typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
! ]]'
! else
! gt_revision_test_code=
! fi
! if test $gt_api_version -ge 2; then
! gt_expression_test_code=' + * ngettext ("", "", 0)'
! else
! gt_expression_test_code=
! fi
!
! AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
! [AC_TRY_LINK([#include <libintl.h>
! $gt_revision_test_code
! extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],
[bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_domain_bindings],
! [eval "$gt_func_gnugettext_libc=yes"],
! [eval "$gt_func_gnugettext_libc=no"])])
! if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" !=
"yes"; }; then
dnl Sometimes libintl requires libiconv, so first search for
libiconv.
ifelse(gt_included_intl, yes, , [
AM_ICONV_LINK
***************
*** 154,201 ****
dnl even if libiconv doesn't exist.
AC_LIB_LINKFLAGS_BODY([intl])
AC_CACHE_CHECK([for GNU gettext in libintl],
! gt_cv_func_gnugettext_libintl,
[gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on
libiconv.
AC_TRY_LINK([#include <libintl.h>
! ]ifelse([$2], [need-formatstring-macros],
! [[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
! #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
! #endif
! typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
! ]], [])[extern int _nl_msg_cat_cntr;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! 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.
! if test "$gt_cv_func_gnugettext_libintl" != yes && test -n
"$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
! ]ifelse([$2], [need-formatstring-macros],
! [[#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
! #define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
! #endif
! typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
! ]], [])[extern int _nl_msg_cat_cntr;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! 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
])
fi
CPPFLAGS="$gt_save_CPPFLAGS"
--- 173,212 ----
dnl even if libiconv doesn't exist.
AC_LIB_LINKFLAGS_BODY([intl])
AC_CACHE_CHECK([for GNU gettext in libintl],
! [$gt_func_gnugettext_libintl],
[gt_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $INCINTL"
gt_save_LIBS="$LIBS"
LIBS="$LIBS $LIBINTL"
dnl Now see whether libintl exists and does not depend on
libiconv.
AC_TRY_LINK([#include <libintl.h>
! $gt_revision_test_code
! extern int _nl_msg_cat_cntr;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_expand_alias ("")],
! [eval "$gt_func_gnugettext_libintl=yes"],
! [eval "$gt_func_gnugettext_libintl=no"])
dnl Now see whether libintl exists and depends on libiconv.
! if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val"
!= yes; } && test -n "$LIBICONV"; then
LIBS="$LIBS $LIBICONV"
AC_TRY_LINK([#include <libintl.h>
! $gt_revision_test_code
! extern int _nl_msg_cat_cntr;
extern
#ifdef __cplusplus
"C"
#endif
const char *_nl_expand_alias (const char *);],
[bindtextdomain ("", "");
! return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr +
*_nl_expand_alias ("")],
[LIBINTL="$LIBINTL $LIBICONV"
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
! eval "$gt_func_gnugettext_libintl=yes"
])
fi
CPPFLAGS="$gt_save_CPPFLAGS"
***************
*** 206,213 ****
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" \
&& test "$PACKAGE" != gettext-runtime \
&& test "$PACKAGE" != gettext-tools; }; then
gt_use_preinstalled_gnugettext=yes
--- 217,224 ----
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 { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" =
"yes"; } \
! || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val"
= "yes"; } \
&& test "$PACKAGE" != gettext-runtime \
&& test "$PACKAGE" != gettext-tools; }; then
gt_use_preinstalled_gnugettext=yes
***************
*** 267,273 ****
if test "$USE_NLS" = "yes"; then
AC_MSG_CHECKING([where the gettext function comes from])
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
! if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
gt_source="external libintl"
else
gt_source="libc"
--- 278,284 ----
if test "$USE_NLS" = "yes"; then
AC_MSG_CHECKING([where the gettext function comes from])
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
! if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" =
"yes"; }; then
gt_source="external libintl"
else
gt_source="libc"
***************
*** 281,287 ****
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
! if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
AC_MSG_CHECKING([how to link with libintl])
AC_MSG_RESULT([$LIBINTL])
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
--- 292,298 ----
if test "$USE_NLS" = "yes"; then
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
! if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" =
"yes"; }; then
AC_MSG_CHECKING([how to link with libintl])
AC_MSG_RESULT([$LIBINTL])
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
***************
*** 349,575 ****
])
- 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
- AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
- AC_REQUIRE([AC_PROG_CC])dnl
- AC_REQUIRE([AC_CANONICAL_HOST])dnl
- AC_REQUIRE([gt_GLIBC2])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
- AC_REQUIRE([gl_VISIBILITY])dnl
- AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
- AC_REQUIRE([bh_C_SIGNED])dnl
- AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
- AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
- AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
- AC_REQUIRE([gt_TYPE_WINT_T])dnl
- AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
- AC_REQUIRE([gt_TYPE_INTMAX_T])
- AC_REQUIRE([gt_PRINTF_POSIX])
- AC_REQUIRE([gl_GLIBC21])dnl
- AC_REQUIRE([gl_XSIZE])dnl
- AC_REQUIRE([gt_INTL_MACOSX])dnl
-
- AC_CHECK_TYPE([ptrdiff_t], ,
- [AC_DEFINE([ptrdiff_t], [long],
- [Define as the type of the result of subtracting two pointers, if the
system doesn't define it.])
- ])
- AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
- AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
-
- dnl Use the _snprintf function only if it is declared (because on NetBSD it
- dnl is defined as a weak alias of snprintf; we prefer to use the latter).
- gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
- gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
-
- dnl Use the *_unlocked functions only if they are declared.
- dnl (because some of them were defined without being declared in Solaris
- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
- dnl on Solaris 2.5.1 to run on Solaris 2.6).
- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
- gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
-
- case $gt_cv_func_printf_posix in
- *yes) HAVE_POSIX_PRINTF=1 ;;
- *) HAVE_POSIX_PRINTF=0 ;;
- esac
- AC_SUBST([HAVE_POSIX_PRINTF])
- if test "$ac_cv_func_asprintf" = yes; then
- HAVE_ASPRINTF=1
- else
- HAVE_ASPRINTF=0
- fi
- AC_SUBST([HAVE_ASPRINTF])
- if test "$ac_cv_func_snprintf" = yes; then
- HAVE_SNPRINTF=1
- else
- HAVE_SNPRINTF=0
- fi
- AC_SUBST([HAVE_SNPRINTF])
- if test "$ac_cv_func_wprintf" = yes; then
- HAVE_WPRINTF=1
- else
- HAVE_WPRINTF=0
- fi
- AC_SUBST([HAVE_WPRINTF])
-
- AM_LANGINFO_CODESET
- gt_LC_MESSAGES
-
- dnl Compilation on mingw and Cygwin needs special Makefile rules, because
- dnl 1. when we install a shared library, we must arrange to export
- dnl auxiliary pointer variables for every exported variable,
- dnl 2. when we install a shared library and a static library simultaneously,
- dnl the include file specifies __declspec(dllimport) and therefore we
- dnl must arrange to define the auxiliary pointer variables for the
- dnl exported variables _also_ in the static library.
- if test "$enable_shared" = yes; then
- case "$host_os" in
- cygwin*) is_woe32dll=yes ;;
- *) is_woe32dll=no ;;
- esac
- else
- is_woe32dll=no
- fi
- WOE32DLL=$is_woe32dll
- AC_SUBST([WOE32DLL])
-
- dnl Rename some macros and functions used for locking.
- AH_BOTTOM([
- #define __libc_lock_t gl_lock_t
- #define __libc_lock_define gl_lock_define
- #define __libc_lock_define_initialized gl_lock_define_initialized
- #define __libc_lock_init gl_lock_init
- #define __libc_lock_lock gl_lock_lock
- #define __libc_lock_unlock gl_lock_unlock
- #define __libc_lock_recursive_t gl_recursive_lock_t
- #define __libc_lock_define_recursive gl_recursive_lock_define
- #define __libc_lock_define_initialized_recursive
gl_recursive_lock_define_initialized
- #define __libc_lock_init_recursive gl_recursive_lock_init
- #define __libc_lock_lock_recursive gl_recursive_lock_lock
- #define __libc_lock_unlock_recursive gl_recursive_lock_unlock
- #define glthread_in_use libintl_thread_in_use
- #define glthread_lock_init libintl_lock_init
- #define glthread_lock_lock libintl_lock_lock
- #define glthread_lock_unlock libintl_lock_unlock
- #define glthread_lock_destroy libintl_lock_destroy
- #define glthread_rwlock_init libintl_rwlock_init
- #define glthread_rwlock_rdlock libintl_rwlock_rdlock
- #define glthread_rwlock_wrlock libintl_rwlock_wrlock
- #define glthread_rwlock_unlock libintl_rwlock_unlock
- #define glthread_rwlock_destroy libintl_rwlock_destroy
- #define glthread_recursive_lock_init libintl_recursive_lock_init
- #define glthread_recursive_lock_lock libintl_recursive_lock_lock
- #define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
- #define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
- #define glthread_once libintl_once
- #define glthread_once_call libintl_once_call
- #define glthread_once_singlethreaded libintl_once_singlethreaded
- ])
- ])
-
-
- dnl Checks for the core files of the intl subdirectory:
- dnl dcigettext.c
- dnl eval-plural.h
- dnl explodename.c
- dnl finddomain.c
- dnl gettextP.h
- dnl gmo.h
- dnl hash-string.h hash-string.c
- dnl l10nflist.c
- dnl libgnuintl.h.in (except the *printf stuff)
- dnl loadinfo.h
- dnl loadmsgcat.c
- dnl localealias.c
- dnl log.c
- dnl plural-exp.h plural-exp.c
- dnl plural.y
- dnl Used by libglocale.
- AC_DEFUN([gt_INTL_SUBDIR_CORE],
- [
- AC_REQUIRE([AC_C_INLINE])dnl
- AC_REQUIRE([AC_TYPE_SIZE_T])dnl
- AC_REQUIRE([gl_AC_HEADER_STDINT_H])
- AC_REQUIRE([AC_FUNC_ALLOCA])dnl
- AC_REQUIRE([AC_FUNC_MMAP])dnl
- AC_REQUIRE([gt_INTDIV0])dnl
- AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
- AC_REQUIRE([gt_INTTYPES_PRI])dnl
- AC_REQUIRE([gl_LOCK])dnl
-
- AC_TRY_LINK(
- [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1;
}],
- [],
- [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
- [Define to 1 if the compiler understands __builtin_expect.])])
-
- AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
- AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
- stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
- argz_next __fsetlocking])
-
- dnl Use the *_unlocked functions only if they are declared.
- dnl (because some of them were defined without being declared in Solaris
- dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
- dnl on Solaris 2.5.1 to run on Solaris 2.6).
- dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
- gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
- gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
-
- AM_ICONV
-
- dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
- dnl and a _NL_LOCALE_NAME macro always.
- AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
- [AC_TRY_LINK([#include <langinfo.h>
- #include <locale.h>],
- [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
- gt_cv_nl_locale_name=yes,
- gt_cv_nl_locale_name=no)
- ])
- if test $gt_cv_nl_locale_name = yes; then
- AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
- [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME
macro if _GNU_SOURCE is defined.])
- fi
-
- dnl intl/plural.c is generated from intl/plural.y. It requires bison,
- dnl because plural.y uses bison specific features. It requires at least
- dnl bison-1.26 because earlier versions generate a plural.c that doesn't
- dnl compile.
- dnl bison is only needed for the maintainer (who touches plural.y). But in
- dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
- dnl the rule in general Makefile. Now, some people carelessly touch the
- dnl files or have a broken "make" program, hence the plural.c rule will
- dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
- dnl present or too old.
- AC_CHECK_PROGS([INTLBISON], [bison])
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
- dnl Found it, now check the version.
- AC_MSG_CHECKING([version of bison])
- changequote(<<,>>)dnl
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.*
\([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
- changequote([,])dnl
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
- AC_MSG_RESULT([$ac_prog_version])
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- fi
- ])
-
-
dnl Checks for special options needed on MacOS X.
dnl Defines INTL_MACOSX_LIBS.
AC_DEFUN([gt_INTL_MACOSX],
--- 360,365 ----
***************
*** 608,630 ****
])
! dnl gt_CHECK_DECL(FUNC, INCLUDES)
! dnl Check whether a function is declared.
! AC_DEFUN([gt_CHECK_DECL],
[
! AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
! [AC_TRY_COMPILE([$2], [
! #ifndef $1
! char *p = (char *) $1;
! #endif
! ], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
! if test $ac_cv_have_decl_$1 = yes; then
! gt_value=1
! else
! gt_value=0
! fi
! AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
! [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
])
--- 398,415 ----
])
! dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
! m4_define([gt_NEEDS_INIT],
[
! m4_divert_text([DEFAULTS], [gt_needs=])
! m4_define([gt_NEEDS_INIT], [])
! ])
!
!
! dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
! AC_DEFUN([AM_GNU_GETTEXT_NEED],
! [
! m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
])
diff -c -3 -r1.6 intmax.m4
*** m4/intmax.m4 28 Sep 2006 20:18:27 -0000 1.6
--- m4/intmax.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # intmax.m4 serial 3 (gettext-0.15.1)
dnl Copyright (C) 2002-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,
--- 1,4 ----
! # intmax.m4 serial 3 (gettext-0.16)
dnl Copyright (C) 2002-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,
diff -c -3 -r1.7 inttypes-pri.m4
*** m4/inttypes-pri.m4 18 Sep 2006 19:23:59 -0000 1.7
--- m4/inttypes-pri.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # inttypes-pri.m4 serial 4 (gettext-0.15.1)
dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # inttypes-pri.m4 serial 4 (gettext-0.16)
dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff -c -3 -r1.13 lib-link.m4
*** m4/lib-link.m4 4 Sep 2006 11:54:06 -0000 1.13
--- m4/lib-link.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # lib-link.m4 serial 9 (gettext-0.15.1)
dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # lib-link.m4 serial 9 (gettext-0.16)
dnl Copyright (C) 2001-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff -c -3 -r1.8 lock.m4
*** m4/lock.m4 4 Oct 2006 16:38:45 -0000 1.8
--- m4/lock.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # lock.m4 serial 6 (gettext-0.15.1)
dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # lock.m4 serial 6 (gettext-0.16)
dnl Copyright (C) 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
diff -c -3 -r1.5 signalblocking.m4
*** m4/signalblocking.m4 17 Oct 2006 14:54:07 -0000 1.5
--- m4/signalblocking.m4 27 Oct 2006 13:59:39 -0000
***************
*** 1,4 ****
! # signalblocking.m4 serial 4 (gettext-0.15.1)
dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
--- 1,4 ----
! # signalblocking.m4 serial 4
dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
Index: modules/gettext
===================================================================
RCS file: /sources/gnulib/gnulib/modules/gettext,v
retrieving revision 1.14
diff -c -3 -r1.14 gettext
*** modules/gettext 22 Jul 2006 13:13:09 -0000 1.14
--- modules/gettext 27 Oct 2006 13:59:39 -0000
***************
*** 8,16 ****
m4/glibc21.m4
m4/iconv.m4
m4/intdiv0.m4
m4/intmax.m4
m4/inttypes_h.m4
- m4/inttypes-h.m4
m4/inttypes-pri.m4
m4/lcmessage.m4
m4/lock.m4
--- 8,17 ----
m4/glibc21.m4
m4/iconv.m4
m4/intdiv0.m4
+ m4/intl.m4
+ m4/intldir.m4
m4/intmax.m4
m4/inttypes_h.m4
m4/inttypes-pri.m4
m4/lcmessage.m4
m4/lock.m4
***************
*** 20,26 ****
m4/po.m4
m4/printf-posix.m4
m4/progtest.m4
- m4/signed.m4
m4/size_max.m4
m4/stdint_h.m4
m4/uintmax_t.m4
--- 21,26 ----
*** /dev/null 2006-05-02 08:46:16.000000000 +0200
--- m4/intl.m4 2006-10-24 22:59:20.000000000 +0200
***************
*** 0 ****
--- 1,259 ----
+ # intl.m4 serial 3 (gettext-0.16)
+ dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ dnl
+ dnl This file can can be used in projects which are not available under
+ dnl the GNU General Public License or the GNU Library General Public
+ dnl License but which still want to provide support for the GNU gettext
+ dnl functionality.
+ dnl Please note that the actual code of the GNU gettext library is covered
+ dnl by the GNU Library General Public License, and the rest of the GNU
+ dnl gettext package package is covered by the GNU General Public License.
+ dnl They are *not* in the public domain.
+
+ dnl Authors:
+ dnl Ulrich Drepper <address@hidden>, 1995-2000.
+ dnl Bruno Haible <address@hidden>, 2000-2006.
+
+ AC_PREREQ(2.52)
+
+ 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
+ AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake
+ AC_REQUIRE([AC_PROG_CC])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ AC_REQUIRE([gt_GLIBC2])dnl
+ AC_REQUIRE([AC_PROG_RANLIB])dnl
+ AC_REQUIRE([gl_VISIBILITY])dnl
+ AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
+ AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
+ AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
+ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
+ AC_REQUIRE([gt_TYPE_WINT_T])dnl
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
+ AC_REQUIRE([gt_TYPE_INTMAX_T])
+ AC_REQUIRE([gt_PRINTF_POSIX])
+ AC_REQUIRE([gl_GLIBC21])dnl
+ AC_REQUIRE([gl_XSIZE])dnl
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
+
+ AC_CHECK_TYPE([ptrdiff_t], ,
+ [AC_DEFINE([ptrdiff_t], [long],
+ [Define as the type of the result of subtracting two pointers, if the
system doesn't define it.])
+ ])
+ AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
+ AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])
+
+ dnl Use the _snprintf function only if it is declared (because on NetBSD it
+ dnl is defined as a weak alias of snprintf; we prefer to use the latter).
+ gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
+ gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
+
+ dnl Use the *_unlocked functions only if they are declared.
+ dnl (because some of them were defined without being declared in Solaris
+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+ gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
+
+ case $gt_cv_func_printf_posix in
+ *yes) HAVE_POSIX_PRINTF=1 ;;
+ *) HAVE_POSIX_PRINTF=0 ;;
+ esac
+ AC_SUBST([HAVE_POSIX_PRINTF])
+ if test "$ac_cv_func_asprintf" = yes; then
+ HAVE_ASPRINTF=1
+ else
+ HAVE_ASPRINTF=0
+ fi
+ AC_SUBST([HAVE_ASPRINTF])
+ if test "$ac_cv_func_snprintf" = yes; then
+ HAVE_SNPRINTF=1
+ else
+ HAVE_SNPRINTF=0
+ fi
+ AC_SUBST([HAVE_SNPRINTF])
+ if test "$ac_cv_func_wprintf" = yes; then
+ HAVE_WPRINTF=1
+ else
+ HAVE_WPRINTF=0
+ fi
+ AC_SUBST([HAVE_WPRINTF])
+
+ AM_LANGINFO_CODESET
+ gt_LC_MESSAGES
+
+ dnl Compilation on mingw and Cygwin needs special Makefile rules, because
+ dnl 1. when we install a shared library, we must arrange to export
+ dnl auxiliary pointer variables for every exported variable,
+ dnl 2. when we install a shared library and a static library simultaneously,
+ dnl the include file specifies __declspec(dllimport) and therefore we
+ dnl must arrange to define the auxiliary pointer variables for the
+ dnl exported variables _also_ in the static library.
+ if test "$enable_shared" = yes; then
+ case "$host_os" in
+ cygwin*) is_woe32dll=yes ;;
+ *) is_woe32dll=no ;;
+ esac
+ else
+ is_woe32dll=no
+ fi
+ WOE32DLL=$is_woe32dll
+ AC_SUBST([WOE32DLL])
+
+ dnl Rename some macros and functions used for locking.
+ AH_BOTTOM([
+ #define __libc_lock_t gl_lock_t
+ #define __libc_lock_define gl_lock_define
+ #define __libc_lock_define_initialized gl_lock_define_initialized
+ #define __libc_lock_init gl_lock_init
+ #define __libc_lock_lock gl_lock_lock
+ #define __libc_lock_unlock gl_lock_unlock
+ #define __libc_lock_recursive_t gl_recursive_lock_t
+ #define __libc_lock_define_recursive gl_recursive_lock_define
+ #define __libc_lock_define_initialized_recursive
gl_recursive_lock_define_initialized
+ #define __libc_lock_init_recursive gl_recursive_lock_init
+ #define __libc_lock_lock_recursive gl_recursive_lock_lock
+ #define __libc_lock_unlock_recursive gl_recursive_lock_unlock
+ #define glthread_in_use libintl_thread_in_use
+ #define glthread_lock_init libintl_lock_init
+ #define glthread_lock_lock libintl_lock_lock
+ #define glthread_lock_unlock libintl_lock_unlock
+ #define glthread_lock_destroy libintl_lock_destroy
+ #define glthread_rwlock_init libintl_rwlock_init
+ #define glthread_rwlock_rdlock libintl_rwlock_rdlock
+ #define glthread_rwlock_wrlock libintl_rwlock_wrlock
+ #define glthread_rwlock_unlock libintl_rwlock_unlock
+ #define glthread_rwlock_destroy libintl_rwlock_destroy
+ #define glthread_recursive_lock_init libintl_recursive_lock_init
+ #define glthread_recursive_lock_lock libintl_recursive_lock_lock
+ #define glthread_recursive_lock_unlock libintl_recursive_lock_unlock
+ #define glthread_recursive_lock_destroy libintl_recursive_lock_destroy
+ #define glthread_once libintl_once
+ #define glthread_once_call libintl_once_call
+ #define glthread_once_singlethreaded libintl_once_singlethreaded
+ ])
+ ])
+
+
+ dnl Checks for the core files of the intl subdirectory:
+ dnl dcigettext.c
+ dnl eval-plural.h
+ dnl explodename.c
+ dnl finddomain.c
+ dnl gettextP.h
+ dnl gmo.h
+ dnl hash-string.h hash-string.c
+ dnl l10nflist.c
+ dnl libgnuintl.h.in (except the *printf stuff)
+ dnl loadinfo.h
+ dnl loadmsgcat.c
+ dnl localealias.c
+ dnl log.c
+ dnl plural-exp.h plural-exp.c
+ dnl plural.y
+ dnl Used by libglocale.
+ AC_DEFUN([gt_INTL_SUBDIR_CORE],
+ [
+ AC_REQUIRE([AC_C_INLINE])dnl
+ AC_REQUIRE([AC_TYPE_SIZE_T])dnl
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
+ AC_REQUIRE([AC_FUNC_ALLOCA])dnl
+ AC_REQUIRE([AC_FUNC_MMAP])dnl
+ AC_REQUIRE([gt_INTDIV0])dnl
+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
+ AC_REQUIRE([gt_INTTYPES_PRI])dnl
+ AC_REQUIRE([gl_LOCK])dnl
+
+ AC_TRY_LINK(
+ [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1;
}],
+ [],
+ [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,
+ [Define to 1 if the compiler understands __builtin_expect.])])
+
+ AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+ AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
+ stpcpy strcasecmp strdup strtoul tsearch argz_count argz_stringify \
+ argz_next __fsetlocking])
+
+ dnl Use the *_unlocked functions only if they are declared.
+ dnl (because some of them were defined without being declared in Solaris
+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
+ gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
+ gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
+
+ AM_ICONV
+
+ dnl glibc >= 2.4 has a NL_LOCALE_NAME macro when _GNU_SOURCE is defined,
+ dnl and a _NL_LOCALE_NAME macro always.
+ AC_CACHE_CHECK([for NL_LOCALE_NAME macro], gt_cv_nl_locale_name,
+ [AC_TRY_LINK([#include <langinfo.h>
+ #include <locale.h>],
+ [char* cs = nl_langinfo(_NL_LOCALE_NAME(LC_MESSAGES));],
+ gt_cv_nl_locale_name=yes,
+ gt_cv_nl_locale_name=no)
+ ])
+ if test $gt_cv_nl_locale_name = yes; then
+ AC_DEFINE(HAVE_NL_LOCALE_NAME, 1,
+ [Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME
macro if _GNU_SOURCE is defined.])
+ fi
+
+ dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+ dnl because plural.y uses bison specific features. It requires at least
+ dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+ dnl compile.
+ dnl bison is only needed for the maintainer (who touches plural.y). But in
+ dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+ dnl the rule in general Makefile. Now, some people carelessly touch the
+ dnl files or have a broken "make" program, hence the plural.c rule will
+ dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+ dnl present or too old.
+ AC_CHECK_PROGS([INTLBISON], [bison])
+ if test -z "$INTLBISON"; then
+ ac_verc_fail=yes
+ else
+ dnl Found it, now check the version.
+ AC_MSG_CHECKING([version of bison])
+ changequote(<<,>>)dnl
+ ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.*
\([0-9]*\.[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+ 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
+ changequote([,])dnl
+ ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+ *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+ esac
+ AC_MSG_RESULT([$ac_prog_version])
+ fi
+ if test $ac_verc_fail = yes; then
+ INTLBISON=:
+ fi
+ ])
+
+
+ dnl gt_CHECK_DECL(FUNC, INCLUDES)
+ dnl Check whether a function is declared.
+ AC_DEFUN([gt_CHECK_DECL],
+ [
+ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
+ [AC_TRY_COMPILE([$2], [
+ #ifndef $1
+ char *p = (char *) $1;
+ #endif
+ ], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
+ if test $ac_cv_have_decl_$1 = yes; then
+ gt_value=1
+ else
+ gt_value=0
+ fi
+ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
+ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
+ ])
*** /dev/null 2006-05-02 08:46:16.000000000 +0200
--- m4/intldir.m4 2006-10-24 22:59:17.000000000 +0200
***************
*** 0 ****
--- 1,19 ----
+ # intldir.m4 serial 1 (gettext-0.16)
+ dnl Copyright (C) 2006 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+ dnl
+ dnl This file can can be used in projects which are not available under
+ dnl the GNU General Public License or the GNU Library General Public
+ dnl License but which still want to provide support for the GNU gettext
+ dnl functionality.
+ dnl Please note that the actual code of the GNU gettext library is covered
+ dnl by the GNU Library General Public License, and the rest of the GNU
+ dnl gettext package package is covered by the GNU General Public License.
+ dnl They are *not* in the public domain.
+
+ AC_PREREQ(2.52)
+
+ dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory.
+ AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], [])
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- update to gettext-0.16,
Bruno Haible <=