[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.2

version 1.1.1.1, 2012/02/21 22:57:49 version 1.1.1.2, 2012/05/29 09:29:44
Line 1 Line 1
# gettext.m4 serial 62 (gettext-0.18)# gettext.m4 serial 64 (gettext-0.18.2)
dnl Copyright (C) 1995-2009 Free Software Foundation, Inc.dnl Copyright (C) 1995-2011 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 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 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"])
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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