acconfig.h (_GLIBCPP_USE_NLS): New symbol.

2003-05-01  Phil Edwards  <pme@gcc.gnu.org>

	* acconfig.h (_GLIBCPP_USE_NLS):  New symbol.
	* configure.in:  Move libintl.h header test...
	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE):  ...to here.  Gather all
	the NLS-related test results into one symbol.
	* src/functexcept.cc:  Use it here.
	* aclocal.m4, config.h.in, configure:  Regenerated.

From-SVN: r66372

libstdc++-v3/ChangeLog

+2003-05-01  Phil Edwards  <pme@gcc.gnu.org>
+
+	* acconfig.h (_GLIBCPP_USE_NLS):  New symbol.
+	* configure.in:  Move libintl.h header test...
+	* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE):  ...to here.  Gather all
+	the NLS-related test results into one symbol.
+	* src/functexcept.cc:  Use it here.
+	* aclocal.m4, config.h.in, configure:  Regenerated.
+
 2003-05-01  Paolo Carlini  <pcarlini@unitus.it>
 
 	* include/bits/sstream.tcc (overflow): Instead of calling

libstdc++-v3/acconfig.h

@@ -153,6 +153,9 @@
 // Define if modf is present in <math.h>
 #undef HAVE_MODF
 
+// Define if NLS translations are to be used.
+#undef _GLIBCPP_USE_NLS
+
 // @BOTTOM@
 //
 // Systems that have certain non-standard functions prefixed with an

libstdc++-v3/acinclude.m4

@@ -1292,7 +1292,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
   if test $USE_NLS = yes; then
-    AC_SEARCH_LIBS(gettext, intl,, USE_NLS=no)
+    AC_CHECK_HEADERS([libintl.h], [], USE_NLS=no)
+    AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
+  fi
+  if test $USE_NLS = yes; then
+    AC_DEFINE(_GLIBCPP_USE_NLS)
   fi
 
   AC_SUBST(USE_NLS)

libstdc++-v3/aclocal.m4

@@ -1304,7 +1304,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
 
   # A standalone libintl (e.g., GNU libintl) may be in use.
   if test $USE_NLS = yes; then
-    AC_SEARCH_LIBS(gettext, intl,, USE_NLS=no)
+    AC_CHECK_HEADERS([libintl.h], [], USE_NLS=no)
+    AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
+  fi
+  if test $USE_NLS = yes; then
+    AC_DEFINE(_GLIBCPP_USE_NLS)
   fi
 
   AC_SUBST(USE_NLS)

libstdc++-v3/config.h.in

-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
+/* config.h.in.  Generated automatically from configure.in by autoheader 2.13.  */
 
 /* Define if you have a working `mmap' system call.  */
 #undef HAVE_MMAP
@@ -125,6 +125,9 @@
 // Define if LC_MESSAGES is available in <locale.h>.
 #undef HAVE_LC_MESSAGES
 
+// Define if NLS translations are to be used.
+#undef _GLIBCPP_USE_NLS
+
 /* Define if you have the __signbit function.  */
 #undef HAVE___SIGNBIT
 
@@ -746,9 +749,6 @@
 /* Define if you have the <nan.h> header file.  */
 #undef HAVE_NAN_H
 
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
 /* Define if you have the <sys/filio.h> header file.  */
 #undef HAVE_SYS_FILIO_H
 

libstdc++-v3/configure.in

@@ -401,7 +401,7 @@ else
   # Check for available headers.
   AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h machine/endian.h \
   machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h \
-  sys/types.h libintl.h])
+  sys/types.h])
 
   GLIBCPP_CHECK_COMPILER_FEATURES
   GLIBCPP_CHECK_LINKER_FEATURES

libstdc++-v3/src/functexcept.cc

@@ -32,7 +32,7 @@
 #include <new>
 #include <typeinfo>
 #include <ios>
-#ifdef _GLIBCPP_HAVE_LIBINTL_H
+#ifdef _GLIBCPP_USE_NLS
 # include <libintl.h>
 # define _(msgid)   gettext (msgid)
 #else