From: amosjeffries <>
Date: Thu, 20 Sep 2007 17:03:42 +0000 (+0000)
Subject: Fix double-define warning in some compilers.
X-Git-Tag: SQUID_3_0_RC1~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e0dc9a89e24e1aa21d0ebb9e8e4f083c9fa97bf;p=thirdparty%2Fsquid.git

Fix double-define warning in some compilers.

This changes a define-ON then check for define-OFF configuration
to a define-OFF is asked else define-ON logic.
---

diff --git a/configure.in b/configure.in
index 0ce455d6ec..239f7c2a9b 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.478 2007/09/17 21:06:09 hno Exp $
+dnl  $Id: configure.in,v 1.479 2007/09/20 11:03:42 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.478 $)dnl
+AC_REVISION($Revision: 1.479 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1623,7 +1623,6 @@ AC_ARG_WITH(valgrind-debug,
 ])
 
 dnl Disable "memPools" code
-AC_DEFINE(DISABLE_POOLS, 0, [Define if you have problems with memPools and want to disable Pools.])
 AC_ARG_ENABLE(mempools,
 [  --disable-mempools      Disable memPools. Note that this option now simply sets the
 			  default behaviour. Specific classes can override this at runtime, and
@@ -1632,7 +1631,11 @@ AC_ARG_ENABLE(mempools,
 [ if test "$enableval" = "no" ; then
     echo "memPools disabled"
     AC_DEFINE(DISABLE_POOLS, 1, [Define if you have problems with memPools and want to disable Pools])
+  else
+    AC_DEFINE(DISABLE_POOLS, 0, [Define if you have problems with memPools and want to disable Pools.])
   fi
+],
+[ AC_DEFINE(DISABLE_POOLS, 0, [Define if you have problems with memPools and want to disable Pools.])
 ])
 
 dnl Enable WIN32 Service compile mode