--- configure.orig	Tue Feb 22 17:48:17 2000
+++ configure	Sat Mar 18 18:17:06 2000
@@ -662,15 +662,11 @@
   CXXFLAGS="$ac_save_CXXFLAGS"
 elif test $ac_cv_prog_cxx_g = yes; then
   if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
   else
-    CXXFLAGS="-g"
   fi
 else
   if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
   else
-    CXXFLAGS=
   fi
 fi
 
@@ -1122,7 +1118,7 @@
 
 fi
 
-for ac_hdr in fcntl.h unistd.h set.h
+for ac_hdr in fcntl.h unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
