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 41ddd0cc2225b6c64f8ce2c875af6d69a3f4f748..68d19daf17848ceb5d05eb1cc59c7c0f7e49936f 100644 (file)
--- 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)