--- configure.orig	Sat May  8 08:04:02 1999
+++ configure	Sat May  8 08:04:31 1999
@@ -833,13 +833,13 @@
   CFLAGS="$ac_save_CFLAGS"
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
+    CFLAGS="-g"
   else
     CFLAGS="-g"
   fi
 else
   if test "$GCC" = yes; then
-    CFLAGS="-O2"
+    CFLAGS=""
   else
     CFLAGS=
   fi
@@ -976,13 +976,13 @@
   CXXFLAGS="$ac_save_CXXFLAGS"
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
+    CXXFLAGS="-g"
   else
     CXXFLAGS="-g"
   fi
 else
   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
+    CXXFLAGS=""
   else
     CXXFLAGS=
   fi
@@ -2701,8 +2701,8 @@
     CFLAGS="-Wall $CFLAGS"
     CXXFLAGS="-Wall -Wno-return-type $CXXFLAGS"
     if test -z "$DEBUGFLAG"; then
-        CFLAGS="-O2 $CFLAGS"
-        CXXFLAGS="-O2 $CXXFLAGS"
+        CFLAGS="$CFLAGS"
+        CXXFLAGS="$CXXFLAGS"
     fi
     if test $PICFLAG = 1; then
     	CFLAGS="-fPIC $CFLAGS"
@@ -2729,8 +2729,8 @@
         	CXXFLAGS="+w +pp $CXXFLAGS"
 	    fi
 	    if test -z "$DEBUGFLAG"; then
-        	CFLAGS="-O2 $CFLAGS"
-        	CXXFLAGS="-O2 $CXXFLAGS"
+        	CFLAGS="$CFLAGS"
+        	CXXFLAGS="$CXXFLAGS"
 	    fi
 	    ;;
 	HP-UX*)