--- configure.orig	2009-01-02 16:59:54.000000000 +0100
+++ configure	2009-01-18 10:14:57.000000000 +0100
@@ -21832,8 +21832,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
 
@@ -27046,13 +27044,14 @@
         { $as_echo "$as_me:$LINENO: result: using bundled zlib" >&5
 $as_echo "using bundled zlib" >&6; }
         ;;
-      "")
+      *)
         ZLIB_INCLUDES=""
         ZLIB_LIBS="-lz"
 
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
 CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
+LIBS="$ZLIB_LIBS $LIBS"
 if test X"$with_server" = Xno
 then
   zlibsym=zlibVersion
@@ -29214,8 +29213,8 @@
 # Some system specific hacks
 #
 
-MAX_C_OPTIMIZE="-O3"
-MAX_CXX_OPTIMIZE="-O3"
+MAX_C_OPTIMIZE=""
+MAX_CXX_OPTIMIZE=""
 
 case $SYSTEM_TYPE in
   *solaris2.7*)