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

Diff for /embedaddon/libiconv/srcm4/gettext.m4 between versions 1.1.1.1 and 1.1.1.3

version 1.1.1.1, 2012/02/21 22:57:49 version 1.1.1.3, 2021/03/17 13:38:46
Line 1 Line 1
# gettext.m4 serial 62 (gettext-0.18)# gettext.m4 serial 69 (gettext-0.20)
dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.dnl Copyright (C) 1995-2014, 2016, 2018-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-2006, 2008-2010.
   
 dnl Macro to add for using GNU gettext.  dnl Macro to add for using GNU gettext.
   
Line 35  dnl    will be ignored.  If NEEDSYMBOL is specified an Line 35  dnl    will be ignored.  If NEEDSYMBOL is specified an
 dnl    'need-formatstring-macros', then GNU gettext implementations that don't  dnl    'need-formatstring-macros', then GNU gettext implementations that don't
 dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.  dnl    support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
 dnl INTLDIR is used to find the intl libraries.  If empty,  dnl INTLDIR is used to find the intl libraries.  If empty,
dnl    the value `$(top_builddir)/intl/' is used.dnl    the value '$(top_builddir)/intl/' is used.
 dnl  dnl
 dnl The result of the configuration is one of three cases:  dnl The result of the configuration is one of three cases:
 dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled  dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
Line 60  AC_DEFUN([AM_GNU_GETTEXT], Line 60  AC_DEFUN([AM_GNU_GETTEXT],
   ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,    ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
     [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT      [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
 ])])])])])  ])])])])])
     ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
       [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
   ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,    ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
     [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT      [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
 ])])])])  ])])])])
Line 89  AC_DEFUN([AM_GNU_GETTEXT], Line 91  AC_DEFUN([AM_GNU_GETTEXT],
   dnl again, outside any 'if'. There are two solutions:    dnl again, outside any 'if'. There are two solutions:
   dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.    dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
   dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.    dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
  dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not  dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
  dnl documented, we avoid it. 
   ifelse(gt_included_intl, yes, , [    ifelse(gt_included_intl, yes, , [
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])      AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])    ])
   
  dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX    gt_INTL_MACOSX
   
   dnl Set USE_NLS.    dnl Set USE_NLS.
Line 155  changequote([,])dnl Line 156  changequote([,])dnl
         fi          fi
   
         AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],          AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
         [AC_TRY_LINK([#include <libintl.h>         [AC_LINK_IFELSE(
$gt_revision_test_code            [AC_LANG_PROGRAM(
                [[
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;  extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],extern int *_nl_domain_bindings;
            [bindtextdomain ("", "");#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings],#else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif
 $gt_revision_test_code
                ]],
                [[
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                ]])],
             [eval "$gt_func_gnugettext_libc=yes"],              [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])              [eval "$gt_func_gnugettext_libc=no"])])
   
Line 181  return * gettext ("")$gt_expression_test_code + _nl_ms Line 193  return * gettext ("")$gt_expression_test_code + _nl_ms
             gt_save_LIBS="$LIBS"              gt_save_LIBS="$LIBS"
             LIBS="$LIBS $LIBINTL"              LIBS="$LIBS $LIBINTL"
             dnl Now see whether libintl exists and does not depend on libiconv.              dnl Now see whether libintl exists and does not depend on libiconv.
            AC_TRY_LINK([#include <libintl.h>            AC_LINK_IFELSE(
$gt_revision_test_code              [AC_LANG_PROGRAM(
                  [[
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;  extern int _nl_msg_cat_cntr;
 extern  extern
 #ifdef __cplusplus  #ifdef __cplusplus
 "C"  "C"
 #endif  #endif
const char *_nl_expand_alias (const char *);],const char *_nl_expand_alias (const char *);
              [bindtextdomain ("", "");#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],#else
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
 #endif
 $gt_revision_test_code
                  ]],
                  [[
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                  ]])],
               [eval "$gt_func_gnugettext_libintl=yes"],                [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])                [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv.              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              if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
               LIBS="$LIBS $LIBICONV"                LIBS="$LIBS $LIBICONV"
              AC_TRY_LINK([#include <libintl.h>              AC_LINK_IFELSE(
$gt_revision_test_code                [AC_LANG_PROGRAM(
                    [[
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;  extern int _nl_msg_cat_cntr;
 extern  extern
 #ifdef __cplusplus  #ifdef __cplusplus
 "C"  "C"
 #endif  #endif
const char *_nl_expand_alias (const char *);],const char *_nl_expand_alias (const char *);
                [bindtextdomain ("", "");#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],#else
               [LIBINTL="$LIBINTL $LIBICONV"#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
                LTLIBINTL="$LTLIBINTL $LTLIBICONV"#endif
                eval "$gt_func_gnugettext_libintl=yes"$gt_revision_test_code
               ])                   ]],
                    [[
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                    ]])],
                 [LIBINTL="$LIBINTL $LIBICONV"
                  LTLIBINTL="$LTLIBINTL $LTLIBICONV"
                  eval "$gt_func_gnugettext_libintl=yes"
                 ])
             fi              fi
             CPPFLAGS="$gt_save_CPPFLAGS"              CPPFLAGS="$gt_save_CPPFLAGS"
             LIBS="$gt_save_LIBS"])              LIBS="$gt_save_LIBS"])
Line 379  AC_DEFUN([AM_GNU_GETTEXT_NEED], Line 413  AC_DEFUN([AM_GNU_GETTEXT_NEED],
   
 dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])  dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
 AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])  AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
   
   
   dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
   AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3

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