bootstrap

diff --git a/configure b/configure
index 3e4ee0431f8ea645338d9c93e1936b45721a776d..8c8669cc6ab8337284c5ff2430679b89f90212be 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.309 .
+# From configure.in Revision: 1.310 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -847,6 +847,14 @@ Optional Features:
                           (and sometimes confusing) to the casual installer
   --enable-dlmalloc=LIB Compile & use the malloc package by Doug Lea
   --enable-gnuregex       Compile GNUregex
+  --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
+                            good for development. During development, use
+                            --disable-inline to reduce compilation times and
+                            allow incremental builds to be quick. For
+                            production builds, or load tests, use
+                            --enable-inline to have squid make all trivial
+                            methods inlinable by the compiler.
   --enable-debug-cbdata   Provide some debug information in cbdata
   --enable-xmalloc-statistics
                           Show malloc statistics in status page
@@ -4034,6 +4042,35 @@ if test "${enable_gnuregex+set}" = set; then
   USE_GNUREGEX=$enableval
 fi;
 
+SquidInline="yes"
+# Check whether --enable-inline or --disable-inline was given.
+if test "${enable_inline+set}" = set; then
+  enableval="$enable_inline"
+   if test "$enableval" = "no" ; then
+     SquidInline="no"
+   fi
+
+fi;
+
+if test "$SquidInline" = "yes" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define _SQUID_INLINE_ inline
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define _USE_INLINE_
+_ACEOF
+
+else
+
+cat >>confdefs.h <<\_ACEOF
+#define _SQUID_INLINE_
+_ACEOF
+
+fi
+
 # Check whether --enable-debug-cbdata or --disable-debug-cbdata was given.
 if test "${enable_debug_cbdata+set}" = set; then
   enableval="$enable_debug_cbdata"

diff --git a/include/autoconf.h.in b/include/autoconf.h.in
index 79b5e1eae8e18b153911dd8b63aeafbbb92442e1..de4d4b9f5ed5b795ddd88032f55f2af8059279b5 100644 (file)
--- a/include/autoconf.h.in
+++ b/include/autoconf.h.in
@@ -803,5 +803,11 @@
 /* Enable support for the X-Accelerator-Vary HTTP header */
 #undef X_ACCELERATOR_VARY
 
+/* Keyword used by squid for inlining methods */
+#undef _SQUID_INLINE_
+
+/* Include inline methods into header file */
+#undef _USE_INLINE_
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const

diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in
index 174531b325c9e1f9189c0fe5d2fd5a5f9e1f788f..ba67150a80772bd27fee06ff3e46f88b32726920 100644 (file)
--- a/test-suite/Makefile.in
+++ b/test-suite/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.4 2003/01/01 10:51:30 robertc Exp $
+#  $Id: Makefile.in,v 1.5 2003/01/09 12:46:36 robertc Exp $
 #
 
 SHELL = @SHELL@