diff --git a/ChangeLog b/ChangeLog
index 024b60186f9..2b4284e1aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2000-11-12  Mark Mitchell  <mark@codesourcery.com>
 
+	* configure: Turn on libstdc++ V3 by default.
+
 	* ltcf-c.sh: On Solaris, use `gcc -shared' to build a shared library
 	if we've got GCC.
 
diff --git a/configure b/configure
index 95467f5a3cc..8698c45f730 100755
--- a/configure
+++ b/configure
@@ -55,6 +55,7 @@ extraconfigdirs=
 diroptions=
 enable_threads=no
 enable_shared=no
+enable_libstdcxx_v3=yes
 exec_prefix=
 exec_prefixoption=
 fatal=
@@ -88,7 +89,7 @@ subdirs=
 target_alias=NOTARGET
 target_makefile_frag=
 undefs=NOUNDEFS
-version="$Revision: 1.29 $"
+version="$Revision: 1.30 $"
 x11=default
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3ec89f3382e..458ad1ae183 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2000-11-12  Mark Mitchell  <mark@codesourcery.com>
 
+	* configure.in: Turn on libstdc++ V3 by default.
+	* configure: Regenerated.
+	
 	* fixinc/mkfixinc.sh: Use the ordinary fixincludes on Solaris.
 
 2000-11-12  Jakub Jelinek  <jakub@redhat.com>
diff --git a/gcc/configure b/gcc/configure
index 3f57a9ecf6c..dec87b3dbf8 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1553,7 +1553,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} int $ac_kw foo() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:1560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
@@ -1583,7 +1583,7 @@ esac
 
 
 # Find some useful tools
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -7220,7 +7220,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -7361,7 +7361,7 @@ else
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
-void *p = alloca(2 * sizeof(int));
+char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
 if { (eval echo configure:7368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -9481,7 +9481,7 @@ if test "${enable_libstdcxx_v3+set}" = set; then
   enableval="$enable_libstdcxx_v3"
   enable_libstdcxx_v3="$enableval"
 else
-  enable_libstdcxx_v3=no
+  enable_libstdcxx_v3=yes
 fi
 
 
diff --git a/gcc/configure.in b/gcc/configure.in
index 2353804fcb7..a35ad2c017b 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -4934,7 +4934,7 @@ AC_MSG_CHECKING([for libstdc++ to install])
 AC_ARG_ENABLE(libstdcxx-v3,
 [  --enable-libstdcxx-v3 
 			  enable libstdc++-v3 for building and installation],
-  [enable_libstdcxx_v3="$enableval"], [enable_libstdcxx_v3=no])
+  [enable_libstdcxx_v3="$enableval"], [enable_libstdcxx_v3=yes])
 
 if test x$enable_libstdcxx_v3 = xyes; then
   AC_MSG_RESULT(v3)