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

Diff for /embedaddon/confuse/m4/gettext.m4 between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2017/01/24 14:48:55 version 1.1.1.2, 2021/03/17 00:49:17
Line 1 Line 1
# gettext.m4 serial 59 (gettext-0.16.1)# gettext.m4 serial 66 (gettext-0.18.2)
dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.dnl Copyright (C) 1995-2013 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.
Line 15  dnl They are *not* in the public domain. Line 15  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 95  AC_DEFUN([AM_GNU_GETTEXT], Line 97  AC_DEFUN([AM_GNU_GETTEXT],
     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 123  AC_DEFUN([AM_GNU_GETTEXT], Line 125  AC_DEFUN([AM_GNU_GETTEXT],
     gt_use_preinstalled_gnugettext=no      gt_use_preinstalled_gnugettext=no
     ifelse(gt_included_intl, yes, [      ifelse(gt_included_intl, yes, [
       AC_MSG_CHECKING([whether included gettext is requested])        AC_MSG_CHECKING([whether included gettext is requested])
      AC_ARG_WITH(included-gettext,      AC_ARG_WITH([included-gettext],
         [  --with-included-gettext use the GNU gettext library included here],          [  --with-included-gettext use the GNU gettext library included here],
         nls_cv_force_use_gnu_gettext=$withval,          nls_cv_force_use_gnu_gettext=$withval,
         nls_cv_force_use_gnu_gettext=no)          nls_cv_force_use_gnu_gettext=no)
      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
   
       nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"        nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
       if test "$nls_cv_force_use_gnu_gettext" != "yes"; then        if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
Line 155  changequote([,])dnl Line 157  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(
             [AC_LANG_PROGRAM(
                [[
 #include <libintl.h>
 $gt_revision_test_code  $gt_revision_test_code
 extern int _nl_msg_cat_cntr;  extern int _nl_msg_cat_cntr;
extern int *_nl_domain_bindings;],extern int *_nl_domain_bindings;
            [bindtextdomain ("", "");               ]],
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_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=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])              [eval "$gt_func_gnugettext_libc=no"])])
   
Line 181  return * gettext ("")$gt_expression_test_code + _nl_ms Line 189  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(
               [AC_LANG_PROGRAM(
                  [[
 #include <libintl.h>
 $gt_revision_test_code  $gt_revision_test_code
 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 ("", "");                 ]],
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],                 [[
 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=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(
                 [AC_LANG_PROGRAM(
                    [[
 #include <libintl.h>
 $gt_revision_test_code  $gt_revision_test_code
 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 ("", "");                   ]],
return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")],                   [[
               [LIBINTL="$LIBINTL $LIBICONV"bindtextdomain ("", "");
                LTLIBINTL="$LTLIBINTL $LTLIBICONV"return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
                eval "$gt_func_gnugettext_libintl=yes"                   ]])],
               ])                [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 267  return * gettext ("")$gt_expression_test_code + _nl_ms Line 287  return * gettext ("")$gt_expression_test_code + _nl_ms
   
     if test "$gt_use_preinstalled_gnugettext" = "yes" \      if test "$gt_use_preinstalled_gnugettext" = "yes" \
        || test "$nls_cv_use_gnu_gettext" = "yes"; then         || test "$nls_cv_use_gnu_gettext" = "yes"; then
      AC_DEFINE(ENABLE_NLS, 1,      AC_DEFINE([ENABLE_NLS], [1],
         [Define to 1 if translation of program messages to the user's native language          [Define to 1 if translation of program messages to the user's native language
    is requested.])     is requested.])
     else      else
Line 301  return * gettext ("")$gt_expression_test_code + _nl_ms Line 321  return * gettext ("")$gt_expression_test_code + _nl_ms
       fi        fi
   
       dnl For backward compatibility. Some packages may be using this.        dnl For backward compatibility. Some packages may be using this.
      AC_DEFINE(HAVE_GETTEXT, 1,      AC_DEFINE([HAVE_GETTEXT], [1],
        [Define if the GNU gettext() function is already present or preinstalled.])         [Define if the GNU gettext() function is already present or preinstalled.])
      AC_DEFINE(HAVE_DCGETTEXT, 1,      AC_DEFINE([HAVE_DCGETTEXT], [1],
        [Define if the GNU dcgettext() function is already present or preinstalled.])         [Define if the GNU dcgettext() function is already present or preinstalled.])
     fi      fi
   
Line 319  return * gettext ("")$gt_expression_test_code + _nl_ms Line 339  return * gettext ("")$gt_expression_test_code + _nl_ms
     fi      fi
   
     dnl Make all variables we use known to autoconf.      dnl Make all variables we use known to autoconf.
    AC_SUBST(BUILD_INCLUDED_LIBINTL)    AC_SUBST([BUILD_INCLUDED_LIBINTL])
    AC_SUBST(USE_INCLUDED_LIBINTL)    AC_SUBST([USE_INCLUDED_LIBINTL])
    AC_SUBST(CATOBJEXT)    AC_SUBST([CATOBJEXT])
   
     dnl For backward compatibility. Some configure.ins may be using this.      dnl For backward compatibility. Some configure.ins may be using this.
     nls_cv_header_intl=      nls_cv_header_intl=
Line 329  return * gettext ("")$gt_expression_test_code + _nl_ms Line 349  return * gettext ("")$gt_expression_test_code + _nl_ms
   
     dnl For backward compatibility. Some Makefiles may be using this.      dnl For backward compatibility. Some Makefiles may be using this.
     DATADIRNAME=share      DATADIRNAME=share
    AC_SUBST(DATADIRNAME)    AC_SUBST([DATADIRNAME])
   
     dnl For backward compatibility. Some Makefiles may be using this.      dnl For backward compatibility. Some Makefiles may be using this.
     INSTOBJEXT=.mo      INSTOBJEXT=.mo
    AC_SUBST(INSTOBJEXT)    AC_SUBST([INSTOBJEXT])
   
     dnl For backward compatibility. Some Makefiles may be using this.      dnl For backward compatibility. Some Makefiles may be using this.
     GENCAT=gencat      GENCAT=gencat
    AC_SUBST(GENCAT)    AC_SUBST([GENCAT])
   
     dnl For backward compatibility. Some Makefiles may be using this.      dnl For backward compatibility. Some Makefiles may be using this.
     INTLOBJS=      INTLOBJS=
     if test "$USE_INCLUDED_LIBINTL" = yes; then      if test "$USE_INCLUDED_LIBINTL" = yes; then
       INTLOBJS="\$(GETTOBJS)"        INTLOBJS="\$(GETTOBJS)"
     fi      fi
    AC_SUBST(INTLOBJS)    AC_SUBST([INTLOBJS])
   
     dnl Enable libtool support if the surrounding package wishes it.      dnl Enable libtool support if the surrounding package wishes it.
     INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix      INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
    AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)    AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
   ])    ])
   
   dnl For backward compatibility. Some Makefiles may be using this.    dnl For backward compatibility. Some Makefiles may be using this.
   INTLLIBS="$LIBINTL"    INTLLIBS="$LIBINTL"
  AC_SUBST(INTLLIBS)  AC_SUBST([INTLLIBS])
   
   dnl Make all documented variables known to autoconf.    dnl Make all documented variables known to autoconf.
  AC_SUBST(LIBINTL)  AC_SUBST([LIBINTL])
  AC_SUBST(LTLIBINTL)  AC_SUBST([LTLIBINTL])
  AC_SUBST(POSUB)  AC_SUBST([POSUB])
]) 
 
 
dnl Checks for special options needed on MacOS X. 
dnl Defines INTL_MACOSX_LIBS. 
AC_DEFUN([gt_INTL_MACOSX], 
[ 
  dnl Check for API introduced in MacOS X 10.2. 
  AC_CACHE_CHECK([for CFPreferencesCopyAppValue], 
    gt_cv_func_CFPreferencesCopyAppValue, 
    [gt_save_LIBS="$LIBS" 
     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 
     AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], 
       [CFPreferencesCopyAppValue(NULL, NULL)], 
       [gt_cv_func_CFPreferencesCopyAppValue=yes], 
       [gt_cv_func_CFPreferencesCopyAppValue=no]) 
     LIBS="$gt_save_LIBS"]) 
  if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then 
    AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, 
      [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) 
  fi 
  dnl Check for API introduced in MacOS X 10.3. 
  AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, 
    [gt_save_LIBS="$LIBS" 
     LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 
     AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], 
       [gt_cv_func_CFLocaleCopyCurrent=yes], 
       [gt_cv_func_CFLocaleCopyCurrent=no]) 
     LIBS="$gt_save_LIBS"]) 
  if test $gt_cv_func_CFLocaleCopyCurrent = yes; then 
    AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, 
      [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) 
  fi 
  INTL_MACOSX_LIBS= 
  if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then 
    INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" 
  fi 
  AC_SUBST([INTL_MACOSX_LIBS]) 
 ])  ])
   
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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