--- configure.orig	Wed Feb  2 09:04:01 2005
+++ configure	Thu Feb  3 22:23:31 2005
@@ -3267,24 +3267,16 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-if test -z "$orig_CXXFLAGS"; then
-  CXXFLAGS='-O'
-  if test x$GCC = xyes && test "x$GXX" = xyes; then
-    CXXFLAGS="-g -O3"
-  fi
-  CFLAGS="$CXXFLAGS"
-fi
-
 LINKER="$CXX"
 if test x$GCC = xyes && test x$GXX = xyes; then
 
-echo "$as_me:$LINENO: checking for main in -lsupc++" >&5
-echo $ECHO_N "checking for main in -lsupc++... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for main in -lstdc++ -lsupc++" >&5
+echo $ECHO_N "checking for main in -lstdc++ -lsupc++... $ECHO_C" >&6
 if test "${ac_cv_lib_supcpp_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsupc++  $LIBS"
+LIBS="-lstdc++ -lsupc++  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -3338,7 +3330,7 @@
 if test $ac_cv_lib_supcpp_main = yes; then
 
       LINKER="$CC"
-      LIBS="$LIBS -lsupc++"
+      LIBS="$LIBS -lstdc++ -lsupc++"
 
 fi
 
