| gettext.m4 (flex-2.6.3) | : | gettext.m4 (flex-2.6.4) |
|---|
|
| # gettext.m4 serial 66 (gettext-0.18.2) | | # gettext.m4 serial 63 (gettext-0.18) |
| dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. | | dnl Copyright (C) 1995-2010 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 under | | dnl This file can 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 |
| | |
| skipping to change at line 38 | | skipping to change at line 38 |
|---|
| dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, | | dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, |
| dnl depending on --{enable,disable}-{shared,static} and on the presence of | | dnl depending on --{enable,disable}-{shared,static} and on the presence of |
| dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library | | dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library |
| dnl $(top_builddir)/intl/libintl.a will be created. | | dnl $(top_builddir)/intl/libintl.a will be created. |
| dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext | | dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext |
| dnl implementations (in libc or libintl) without the ngettext() function | | dnl implementations (in libc or libintl) without the ngettext() function |
| dnl will be ignored. If NEEDSYMBOL is specified and is | | dnl will be ignored. If NEEDSYMBOL is specified and is |
| 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 |
| dnl and used. | | dnl and used. |
| dnl Catalog format: GNU --> install in $(datadir) | | dnl Catalog format: GNU --> install in $(datadir) |
| dnl Catalog extension: .mo after installation, .gmo in source tree | | dnl Catalog extension: .mo after installation, .gmo in source tree |
| dnl 2) GNU gettext has been found in the system's C library. | | dnl 2) GNU gettext has been found in the system's C library. |
| dnl Catalog format: GNU --> install in $(datadir) | | dnl Catalog format: GNU --> install in $(datadir) |
| dnl Catalog extension: .mo after installation, .gmo in source tree | | dnl Catalog extension: .mo after installation, .gmo in source tree |
| dnl 3) No internationalization, always use English msgid. | | dnl 3) No internationalization, always use English msgid. |
| | |
| skipping to change at line 100 | | skipping to change at line 100 |
|---|
| dnl the configure script would need to contain the same shell code | | dnl the configure script would need to contain the same shell code |
| 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 only in autoconf >= 2.52 and not |
| dnl 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 Mac OS X, libintl requires linking with CoreFoundation. | | dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. |
| gt_INTL_MACOSX | | gt_INTL_MACOSX |
| | |
| dnl Set USE_NLS. | | dnl Set USE_NLS. |
| AC_REQUIRE([AM_NLS]) | | AC_REQUIRE([AM_NLS]) |
| | |
| ifelse(gt_included_intl, yes, [ | | ifelse(gt_included_intl, yes, [ |
| BUILD_INCLUDED_LIBINTL=no | | BUILD_INCLUDED_LIBINTL=no |
| USE_INCLUDED_LIBINTL=no | | USE_INCLUDED_LIBINTL=no |
| ]) | | ]) |
| LIBINTL= | | LIBINTL= |
| | |
| skipping to change at line 160 | | skipping to change at line 160 |
|---|
| else | | else |
| gt_revision_test_code= | | gt_revision_test_code= |
| fi | | fi |
| if test $gt_api_version -ge 2; then | | if test $gt_api_version -ge 2; then |
| gt_expression_test_code=' + * ngettext ("", "", 0)' | | gt_expression_test_code=' + * ngettext ("", "", 0)' |
| else | | else |
| gt_expression_test_code= | | gt_expression_test_code= |
| 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_LINK_IFELSE( | | [AC_TRY_LINK([#include <libintl.h> |
| [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_b |
| bindtextdomain ("", ""); | | indings], |
| return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b | | |
| indings | | |
| ]])], | | |
| [eval "$gt_func_gnugettext_libc=yes"], | | [eval "$gt_func_gnugettext_libc=yes"], |
| [eval "$gt_func_gnugettext_libc=no"])]) | | [eval "$gt_func_gnugettext_libc=no"])]) |
| | |
| if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes";
}; then | | if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes";
}; then |
| dnl Sometimes libintl requires libiconv, so first search for libiconv. | | dnl Sometimes libintl requires libiconv, so first search for libiconv. |
| ifelse(gt_included_intl, yes, , [ | | ifelse(gt_included_intl, yes, , [ |
| AM_ICONV_LINK | | AM_ICONV_LINK |
| ]) | | ]) |
| dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL | | dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL |
| dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) | | dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) |
| dnl because that would add "-liconv" to LIBINTL and LTLIBINTL | | dnl because that would add "-liconv" to LIBINTL and LTLIBINTL |
| dnl even if libiconv doesn't exist. | | dnl even if libiconv doesn't exist. |
| AC_LIB_LINKFLAGS_BODY([intl]) | | AC_LIB_LINKFLAGS_BODY([intl]) |
| AC_CACHE_CHECK([for GNU gettext in libintl], | | AC_CACHE_CHECK([for GNU gettext in libintl], |
| [$gt_func_gnugettext_libintl], | | [$gt_func_gnugettext_libintl], |
| [gt_save_CPPFLAGS="$CPPFLAGS" | | [gt_save_CPPFLAGS="$CPPFLAGS" |
| CPPFLAGS="$CPPFLAGS $INCINTL" | | CPPFLAGS="$CPPFLAGS $INCINTL" |
| 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_LINK_IFELSE( | | AC_TRY_LINK([#include <libintl.h> |
| [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_a |
| bindtextdomain ("", ""); | | lias ("")], |
| return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | | |
| lias ("") | | |
| ]])], | | |
| [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_LINK_IFELSE( | | AC_TRY_LINK([#include <libintl.h> |
| [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_a |
| bindtextdomain ("", ""); | | lias ("")], |
| return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a | | [LIBINTL="$LIBINTL $LIBICONV" |
| lias ("") | | LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
| ]])], | | 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"]) |
| fi | | fi |
| | |
| dnl If an already present or preinstalled GNU gettext() is found, | | dnl If an already present or preinstalled GNU gettext() is found, |
| dnl use it. But if this macro is used in GNU gettext, and GNU | | dnl use it. But if this macro is used in GNU gettext, and GNU |
| dnl gettext is already preinstalled in libintl, we update this | | dnl gettext is already preinstalled in libintl, we update this |
| dnl libintl. (Cf. the install rule in intl/Makefile.in.) | | dnl libintl. (Cf. the install rule in intl/Makefile.in.) |
| if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; }
\ | | if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; }
\ |
| | | |
| End of changes. 9 change blocks. |
|---|
| 41 lines changed or deleted | | 23 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 