--- configure.orig	Wed Jan  5 05:14:02 2000
+++ configure	Tue Sep 19 20:43:39 2000
@@ -681,9 +681,9 @@
   if test "$ac_test_CFLAGS" = set; then
     CFLAGS="$ac_save_CFLAGS"
   elif test $ac_cv_prog_cc_g = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="$CXXFLAGS"
   else
-    CFLAGS="-O2"
+    CFLAGS="$CXXFLAGS"
   fi
 else
   GCC=
@@ -813,9 +813,9 @@
   if test "$ac_test_CXXFLAGS" = set; then
     CXXFLAGS="$ac_save_CXXFLAGS"
   elif test $ac_cv_prog_cxx_g = yes; then
-    CXXFLAGS="-g -O2"
+    CXXFLAGS="$CXXFLAGS"
   else
-    CXXFLAGS="-O2"
+    CXXFLAGS="$CXXFLAGS"
   fi
 else
   GXX=
@@ -1805,9 +1805,9 @@
 if test -n "$GXX"; then
     # GNU C compiler
     # -Wno-return-type is necessary for Xlib header files on many systems:
-    CFLAGS="$CFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+    CFLAGS="$CFLAGS -Wall -Wno-return-type $CFLAGS $X_CFLAGS"
     CFLAGS_D="$CFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
-    CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type -O2 $X_CFLAGS"
+    CXXFLAGS="$CXXFLAGS -Wall -Wno-return-type $CXXFLAGS $X_CFLAGS"
     CXXFLAGS_D="$CXXFLAGS -Wall -Wno-return-type -g -DDEBUG $X_CFLAGS"
 else
 if test "`(uname) 2>/dev/null`" = IRIX; then