---------------------
PatchSet 2844 
Date: 2006/04/23 14:10:45
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge conflict

Members: 
	configure.in:1.26.2.78->1.26.2.79 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.26.2.78
retrieving revision 1.26.2.79
diff -u -r1.26.2.78 -r1.26.2.79
--- squid3/configure.in	23 Apr 2006 13:44:32 -0000	1.26.2.78
+++ squid3/configure.in	23 Apr 2006 14:10:45 -0000	1.26.2.79
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.26.2.78 2006/04/23 13:44:32 serassio Exp $
+dnl  $Id: configure.in,v 1.26.2.79 2006/04/23 14:10:45 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE([tar-ustar])
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.26.2.78 $)dnl
+AC_REVISION($Revision: 1.26.2.79 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -483,11 +483,8 @@
 NEED_DISKTHREADS=
 NEED_WINDISKTHREADS=
 NEED_AIO=
-<<<<<<< configure.in
 NEED_WINAIO=
-=======
 STORE_TESTS=
->>>>>>> 1.91
 for fs in $STORE_MODULES none; do
     case "$fs" in
     diskd)
@@ -507,16 +504,12 @@
     	NEED_WINDISKTHREADS="true"
     	;;
     coss)
-<<<<<<< configure.in
     	NEED_AIO="true"
     	NEED_WINAIO="true"
-=======
-	NEED_AIO="true"
 	STORE_TESTS="$STORE_TESTS tests/testCoss$EXEEXT"
 	;;
     null)
 	STORE_TESTS="$STORE_TESTS tests/testNull$EXEEXT"
->>>>>>> 1.91
 	;;
     ufs)
 	UFS_FOUND="true"