[BACK]Return to intl.m4 CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libiconv / srcm4

Diff for /embedaddon/libiconv/srcm4/intl.m4 between versions 1.1 and 1.1.1.3

version 1.1, 2012/02/21 22:57:49 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
# intl.m4 serial 8 (gettext-0.17)# intl.m4 serial 34 (gettext-0.20)
dnl Copyright (C) 1995-2007 Free Software Foundation, Inc.dnl Copyright (C) 1995-2014, 2016-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation  dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,  dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.  dnl with or without modifications, as long as this notice is preserved.
 dnl  dnl
dnl This file can can be used in projects which are not available underdnl This file can be used in projects which are not available under
 dnl the GNU General Public License or the GNU Library General Public  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 License but which still want to provide support for the GNU gettext
 dnl functionality.  dnl functionality.
 dnl Please note that the actual code of the GNU gettext library is covered  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 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 gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.  dnl They are *not* in the public domain.
   
 dnl Authors:  dnl Authors:
 dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.  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 Checks for all prerequisites of the intl subdirectory,
 dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,  dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
Line 25  dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LI Line 25  dnl            USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LI
 AC_DEFUN([AM_INTL_SUBDIR],  AC_DEFUN([AM_INTL_SUBDIR],
 [  [
   AC_REQUIRE([AC_PROG_INSTALL])dnl    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_PROG_CC])dnl
   AC_REQUIRE([AC_CANONICAL_HOST])dnl    AC_REQUIRE([AC_CANONICAL_HOST])dnl
   AC_REQUIRE([gt_GLIBC2])dnl    AC_REQUIRE([gt_GLIBC2])dnl
   AC_REQUIRE([AC_PROG_RANLIB])dnl  
   AC_REQUIRE([gl_VISIBILITY])dnl    AC_REQUIRE([gl_VISIBILITY])dnl
   AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl    AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
   AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl    AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
Line 40  AC_DEFUN([AM_INTL_SUBDIR], Line 39  AC_DEFUN([AM_INTL_SUBDIR],
   AC_REQUIRE([gt_PRINTF_POSIX])    AC_REQUIRE([gt_PRINTF_POSIX])
   AC_REQUIRE([gl_GLIBC21])dnl    AC_REQUIRE([gl_GLIBC21])dnl
   AC_REQUIRE([gl_XSIZE])dnl    AC_REQUIRE([gl_XSIZE])dnl
     AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
     AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
   AC_REQUIRE([gt_INTL_MACOSX])dnl    AC_REQUIRE([gt_INTL_MACOSX])dnl
     AC_REQUIRE([gl_EXTERN_INLINE])dnl
     AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
     AC_REQUIRE([AC_C_FLEXIBLE_ARRAY_MEMBER])dnl
   
     dnl In projects that use gnulib, use gl_PROG_AR_RANLIB.
     dnl The '][' hides this use from 'aclocal'.
     m4_ifdef([g][l_PROG_AR_RANLIB],
       [AC_REQUIRE([g][l_PROG_AR_RANLIB])],
       [AC_REQUIRE([AC_PROG_RANLIB])
        dnl Use Automake-documented default values for AR and ARFLAGS, but prefer
        dnl ${host}-ar over ar (useful for cross-compiling).
        AC_CHECK_TOOL([AR], [ar], [ar])
        if test -z "$ARFLAGS"; then
          ARFLAGS='cr'
        fi
        AC_SUBST([AR])
        AC_SUBST([ARFLAGS])
       ])
   
     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_CHECK_TYPE([ptrdiff_t], ,
     [AC_DEFINE([ptrdiff_t], [long],      [AC_DEFINE([ptrdiff_t], [long],
        [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])         [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_HEADERS([features.h stddef.h stdlib.h string.h])
  AC_CHECK_FUNCS([asprintf fwprintf putenv setenv setlocale snprintf wcslen])  AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
     snprintf strnlen uselocale wcslen wcsnlen mbrtowc wcrtomb])
   
   dnl Use the _snprintf function only if it is declared (because on NetBSD it    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).    dnl is defined as a weak alias of snprintf; we prefer to use the latter).
  gt_CHECK_DECL(_snprintf, [#include <stdio.h>])  AC_CHECK_DECLS([_snprintf, _snwprintf], , , [#include <stdio.h>])
  gt_CHECK_DECL(_snwprintf, [#include <stdio.h>]) 
   
   dnl Use the *_unlocked functions only if they are declared.    dnl Use the *_unlocked functions only if they are declared.
   dnl (because some of them were defined without being declared in Solaris    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 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 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.  AC_CHECK_DECLS([getc_unlocked], , , [#include <stdio.h>])
  gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>]) 
   
   case $gt_cv_func_printf_posix in    case $gt_cv_func_printf_posix in
     *yes) HAVE_POSIX_PRINTF=1 ;;      *yes) HAVE_POSIX_PRINTF=1 ;;
Line 78  AC_DEFUN([AM_INTL_SUBDIR], Line 104  AC_DEFUN([AM_INTL_SUBDIR],
     HAVE_SNPRINTF=0      HAVE_SNPRINTF=0
   fi    fi
   AC_SUBST([HAVE_SNPRINTF])    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    if test "$ac_cv_func_wprintf" = yes; then
     HAVE_WPRINTF=1      HAVE_WPRINTF=1
   else    else
Line 88  AC_DEFUN([AM_INTL_SUBDIR], Line 120  AC_DEFUN([AM_INTL_SUBDIR],
   AM_LANGINFO_CODESET    AM_LANGINFO_CODESET
   gt_LC_MESSAGES    gt_LC_MESSAGES
   
     if test $gt_nameless_locales = yes; then
       HAVE_NAMELESS_LOCALES=1
     else
       HAVE_NAMELESS_LOCALES=0
     fi
     AC_SUBST([HAVE_NAMELESS_LOCALES])
   
   dnl Compilation on mingw and Cygwin needs special Makefile rules, because    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 1. when we install a shared library, we must arrange to export
   dnl    auxiliary pointer variables for every exported variable,    dnl    auxiliary pointer variables for every exported variable,
Line 119  AC_DEFUN([AM_INTL_SUBDIR], Line 158  AC_DEFUN([AM_INTL_SUBDIR],
     AC_CHECK_TOOL([WINDRES], [windres])      AC_CHECK_TOOL([WINDRES], [windres])
   fi    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.    dnl Rename some macros and functions used for locking.
   AH_BOTTOM([    AH_BOTTOM([
 #define __libc_lock_t                   gl_lock_t  #define __libc_lock_t                   gl_lock_t
Line 146  AC_DEFUN([AM_INTL_SUBDIR], Line 173  AC_DEFUN([AM_INTL_SUBDIR],
 #define __libc_lock_lock_recursive                gl_recursive_lock_lock  #define __libc_lock_lock_recursive                gl_recursive_lock_lock
 #define __libc_lock_unlock_recursive              gl_recursive_lock_unlock  #define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
 #define glthread_in_use  libintl_thread_in_use  #define glthread_in_use  libintl_thread_in_use
#define glthread_lock_init     libintl_lock_init#define glthread_lock_init_func     libintl_lock_init_func
#define glthread_lock_lock     libintl_lock_lock#define glthread_lock_lock_func     libintl_lock_lock_func
#define glthread_lock_unlock   libintl_lock_unlock#define glthread_lock_unlock_func   libintl_lock_unlock_func
#define glthread_lock_destroy  libintl_lock_destroy#define glthread_lock_destroy_func  libintl_lock_destroy_func
#define glthread_rwlock_init     libintl_rwlock_init#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
#define glthread_rwlock_rdlock   libintl_rwlock_rdlock#define glthread_rwlock_init_func              libintl_rwlock_init_func
#define glthread_rwlock_wrlock   libintl_rwlock_wrlock#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
#define glthread_rwlock_unlock   libintl_rwlock_unlock#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
#define glthread_rwlock_destroy  libintl_rwlock_destroy#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
#define glthread_recursive_lock_init     libintl_recursive_lock_init#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
#define glthread_recursive_lock_lock     libintl_recursive_lock_lock#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
#define glthread_once                 libintl_once#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
#define glthread_once_call            libintl_once_call#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_singlethreaded  libintl_once_singlethreaded
   #define glthread_once_multithreaded   libintl_once_multithreaded
 ])  ])
 ])  ])
   
Line 195  AC_DEFUN([gt_INTL_SUBDIR_CORE], Line 231  AC_DEFUN([gt_INTL_SUBDIR_CORE],
   AC_REQUIRE([gt_INTTYPES_PRI])dnl    AC_REQUIRE([gt_INTTYPES_PRI])dnl
   AC_REQUIRE([gl_LOCK])dnl    AC_REQUIRE([gl_LOCK])dnl
   
  AC_TRY_LINK(  AC_LINK_IFELSE(
    [int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }],    [AC_LANG_PROGRAM(
    [],       [[int foo (int a) { a = __builtin_expect (a, 10); return a == 10 ? 0 : 1; }]],
    [AC_DEFINE([HAVE_BUILTIN_EXPECT], 1,       [[]])],
     [AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
        [Define to 1 if the compiler understands __builtin_expect.])])         [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_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
Line 210  AC_DEFUN([gt_INTL_SUBDIR_CORE], Line 247  AC_DEFUN([gt_INTL_SUBDIR_CORE],
   dnl (because some of them were defined without being declared in Solaris    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 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 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.  AC_CHECK_DECLS([feof_unlocked, fgets_unlocked], , , [#include <stdio.h>])
  gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>]) 
  gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>]) 
   
   AM_ICONV    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));  
        return !cs;  
       ],  
       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 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 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 bison-2.7 for %define api.pure.
  dnl compile. 
   dnl bison is only needed for the maintainer (who touches plural.y). But in    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 order to avoid separate Makefiles or --enable-maintainer-mode, we put
   dnl the rule in general Makefile. Now, some people carelessly touch the    dnl the rule in general Makefile. Now, some people carelessly touch the
Line 252  changequote(<<,>>)dnl Line 270  changequote(<<,>>)dnl
     ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
     case $ac_prog_version in      case $ac_prog_version in
       '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;        '') 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  changequote([,])dnl
          ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
       *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;        *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
Line 264  changequote([,])dnl Line 282  changequote([,])dnl
   fi    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)/* The __pure__ attribute was added in gcc 2.96.  */
dnl Check whether a function is declared.#ifndef _GL_ATTRIBUTE_PURE
AC_DEFUN([gt_CHECK_DECL],# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
[#  define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
  AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,# else
    [AC_TRY_COMPILE([$2], [#  define _GL_ATTRIBUTE_PURE /* empty */
#ifndef $1# endif
  char *p = (char *) $1; 
 #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.]) 
]) 
Removed from v.1.1  
changed lines
  Added in v.1.1.1.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>