acinclude.m4: Adjust so that _GLIBCXX_USE_C99 implies using _GLIBCXX_USE_C99_COMPLEX...

2005-03-23  Benjamin Kosnik  <bkoz@redhat.com>

	* acinclude.m4: Adjust so that _GLIBCXX_USE_C99 implies
	using _GLIBCXX_USE_C99_COMPLEX, _GLIBCXX_USE_C99_MATH, and
	_GLIBCXX_USE_C99_WCHAR.
	Remove GLIBCXX_ENABLE_C_MBCHAR, consolidate in GLIBCXX_ENABLE_C99
	and GLIBCXX_ENABLE_WCHAR_T.
	Take C99 bits from GLIBCXX_CHECK_WCHAR_T_SUPPORT and put in
	GLIBCXX_ENABLE_C99.
	Change remaining parts of GLIBCXX_CHECK_WCHAR_T_SUPPORT to
	GLIBCXX_CHECK_ICONV_SUPPORT.
	* configure.ac: Remove GLIBCXX_ENABLE_C_MBCHAR, use
	GLIBCXX_CHECK_ICONV_SUPPORT and GLIBCXX_ENABLE_WCHAR_T.
	* crossconfig.m4: Same.
	* acconfig.h: Same, adjust comments.
	* config.h.in: Regenerate.
	* configure: Regenerate.
	* docs/html/configopts.html: Change --enable-c-mbchar to
	--enable-wchar_t.

	* config/locale/gnu/c++locale_internal.h: Guard wide functions
	with _GLIBCXX_USE_WCHAR_T.
	* include/c_std/std_cwctype.h: Alphabetize, remove duplicates.
	* include/c_std/std_cstdio.h: Spacing.

	* config/locale/gnu/c_locale.h: Tweaks for unused warnings.
	* src/debug.cc: Same.

From-SVN: r96981

1 files changed, 13 insertions, 65 deletions

diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 8ee7a7b..598a5de 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -1,5 +1,5 @@
 dnl
-dnl This file contains stuff.
+dnl This file contains details for non-natives builds.
 dnl
 
 # Base decisions on target environment.
@@ -21,7 +21,7 @@ case "${host}" in
     GLIBCXX_CHECK_MATH_SUPPORT
     GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     GLIBCXX_CHECK_STDLIB_SUPPORT
 
     # For showmanyc_helper().
@@ -56,7 +56,7 @@ case "${host}" in
     GLIBCXX_CHECK_MATH_SUPPORT
     GLIBCXX_CHECK_BUILTIN_MATH_SUPPORT
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     GLIBCXX_CHECK_STDLIB_SUPPORT
     GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
     AC_DEFINE(HAVE_WRITEV)
@@ -71,7 +71,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS) 
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     AC_DEFINE(HAVE_LC_MESSAGES)
     AC_DEFINE(HAVE_GETPAGESIZE)
     AC_DEFINE(HAVE_SETENV)
@@ -126,7 +126,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS)
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     AC_DEFINE(HAVE_COPYSIGN)
     AC_DEFINE(HAVE_COPYSIGNF)
     AC_DEFINE(HAVE_FREXPF)
@@ -150,7 +150,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS)
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
 
     # For LFS.
     AC_DEFINE(HAVE_INT64_T)
@@ -237,7 +237,7 @@ case "${host}" in
     AC_CHECK_HEADERS([sys/types.h locale.h float.h])
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     ;;
   *-netbsd*)
     AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
@@ -247,7 +247,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS) 
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     AC_DEFINE(HAVE_COPYSIGN)
     AC_DEFINE(HAVE_COPYSIGNF)
     AC_DEFINE(HAVE_FINITEF)
@@ -271,7 +271,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS)
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
 
     # For showmanyc_helper().
     AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
@@ -287,7 +287,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS) 
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     AC_DEFINE(HAVE_COSF)
     AC_DEFINE(HAVE_COSL)
     AC_DEFINE(HAVE_COSHF)
@@ -316,71 +316,19 @@ case "${host}" in
          AC_DEFINE(HAVE_POLL)
          AC_DEFINE(HAVE_S_ISREG)
          AC_DEFINE(HAVE_LC_MESSAGES)
-         AC_DEFINE(HAVE_BTOWC)
-         AC_DEFINE(HAVE_FGETWC)
-         AC_DEFINE(HAVE_FGETWS)
          AC_DEFINE(HAVE_FINITE)
          AC_DEFINE(HAVE_FPCLASS)
