|
|
@@ -1,5 +1,5 @@
|
|
|
-# intl.m4 serial 3 (gettext-0.16)
|
|
|
-dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.
|
|
|
+# intl.m4 serial 27 (gettext-0.19)
|
|
|
+dnl Copyright (C) 1995-2014 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.
|
|
|
@@ -15,9 +15,9 @@ dnl They are *not* in the public domain.
|
|
|
|
|
|
dnl Authors:
|
|
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
|
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.
|
|
|
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009.
|
|
|
|
|
|
-AC_PREREQ(2.52)
|
|
|
+AC_PREREQ([2.60])
|
|
|
|
|
|
dnl Checks for all prerequisites of the intl subdirectory,
|
|
|
dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
|
|
|
@@ -25,7 +25,7 @@ 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_MKDIR_P])dnl
|
|
|
AC_REQUIRE([AC_PROG_CC])dnl
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
AC_REQUIRE([gt_GLIBC2])dnl
|
|
|
@@ -33,7 +33,6 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
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])
|
|
|
@@ -41,26 +40,36 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
AC_REQUIRE([gt_PRINTF_POSIX])
|
|
|
AC_REQUIRE([gl_GLIBC21])dnl
|
|
|
AC_REQUIRE([gl_XSIZE])dnl
|
|
|
+ AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
|
|
|
AC_REQUIRE([gt_INTL_MACOSX])dnl
|
|
|
+ AC_REQUIRE([gl_EXTERN_INLINE])dnl
|
|
|
+ AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
|
|
|
+
|
|
|
+ dnl Support for automake's --enable-silent-rules.
|
|
|
+ case "$enable_silent_rules" in
|
|
|
+ yes) INTL_DEFAULT_VERBOSITY=0;;
|
|
|
+ no) INTL_DEFAULT_VERBOSITY=1;;
|
|
|
+ *) INTL_DEFAULT_VERBOSITY=1;;
|
|
|
+ esac
|
|
|
+ AC_SUBST([INTL_DEFAULT_VERBOSITY])
|
|
|
|
|
|
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])
|
|
|
+ AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h])
|
|
|
+ AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
|
|
|
+ snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
|
|
|
|
|
|
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>])
|
|
|
+ AC_CHECK_DECLS([_snprintf, _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>])
|
|
|
+ AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>])
|
|
|
|
|
|
case $gt_cv_func_printf_posix in
|
|
|
*yes) HAVE_POSIX_PRINTF=1 ;;
|
|
|
@@ -79,6 +88,12 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
HAVE_SNPRINTF=0
|
|
|
fi
|
|
|
AC_SUBST([HAVE_SNPRINTF])
|
|
|
+ if test "$ac_cv_func_newlocale" = yes; then
|
|
|
+ HAVE_NEWLOCALE=1
|
|
|
+ else
|
|
|
+ HAVE_NEWLOCALE=0
|
|
|
+ fi
|
|
|
+ AC_SUBST([HAVE_NEWLOCALE])
|
|
|
if test "$ac_cv_func_wprintf" = yes; then
|
|
|
HAVE_WPRINTF=1
|
|
|
else
|
|
|
@@ -98,7 +113,7 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
dnl exported variables _also_ in the static library.
|
|
|
if test "$enable_shared" = yes; then
|
|
|
case "$host_os" in
|
|
|
- cygwin*) is_woe32dll=yes ;;
|
|
|
+ mingw* | cygwin*) is_woe32dll=yes ;;
|
|
|
*) is_woe32dll=no ;;
|
|
|
esac
|
|
|
else
|
|
|
@@ -107,6 +122,31 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
WOE32DLL=$is_woe32dll
|
|
|
AC_SUBST([WOE32DLL])
|
|
|
|
|
|
+ dnl On mingw and Cygwin, we can activate special Makefile rules which add
|
|
|
+ dnl version information to the shared libraries and executables.
|
|
|
+ case "$host_os" in
|
|
|
+ mingw* | cygwin*) is_woe32=yes ;;
|
|
|
+ *) is_woe32=no ;;
|
|
|
+ esac
|
|
|
+ WOE32=$is_woe32
|
|
|
+ AC_SUBST([WOE32])
|
|
|
+ if test $WOE32 = yes; then
|
|
|
+ dnl Check for a program that compiles Windows resource files.
|
|
|
+ AC_CHECK_TOOL([WINDRES], [windres])
|
|
|
+ fi
|
|
|
+
|
|
|
+ dnl Determine whether when creating a library, "-lc" should be passed to
|
|
|
+ dnl libtool or not. On many platforms, it is required for the libtool option
|
|
|
+ dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
|
|
|
+ dnl in the *.la files - makes it impossible to create multithreaded programs,
|
|
|
+ dnl because libtool also reorders the -lc to come before the -pthread, and
|
|
|
+ dnl this disables pthread_create() <http://docs.hp.com/en/1896/pthreads.html>.
|
|
|
+ case "$host_os" in
|
|
|
+ hpux*) LTLIBC="" ;;
|
|
|
+ *) LTLIBC="-lc" ;;
|
|
|
+ esac
|
|
|
+ AC_SUBST([LTLIBC])
|
|
|
+
|
|
|
dnl Rename some macros and functions used for locking.
|
|
|
AH_BOTTOM([
|
|
|
#define __libc_lock_t gl_lock_t
|
|
|
@@ -122,22 +162,31 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
#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_lock_init_func libintl_lock_init_func
|
|
|
+#define glthread_lock_lock_func libintl_lock_lock_func
|
|
|
+#define glthread_lock_unlock_func libintl_lock_unlock_func
|
|
|
+#define glthread_lock_destroy_func libintl_lock_destroy_func
|
|
|
+#define glthread_rwlock_init_multithreaded libintl_rwlock_init_multithreaded
|
|
|
+#define glthread_rwlock_init_func libintl_rwlock_init_func
|
|
|
+#define glthread_rwlock_rdlock_multithreaded libintl_rwlock_rdlock_multithreaded
|
|
|
+#define glthread_rwlock_rdlock_func libintl_rwlock_rdlock_func
|
|
|
+#define glthread_rwlock_wrlock_multithreaded libintl_rwlock_wrlock_multithreaded
|
|
|
+#define glthread_rwlock_wrlock_func libintl_rwlock_wrlock_func
|
|
|
+#define glthread_rwlock_unlock_multithreaded libintl_rwlock_unlock_multithreaded
|
|
|
+#define glthread_rwlock_unlock_func libintl_rwlock_unlock_func
|
|
|
+#define glthread_rwlock_destroy_multithreaded libintl_rwlock_destroy_multithreaded
|
|
|
+#define glthread_rwlock_destroy_func libintl_rwlock_destroy_func
|
|
|
+#define glthread_recursive_lock_init_multithreaded libintl_recursive_lock_init_multithreaded
|
|
|
+#define glthread_recursive_lock_init_func libintl_recursive_lock_init_func
|
|
|
+#define glthread_recursive_lock_lock_multithreaded libintl_recursive_lock_lock_multithreaded
|
|
|
+#define glthread_recursive_lock_lock_func libintl_recursive_lock_lock_func
|
|
|
+#define glthread_recursive_lock_unlock_multithreaded libintl_recursive_lock_unlock_multithreaded
|
|
|
+#define glthread_recursive_lock_unlock_func libintl_recursive_lock_unlock_func
|
|
|
+#define glthread_recursive_lock_destroy_multithreaded libintl_recursive_lock_destroy_multithreaded
|
|
|
+#define glthread_recursive_lock_destroy_func libintl_recursive_lock_destroy_func
|
|
|
+#define glthread_once_func libintl_once_func
|
|
|
#define glthread_once_singlethreaded libintl_once_singlethreaded
|
|
|
+#define glthread_once_multithreaded libintl_once_multithreaded
|
|
|
])
|
|
|
])
|
|
|
|
|
|
@@ -171,45 +220,29 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
|
|
|
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,
|
|
|
+ AC_LINK_IFELSE(
|
|
|
+ [AC_LANG_PROGRAM(
|
|
|
+ [[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])
|
|
|
+ stpcpy strcasecmp strdup strtoul tsearch uselocale 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>])
|
|
|
+ AC_CHECK_DECLS([feof_unlocked, 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-2.7 for %define api.pure.
|
|
|
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
|
|
|
@@ -226,7 +259,7 @@ 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].*)
|
|
|
+ 2.[7-9]* | [3-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;;
|
|
|
@@ -238,22 +271,28 @@ changequote([,])dnl
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
+dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
|
|
|
+dnl gnulib-common.m4 as a fallback, if the project isn't using Gnulib.
|
|
|
+AC_DEFUN([gt_GL_ATTRIBUTE], [
|
|
|
+ m4_ifndef([gl_[]COMMON],
|
|
|
+ AH_VERBATIM([gt_gl_attribute],
|
|
|
+[/* Define as a marker that can be attached to declarations that might not
|
|
|
+ be used. This helps to reduce warnings, such as from
|
|
|
+ GCC -Wunused-parameter. */
|
|
|
+#ifndef _GL_UNUSED
|
|
|
+# if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
|
|
|
+# define _GL_UNUSED __attribute__ ((__unused__))
|
|
|
+# else
|
|
|
+# define _GL_UNUSED
|
|
|
+# endif
|
|
|
+#endif
|
|
|
|
|
|
-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;
|
|
|
+/* The __pure__ attribute was added in gcc 2.96. */
|
|
|
+#ifndef _GL_ATTRIBUTE_PURE
|
|
|
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
|
|
|
+# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
|
|
|
+# else
|
|
|
+# define _GL_ATTRIBUTE_PURE /* empty */
|
|
|
+# endif
|
|
|
#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.])
|
|
|
-])
|
|
|
+]))])
|
Christian Grothoff