---------------------
PatchSet 1144 
Date: 2004/12/28 17:17:50
Author: serassio
Branch: nt
Tag: (none) 
Log:
Added MinGW support for WinAIO DISKIO module

Members: 
	configure.in:1.26.2.40->1.26.2.41 
	src/fs/Makefile.am:1.5.2.8->1.5.2.9 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.26.2.40
retrieving revision 1.26.2.41
diff -u -r1.26.2.40 -r1.26.2.41
--- squid3/configure.in	27 Dec 2004 09:05:27 -0000	1.26.2.40
+++ squid3/configure.in	28 Dec 2004 17:17:50 -0000	1.26.2.41
@@ -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.40 2004/12/27 09:05:27 serassio Exp $
+dnl  $Id: configure.in,v 1.26.2.41 2004/12/28 17:17:50 serassio Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-PRE3-CVS-NT)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.26.2.40 $)dnl
+AC_REVISION($Revision: 1.26.2.41 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -469,6 +469,7 @@
 NEED_DISKDAEMON=
 NEED_DISKTHREADS=
 NEED_AIO=
+NEED_WINAIO=
 for fs in $STORE_MODULES none; do
     case "$fs" in
     diskd)
@@ -481,11 +482,9 @@
 	NEED_BLOCKING="true"
 	NEED_DISKTHREADS="true"
 	;;
-    awin32)
-	NEED_UFS="true"
-	;;
     coss)
     	NEED_AIO="true"
+    	NEED_WINAIO="true"
 	;;
     ufs)
         UFS_FOUND="true"
@@ -571,6 +570,9 @@
     AIO)
     	FOUND_AIO="true"
 	;;
+    WinAIO)
+    	FOUND_WINAIO="true"
+	;;
     Blocking)
 	FOUND_BLOCKING="true"
     esac
@@ -597,12 +599,24 @@
    DISK_MODULES="$DISK_MODULES DiskThreads"
    DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/DiskThreads/DiskThreadsDiskIOModule.o"
 fi
-if test -z "$FOUND_AIO" && test -n "$NEED_AIO"; then
-   echo "adding AIO, as it is used by an active, legacy Store Module"
-   DISK_LIBS="$DISK_LIBS libAIO.a"
-   DISK_MODULES="$DISK_MODULES AIO"
-   DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/AIO/AIODiskIOModule.o"
-fi
+case "$host_os" in
+mingw|mingw32|cygwin|cygwin32)
+	if test -z "$FOUND_WINAIO" && test -n "$NEED_WINAIO"; then
+	   echo "adding WinAIO, as it is used by an active, legacy Store Module"
+	   DISK_LIBS="$DISK_LIBS libWinAIO.a"
+	   DISK_MODULES="$DISK_MODULES WinAIO"
+	   DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/WinAIO/WinAIODiskIOModule.o"
+	fi
+	;;
+*)
+	if test -z "$FOUND_AIO" && test -n "$NEED_AIO"; then
+	   echo "adding AIO, as it is used by an active, legacy Store Module"
+	   DISK_LIBS="$DISK_LIBS libAIO.a"
+	   DISK_MODULES="$DISK_MODULES AIO"
+	   DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/AIO/AIODiskIOModule.o"
+	fi
+	;;
+esac
 echo "IO Modules built: $DISK_MODULES"
 dnl we know what is being built. now add dependencies.
 for fs in $DISK_MODULES none; do
Index: squid3/src/fs/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/src/fs/Makefile.am,v
retrieving revision 1.5.2.8
retrieving revision 1.5.2.9
diff -u -r1.5.2.8 -r1.5.2.9
--- squid3/src/fs/Makefile.am	21 Dec 2004 15:39:33 -0000	1.5.2.8
+++ squid3/src/fs/Makefile.am	28 Dec 2004 17:18:22 -0000	1.5.2.9
@@ -1,6 +1,6 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.5.2.8 2004/12/21 15:39:33 serassio Exp $
+#  $Id: Makefile.am,v 1.5.2.9 2004/12/28 17:18:22 serassio Exp $
 #
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -19,7 +19,6 @@
 if ENABLE_WIN32SPECIFIC
 INCLUDES      = -I. -I$(top_srcdir)/port/win32/include -I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/
-WIN32_EXTRA_SOURCES = ../../port/win32/src/aio.cc
 else
 INCLUDES      = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/