From 191bf464071d7cd21095b9f1d119c05fd8306493 Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Fri, 19 Oct 2001 15:17:39 +0000 Subject: aclocal.m4 (AM_WITH_NLS): AC_DEFINE HAVE_LIBINTL_H and USE_INCLUDED_LIBINTL when appropriate. * aclocal.m4 (AM_WITH_NLS): AC_DEFINE HAVE_LIBINTL_H and USE_INCLUDED_LIBINTL when appropriate. * configure, config.in: Regenerate. * Makefile.in (datadir): Set to @datadir@. (intl.o): Also depend on $(CONFIG_H) and system.h. * intl.c: Factor out common gettext initialization sequence. (gcc_init_libintl): New function. * intl.h: Include intl/libgnuintl.h if USE_INCLUDED_LIBINTL; otherwise include libintl.h if HAVE_LIBINTL_H; otherwise turn off NLS. Add multiple include guard. No need to #ifdef-guard an #undef. Prototype gcc_init_libintl here. * collect2.c (main), cppmain.c (general_init), gcc.c (main), gcov.c (main), protoize.c (main), toplev.c (toplev_main): Use gcc_init_libintl. intl: * Makefile.in: Don't copy libgnuintl.h anywhere. From-SVN: r46348 --- gcc/aclocal.m4 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gcc/aclocal.m4') diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index b943369..1b4c5ad 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -1406,8 +1406,11 @@ AC_DEFUN([AM_WITH_NLS], define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc]) define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl]) +dnl GCC LOCAL: Expose presence of libintl.h to C code. AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_DEFINE([HAVE_LIBINTL_H], 1, + [Define if you have the header file.]) + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, [AC_TRY_LINK([#include extern int _nl_msg_cat_cntr;], [bindtextdomain ("", ""); @@ -1605,6 +1608,12 @@ changequote([,])dnl AC_SUBST(INTLOBJS) AC_SUBST(POFILES) AC_SUBST(POSUB) +dnl GCC LOCAL: Make USE_INCLUDED_LIBINTL visible to C code. + if test $USE_INCLUDED_LIBINTL = yes; then + AC_DEFINE([USE_INCLUDED_LIBINTL], 1, + [Define to use the libintl included with this package instead of any + version in the system libraries.]) + fi dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= -- cgit v1.1