-         AC_DEFINE(HAVE_FPUTWC)
-         AC_DEFINE(HAVE_FPUTWS)
-         AC_DEFINE(HAVE_FWIDE)
-         AC_DEFINE(HAVE_FWPRINTF)
-         AC_DEFINE(HAVE_FWSCANF)
          AC_DEFINE(HAVE_GETPAGESIZE)
-         AC_DEFINE(HAVE_GETWC)
-         AC_DEFINE(HAVE_GETWCHAR)
-         AC_DEFINE(HAVE_MBRLEN)
-         AC_DEFINE(HAVE_MBRTOWC)
-         AC_DEFINE(HAVE_MBSINIT)
-         AC_DEFINE(HAVE_MBSRTOWCS)
          AC_DEFINE(HAVE_NL_LANGINFO)
-         AC_DEFINE(HAVE_PUTWC)
-         AC_DEFINE(HAVE_PUTWCHAR)
-         AC_DEFINE(HAVE_SWPRINTF)
-         AC_DEFINE(HAVE_SWSCANF)
-         AC_DEFINE(HAVE_UNGETWC)
-         AC_DEFINE(HAVE_VFWPRINTF)
-         AC_DEFINE(HAVE_VSWPRINTF)
-         AC_DEFINE(HAVE_VWPRINTF)
-         AC_DEFINE(HAVE_WCRTOMB)
-         AC_DEFINE(HAVE_WCSCAT)
-         AC_DEFINE(HAVE_WCSCHR)
-         AC_DEFINE(HAVE_WCSCMP)
-         AC_DEFINE(HAVE_WCSCOLL)
-         AC_DEFINE(HAVE_WCSCPY)
-         AC_DEFINE(HAVE_WCSCSPN)
-         AC_DEFINE(HAVE_WCSFTIME)
-         AC_DEFINE(HAVE_WCSLEN)
-         AC_DEFINE(HAVE_WCSNCAT)
-         AC_DEFINE(HAVE_WCSNCMP)
-         AC_DEFINE(HAVE_WCSNCPY)
-         AC_DEFINE(HAVE_WCSPBRK)
-         AC_DEFINE(HAVE_WCSRCHR)
-         AC_DEFINE(HAVE_WCSRTOMBS)
-         AC_DEFINE(HAVE_WCSSPN)
-         AC_DEFINE(HAVE_WCSSTR)
-         AC_DEFINE(HAVE_WCSTOD)
-         AC_DEFINE(HAVE_WCSTOK)
-         AC_DEFINE(HAVE_WCSTOL)
-         AC_DEFINE(HAVE_WCSTOUL)
-         AC_DEFINE(HAVE_WCSXFRM)
-         AC_DEFINE(HAVE_WCTOB)
-         AC_DEFINE(HAVE_WMEMCHR)
-         AC_DEFINE(HAVE_WMEMCMP)
-         AC_DEFINE(HAVE_WMEMCPY)
-         AC_DEFINE(HAVE_WMEMMOVE)
-         AC_DEFINE(HAVE_WMEMSET)
-         AC_DEFINE(HAVE_WPRINTF)
-         AC_DEFINE(HAVE_WSCANF)
          AC_DEFINE(HAVE_ICONV)
          AC_DEFINE(HAVE_ICONV_CLOSE)
          AC_DEFINE(HAVE_ICONV_OPEN)
          # Look for the pieces required for wchar_t support in order to
          # get all the right HAVE_* macros defined.
-         GLIBCXX_CHECK_WCHAR_T_SUPPORT
+         GLIBCXX_CHECK_ICONV_SUPPORT
          # All of the dependencies for wide character support are here, so
          # turn it on.  This requires some syncronization with the
-         # GLIBCXX_CHECK_WCHAR_T_SUPPORT in acinclude.m4
+         # GLIBCXX_CHECK_ICONV_SUPPORT in acinclude.m4
          AC_DEFINE(_GLIBCXX_USE_WCHAR_T) 
          # Are these tested for even when cross?
          AC_DEFINE(HAVE_FLOAT_H)
@@ -435,7 +383,7 @@ case "${host}" in
     AC_SUBST(SECTION_FLAGS)
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
-    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+    GLIBCXX_CHECK_ICONV_SUPPORT
     AC_DEFINE(HAVE_COPYSIGN)
     AC_DEFINE(HAVE_COPYSIGNF)
     AC_DEFINE(HAVE_FINITE)