Bootstrapped

diff --git a/configure b/configure
index 104eca625b80d040f66122ab21c2158ff9f7d328..d24400841a3e1ecace5e466e0b4bf512ca70a79e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.335 .
+# From configure.in Revision: 1.336 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -865,8 +865,15 @@ Optional Features:
   --enable-dependency-tracking  Do not reject slow dependency extractors
   --enable-dlmalloc=LIB Compile & use the malloc package by Doug Lea
   --enable-gnuregex       Compile GNUregex
+  --disable-optimizations Don't compile Squid with compiler optimizations enabled.
+                            Optimization is good for production builds, but not
+                            good for debugging. During development, use
+                            --disable-optimizations to reduce compilation times
+                            and allow easier debugging. This option implicitly
+                            also enabled --disable-inline
   --disable-inline        Don't compile trivial methods as inline. Squid
-                            is coded with much of the code able to be inlined.<                             Inlining is good for production builds, but not
+                            is coded with much of the code able to be inlined.
+                            Inlining is good for production builds, but not
                             good for development. During development, use
                             --disable-inline to reduce compilation times and
                             allow incremental builds to be quick. For
@@ -4481,6 +4488,19 @@ if test "${enable_gnuregex+set}" = set; then
 fi;
 
 SquidInline="yes"
+
+# Check whether --enable-optimizations or --disable-optimizations was given.
+if test "${enable_optimizations+set}" = set; then
+  enableval="$enable_optimizations"
+   if test "$enableval" = "no" ; then
+       echo "Disabling compiler optimizations (-O flag)"
+       CFLAGS="`echo $CFLAGS | sed -e 's/-O[0-9]*//'`"
+       CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-O[0-9]*//'`"
+        SquidInline="no"
+  fi
+
+fi;
+
 # Check whether --enable-inline or --disable-inline was given.
 if test "${enable_inline+set}" = set; then
   enableval="$enable_inline"
@@ -4502,6 +4522,7 @@ cat >>confdefs.h <<\_ACEOF
 _ACEOF
 
 else
+    echo "Inlining optimization disabled"
 
 cat >>confdefs.h <<\_ACEOF
 #define _SQUID_INLINE_