------------------------------------------------------------
revno: 12350
revision-id: squid3@treenet.co.nz-20121010013503-i2me53ii2l0zbw5t
parent: squid3@treenet.co.nz-20121010013216-p0ymfqqrezbsyvqc
author: Francesco Chemolli <kinkie@squid-cache.org>
committer: Amos Jeffries <squid3@treenet.co.nz>
branch nick: 3.3
timestamp: Tue 2012-10-09 19:35:03 -0600
message:
  Windows: disable Mmapped DiskIO support
  
  MinGW does not always supply mmap.
  
  TODO:
   Add proper feature detection to decide when this IS available on Windows.
   Use the Windows native mmap functionality.
------------------------------------------------------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: squid3@treenet.co.nz-20121010013503-i2me53ii2l0zbw5t
# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# testament_sha1: 0ad8b71684cebe51ad8f6e190fbb49688f8c3631
# timestamp: 2012-10-10 01:38:43 +0000
# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3
# base_revision_id: squid3@treenet.co.nz-20121010013216-\
#   p0ymfqqrezbsyvqc
# 
# Begin patch
=== modified file 'configure.ac'
--- configure.ac	2012-10-06 04:21:58 +0000
+++ configure.ac	2012-10-10 01:35:03 +0000
@@ -684,10 +684,16 @@
       ;;
 
     Mmapped)
-      AC_MSG_NOTICE([Enabling Mmapped DiskIO module])
-      DISK_LIBS="$DISK_LIBS libMmapped.a"
-      DISK_MODULES="$DISK_MODULES Mmapped"
-      DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/Mmapped/MmappedDiskIOModule.o"
+      dnl TODO: use availability of sys/mman.h and/or mmap to define
+      dnl  OR support windows mmap functions
+      if test "x$squid_host_os" = "xmingw" ; then
+        AC_MSG_NOTICE([Mmapped DiskIO is not available on Mingw])
+      else
+        AC_MSG_NOTICE([Enabling Mmapped DiskIO module])
+        DISK_LIBS="$DISK_LIBS libMmapped.a"
+        DISK_MODULES="$DISK_MODULES Mmapped"
+        DISK_LINKOBJS="$DISK_LINKOBJS DiskIO/Mmapped/MmappedDiskIOModule.o"
+      fi
       ;;
 
     IpcIo)