---------------------
PatchSet 8636 
Date: 2006/09/13 10:29:58
Author: serassio
Branch: nt
Tag: (none) 
Log:
Fix make dist error

Members: 
	configure.in:1.87.2.53->1.87.2.54 
	src/fs/Makefile.am:1.3.30.10->1.3.30.11 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.87.2.53
retrieving revision 1.87.2.54
diff -u -r1.87.2.53 -r1.87.2.54
--- squid/configure.in	13 Sep 2006 07:07:23 -0000	1.87.2.53
+++ squid/configure.in	13 Sep 2006 10:29:58 -0000	1.87.2.54
@@ -1,7 +1,7 @@
 dnl
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.87.2.53 2006/09/13 07:07:23 serassio Exp $
+dnl  $Id: configure.in,v 1.87.2.54 2006/09/13 10:29:58 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.53 $)dnl
+AC_REVISION($Revision: 1.87.2.54 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -410,6 +410,8 @@
 ])
 echo "Store modules built: $STORE_MODULES"
 NEED_DISKD=0
+USE_AIOPS_WIN32=0
+USE_AIO_WIN32=0
 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'`"
@@ -425,11 +427,10 @@
 	if test -z "$with_pthreads"; then
             case "$host_os" in
             mingw|mingw32|cygwin|cygwin32)
-        	AM_CONDITIONAL(USE_AIOPS_WIN32, true)
+        	USE_AIOPS_WIN32=1
 	        echo "aufs store used, Windows threads support automatically enabled"
                 ;;
             *)
-        	AM_CONDITIONAL(USE_AIOPS_WIN32, false)
 	        echo "aufs store used, pthreads support automatically enabled"
 	        with_pthreads=yes
                 ;;
@@ -440,11 +441,10 @@
 	if test -z "$with_aio"; then
             case "$host_os" in
             mingw|mingw32|cygwin|cygwin32)
-        	AM_CONDITIONAL(USE_AIO_WIN32, true)
+        	USE_AIO_WIN32=1
 	        echo "coss store used, Windows overlapped I/O support automatically enabled"
                 ;;
             *)
-        	AM_CONDITIONAL(USE_AIO_WIN32, false)
 	    echo "coss store used, aio support automatically enabled"
 	        with_aio=yes
                 ;;
@@ -455,6 +455,8 @@
 done
 AC_SUBST(STORE_MODULES)
 AM_CONDITIONAL([NEED_DISKD], [test "$NEED_DISKD" = 1])
+AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
+AM_CONDITIONAL([USE_AIO_WIN32], [test "$USE_AIO_WIN32" = 1])
 
 dnl --enable-heap-replacement compatibility option
 AC_ARG_ENABLE(heap-replacement,
Index: squid/src/fs/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/fs/Makefile.am,v
retrieving revision 1.3.30.10
retrieving revision 1.3.30.11
diff -u -r1.3.30.10 -r1.3.30.11
--- squid/src/fs/Makefile.am	13 Sep 2006 07:07:24 -0000	1.3.30.10
+++ squid/src/fs/Makefile.am	13 Sep 2006 10:30:00 -0000	1.3.30.11
@@ -12,8 +12,8 @@
 endif
 
 AIO_WIN32_ALL_SOURCES = \
-	DiskIO/AIO/aio_win32.c \
-	DiskIO/AIO/aio_win32.h
+	coss/aio_win32.c \
+	coss/aio_win32.h
 if USE_AIO_WIN32
 AIO_WIN32_SOURCES = $(AIO_WIN32_ALL_SOURCES)
 else