diff -U 4 -H -d -r -N -- a/configure b/configure
--- a/configure	2004-04-28 02:01:07.480502784 +0200
+++ b/configure	2004-04-28 02:01:11.846839000 +0200
@@ -1965,15 +1965,15 @@
 if test "$ac_test_CFLAGS" = set; then
   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
 fi
diff -U 4 -H -d -r -N -- a/cnf/configure.out b/cnf/configure.out
--- a/cnf/configure.out	2004-04-28 02:12:09.681832880 +0200
+++ b/cnf/configure.out	2004-04-28 02:12:12.523400896 +0200
@@ -1930,15 +1930,15 @@
 if test "$ac_test_CFLAGS" = set; then
   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
 fi
@@ -3708,17 +3708,17 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    case "$host-$CC" in
     *-gcc | *-linux*-cc )
-     	gp_cv_cflags="-Wall -g -O2";;
+     	gp_cv_cflags="-Wall -g ";;
     i686-*-egcs )
-        gp_cv_cflags="-Wall -g -O2 -mcpu=i686";;
+        gp_cv_cflags="-Wall -g  -mcpu=i686";;
     i586-*-egcs )
-        gp_cv_cflags="-Wall -g -O2 -mcpu=i586";;
+        gp_cv_cflags="-Wall -g  -mcpu=i586";;
     i486-*-egcs )
-        gp_cv_cflags="-Wall -g -O2 -mcpu=i486";;
+        gp_cv_cflags="-Wall -g  -mcpu=i486";;
     i386-*-egcs )
-        gp_cv_cflags="-Wall -g -O2 -mcpu=i386";;
+        gp_cv_cflags="-Wall -g  -mcpu=i386";;
     alphaev6-*-osf4*-cc )
 	gp_cv_cflags="-g3 -arch ev6 -O1 ";;
     alphaev56-*-osf4*-cc )
 	gp_cv_cflags="-g3 -arch ev56 -O1";;
@@ -3774,13 +3774,13 @@
    case "$host-$CC" in
     *-hpux-gcc )
         gp_cv_prog_cc_cdynoptions="-fpic";;
     *-gcc | *-egcs )
-     	gp_cv_prog_cc_cdynoptions="-fpic -Wall -O2";;
+     	gp_cv_prog_cc_cdynoptions="-fpic -Wall ";;
     *-next-nextstep-cc )
-        gp_cv_prog_cc_cdynoptions=" -Wall -O2 -arch $hostcpu";;
+        gp_cv_prog_cc_cdynoptions=" -Wall  -arch $hostcpu";;
     *-osf*-cc )
-	gp_cv_prog_cc_cdynoptions=" -shared -x -O2";;
+	gp_cv_prog_cc_cdynoptions=" -shared -x ";;
     *-irix* )
         gp_cv_prog_cc_cdynoptions=" -O3 -woff 1110,1167,1174,1552";;
 
     * )