Rock can be used in non-SMP mode with Blocking DiskIO module.
---
configure.ac | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git configure.ac configure.ac
index 0e87181..273d89c 100644
--- configure.ac
+++ 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)
--
1.7.6.3
Received on Wed Sep 28 2011 - 23:07:26 MDT
This archive was generated by hypermail 2.2.0 : Thu Sep 29 2011 - 12:00:03 MDT