---------------------
PatchSet 8676 
Date: 2006/09/23 10:39:42
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fix merge conflict

Members: 
	configure.in:1.87.2.58->1.87.2.59 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.87.2.58
retrieving revision 1.87.2.59
diff -u -r1.87.2.58 -r1.87.2.59
--- squid/configure.in	23 Sep 2006 10:21:48 -0000	1.87.2.58
+++ squid/configure.in	23 Sep 2006 10:39:42 -0000	1.87.2.59
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.87.2.58 2006/09/23 10:21:48 serassio Exp $
+dnl  $Id: configure.in,v 1.87.2.59 2006/09/23 10:39:42 serassio Exp $
 dnl
 dnl
 dnl
@@ -10,7 +10,7 @@
 AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE
-AC_REVISION($Revision: 1.87.2.58 $)dnl
+AC_REVISION($Revision: 1.87.2.59 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -411,11 +411,8 @@
 echo "Store modules built: $STORE_MODULES"
 NEED_DISKD=0
 USE_AIOPS_WIN32=0
-<<<<<<< configure.in
 USE_AIO_WIN32=0
-=======
 NEED_COSSDUMP=0
->>>>>>> 1.159
 STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a"
 AC_SUBST(STORE_OBJS)
 STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`"
@@ -461,11 +458,8 @@
 AC_SUBST(STORE_MODULES)
 AM_CONDITIONAL([NEED_DISKD], [test "$NEED_DISKD" = 1])
 AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
-<<<<<<< configure.in
 AM_CONDITIONAL([USE_AIO_WIN32], [test "$USE_AIO_WIN32" = 1])
-=======
 AM_CONDITIONAL([NEED_COSSDUMP], [test "$NEED_COSSDUMP" = 1])
->>>>>>> 1.159
 
 dnl --enable-heap-replacement compatibility option
 AC_ARG_ENABLE(heap-replacement,