--------------------- PatchSet 5614 Date: 2007/09/12 13:17:38 Author: amosjeffries Branch: squid3-ipv6 Tag: (none) Log: Fix logic errors in configure --disable-pools when --disable-pools used autoconf would define DISABLE_POOLS twice and all subsequent run tests would fail. Members: configure.in:1.63.2.55->1.63.2.56 Index: squid3/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid3/configure.in,v retrieving revision 1.63.2.55 retrieving revision 1.63.2.56 diff -u -r1.63.2.55 -r1.63.2.56 --- squid3/configure.in 10 Sep 2007 03:20:17 -0000 1.63.2.55 +++ squid3/configure.in 12 Sep 2007 13:17:38 -0000 1.63.2.56 @@ -1,7 +1,7 @@ dnl Configuration input file for Squid dnl -dnl $Id: configure.in,v 1.63.2.55 2007/09/10 03:20:17 amosjeffries Exp $ +dnl $Id: configure.in,v 1.63.2.56 2007/09/12 13:17:38 amosjeffries Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_CONFIG_AUX_DIR(cfgaux) AC_CONFIG_SRCDIR([src/main.cc]) AM_INIT_AUTOMAKE([tar-ustar]) -AC_REVISION($Revision: 1.63.2.55 $)dnl +AC_REVISION($Revision: 1.63.2.56 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -1624,7 +1624,6 @@ ]) 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 @@ -1633,9 +1632,12 @@ [ 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 ]) + dnl Enable WIN32 Service compile mode AC_ARG_ENABLE(win32-service, [ --enable-win32-service Compile Squid as a WIN32 Service