---------------------
PatchSet 8203 
Date: 2006/06/09 19:47:12
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fixed merge error

Members: 
	configure.in:1.87.2.28->1.87.2.29 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.87.2.28
retrieving revision 1.87.2.29
diff -u -r1.87.2.28 -r1.87.2.29
--- squid/configure.in	9 Jun 2006 18:43:59 -0000	1.87.2.28
+++ squid/configure.in	9 Jun 2006 19:47:12 -0000	1.87.2.29
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.87.2.28 2006/06/09 18:43:59 serassio Exp $
+dnl  $Id: configure.in,v 1.87.2.29 2006/06/09 19:47:12 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.28 $)dnl
+AC_REVISION($Revision: 1.87.2.29 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2338,20 +2338,14 @@
 elif test "$ac_cv_func_poll" = "yes" ; then
         SELECT_TYPE="poll"
 elif test "$ac_cv_func_select" = "yes" ; then
-<<<<<<< configure.in
 	case "$host_os" in
 	mingw|mingw32)
 	        SELECT_TYPE="select_win32"
-	        AC_DEFINE(USE_SELECT_WIN32,1,[Use Winsock select() for the IO loop])
 		;;
 	*)
 	        SELECT_TYPE="select"
-	        AC_DEFINE(USE_SELECT,1,[Use select() for the IO loop])
 		;;
 	esac
-=======
-        SELECT_TYPE="select"
->>>>>>> 1.129
 else
         echo "Eep!  Can't find poll, epoll, or select!"
         echo "I'll try select and hope for the best."
@@ -2370,6 +2364,9 @@
 select)
         AC_DEFINE(USE_SELECT,1,[Use select() for the IO loop])
 	;;
+select_win32)
+	AC_DEFINE(USE_SELECT_WIN32,1,[Use Winsock select() for the IO loop])
+	;;
 kqueue)
         AC_DEFINE(USE_KQUEUE,1,[Use kqueue() for the IO loop])
 	;;
@@ -2382,11 +2379,8 @@
 AM_CONDITIONAL([USE_POLL], [test $SELECT_TYPE = poll])
 AM_CONDITIONAL([USE_EPOLL], [test $SELECT_TYPE = epoll])
 AM_CONDITIONAL([USE_SELECT], [test $SELECT_TYPE = select])
-<<<<<<< configure.in
 AM_CONDITIONAL([USE_SELECT_WIN32], [test $SELECT_TYPE = select_win32])
-=======
 AM_CONDITIONAL([USE_KQUEUE], [test $SELECT_TYPE = kqueue])
->>>>>>> 1.129
 
 dnl Yay!  Another Linux brokenness.  Its not good enough
 dnl to know that setresuid() exists, because RedHat 5.0 declares