* aclocal.m4 (AM_WITH_NLS): AC_DEFINE HAVE_LIBINTL_H and

[pf3gnuchains/gcc-fork.git] / gcc / aclocal.m4

diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4
index b943369..1b4c5ad 100644 (file)
--- 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 <libintl.h> header file.])
+           AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
            [AC_TRY_LINK([#include <libintl.h>
 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=