that patch I mentioned

[Phil Edwards <pedwards at disaster dot jaj dot com>]

This is the solaris7/8 patch.  I also have some cleanups and small
improvements (at least I think they're improvements) made over the last
week.  I'll hold off on posting the mkcheck stuff (libtool, etc) until
Gerald gets back on Wednesday and we do the wwwdocs thing.

The regenerated files are not shown below.  Okay to install?


2000-10-30  Phil Edwards  <pme@sources.redhat.com>

	* acinclude.m4 (GLIBCPP_ENABLE_DEBUG):  Raise debugging level from
	  the default of 2 to 3.
	* configure.in:  Fix minor typos.  SUBST the values of enable_shared
	  and enable_static so that mkcheck will be aware of them.  Put the
	  test for gconv.h in with all the other header tests.
	* aclocal.m4:  Regenerate.
	* configure:  Ditto.
	* Makefile.in:  Ditto.
	* libio/Makefile.in:  Ditto.
	* libmath/Makefile.in:  Ditto.
	* libsupc++/Makefile.in:  Ditto.
	* src/Makefile.in:  Ditto.

	* config/os/solaris/solaris2.7/bits/os_defines.h:  Define
	  _G_USING_THUNKS to 0.


Index: acinclude.m4
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/acinclude.m4,v
retrieving revision 1.76
diff -u -3 -r1.76 acinclude.m4
--- acinclude.m4	2000/10/30 13:15:23	1.76
+++ acinclude.m4	2000/10/30 17:19:27
@@ -1158,7 +1158,7 @@
 dnl Check for special debugging mode; not for production use.
 dnl
 dnl GLIBCPP_ENABLE_DEBUG
-dnl --enable-debug sets '-ggdb -O0'.
+dnl --enable-debug sets '-ggdb3 -O0'.
 dnl --disable-debug sets '-g' and whatever optimization options the
 dnl     compiler can handle.
 dnl  +  --enable-maintainer-mode automatically defaults this to on.
@@ -1182,7 +1182,7 @@
 dnl Option parsed, now set things appropriately
 case "${enable_debug}" in
     yes) 
-        DEBUG_FLAGS='-O0 -ggdb'                        
+        DEBUG_FLAGS='-O0 -ggdb3'                        
         ;;
     no)   
         DEBUG_FLAGS='-g'
Index: configure.in
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/configure.in,v
retrieving revision 1.30
diff -u -3 -r1.30 configure.in
--- configure.in	2000/10/29 22:32:29	1.30
+++ configure.in	2000/10/30 17:19:29
@@ -18,6 +18,8 @@
 GLIBCPP_CONFIGURE(.)
 AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
+AC_SUBST(enable_shared)
+AC_SUBST(enable_static)
 GLIBCPP_CHECK_GNU_MAKE
   if test "x$_cv_gnu_make_command" = "x"; then
     AC_MSG_ERROR([GNU make not found. Please install it or correct your path.])
@@ -33,8 +35,8 @@
 GLIBCPP_ENABLE_DEBUG($USE_MAINTAINER_MODE)
 GLIBCPP_ENABLE_C_MBCHAR([yes])
 GLIBCPP_ENABLE_CSTDIO
-GLIBCPP_ENABLE_LONG_LONG(yes)
-GLIBCPP_ENABLE_SHADOW(no)
+GLIBCPP_ENABLE_LONG_LONG([yes])
+GLIBCPP_ENABLE_SHADOW([no])
 GLIBCPP_ENABLE_THREADS
 GLIBCPP_ENABLE_ATOMICITY
 GLIBCPP_ENABLE_CXX_FLAGS([none])
@@ -105,7 +107,7 @@
 
 	AC_DEFINE(_GLIBCPP_BUGGY_FLOAT_COMPLEX)
 	AC_DEFINE(_GLIBCPP_BUGGY_COMPLEX)
-	# need to ceck for faster f versions of math functions, ie sinf?
+	# need to check for faster f versions of math functions, ie sinf?
 	;;
   esac
 else
@@ -121,7 +123,7 @@
 
   # 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])
+  machine/param.h sys/machine.h fp.h locale.h float.h inttypes.h gconv.h])
 
   GLIBCPP_CHECK_COMPILER_FEATURES
   GLIBCPP_CHECK_LINKER_FEATURES
@@ -134,7 +136,6 @@
   GLIBCPP_CHECK_STDLIB_SUPPORT
 
   AC_FUNC_MMAP
-  AC_CHECK_HEADERS(gconv.h)
 fi
 
 AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes)
Index: config/os/solaris/solaris2.7/bits/os_defines.h
===================================================================
RCS file: /cvs/gcc/egcs/libstdc++-v3/config/os/solaris/solaris2.7/bits/os_defines.h,v
retrieving revision 1.3
diff -u -3 -r1.3 os_defines.h
--- os_defines.h	2000/10/27 12:29:42	1.3
+++ os_defines.h	2000/10/30 17:19:29
@@ -41,6 +41,8 @@
 #define __off64_t   off64_t
 #define __ssize_t   ssize_t
 
+// Without this all the libio vtbls are offset wrongly.
+#define _G_USING_THUNKS 0
 
 
 #endif