From: Dmitry Kurochkin <dmitry.kurochkin@measurement-factory.com>
Date: Tue, 4 Oct 2011 17:27:45 +0000 (+0400)
Subject: Do not require IpcIo DiskIO module to build Rock store.
X-Git-Tag: BumpSslServerFirst.take01~122^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be718d7a4c7c30b9e74d6c2cd6751d835c4aa5b5;p=thirdparty%2Fsquid.git

Do not require IpcIo DiskIO module to build Rock store.

Rock can be used in non-SMP mode with Blocking DiskIO module.
---

diff --git a/configure.ac b/configure.ac
index 41ddd0cc22..68d19daf17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -751,10 +751,6 @@ if test "x$squid_opt_enable_storeio" = "xauto"; then
   SQUID_LOOK_FOR_MODULES([$srcdir/src/fs],[squid_storeio_module_candidates])
   # disable coss
   squid_storeio_module_candidates=`echo $squid_storeio_module_candidates|sed 's/coss//'`
-  if test "x$ac_cv_search_shm_open" = "xno" ; then
-    # disable rock
-    squid_storeio_module_candidates=`echo $squid_storeio_module_candidates|sed 's/rock//'`
-  fi
   AC_MSG_RESULT([$squid_storeio_module_candidates])
 fi
 
@@ -786,12 +782,9 @@ for fs in $squid_storeio_module_candidates none; do
       STORE_TESTS="$STORE_TESTS tests/testCoss$EXEEXT"
       ;;
     rock)
-	if ! test "x$squid_disk_module_candidates_IpcIo" = "xyes" -a \
-	  "x$squid_disk_module_candidates_Blocking" = "xyes"; then
-	  AC_MSG_ERROR([Storage module Rock requires IpcIo and Blocking DiskIO modules])
-	fi
-	if test "x$ac_cv_search_shm_open" = "xno" ; then
-	  AC_MSG_ERROR([Storage module Rock requires shared memory support])
+	if test "x$squid_disk_module_candidates_IpcIo" != "xyes" -a \
+	  "x$squid_disk_module_candidates_Blocking" != "xyes"; then
+	  AC_MSG_ERROR([Storage module Rock requires IpcIo or Blocking DiskIO module])
 	fi
 	;;
     ufs)