--- configure.orig	Sat Sep  3 00:38:41 2005
+++ configure	Tue Sep 13 07:48:06 2005
@@ -19611,8 +19611,6 @@
 # This can be used to rebuild libtool when needed
 LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 # Prevent multiple expansion
 
@@ -24767,8 +24765,8 @@
 # Some system specific hacks
 #
 
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
 
 # workaround for Sun Forte/x86 see BUG#4681
 case $SYSTEM_TYPE-$MACHINE_TYPE-$ac_cv_c_compiler_gnu in
@@ -35775,7 +35773,7 @@
 	/* ) rel_srcdir="$srcdir" ;;
 	* )  rel_srcdir="../$srcdir" ;;
     esac
-    if test "x$enable_dependency_tracking" == xno
+    if test "x$enable_dependency_tracking" = xno
     then
       innodb_conf_flags=--disable-dependency-tracking
     fi