From: Marcos Mello <marcosfrm@gmail.com>
Date: Sun, 20 Mar 2016 12:00:54 +0000 (+1200)
Subject: Bug 4452: squid -z segfaults with ufs
X-Git-Tag: SQUID_4_0_8~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5b88fb56fcace27a744d33dce8c57e52ffc1108;p=thirdparty%2Fsquid.git

Bug 4452: squid -z segfaults with ufs
---

diff --git a/configure.ac b/configure.ac
index 17579681c5..6a2a3c0583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -788,15 +788,18 @@ for fs in $squid_storeio_module_candidates none; do
       fi
       ;;
     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 or Blocking DiskIO module])
-	fi
-	squid_do_build_rock=true
-	;;
+      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 DiskIO module: Blocking or IpcIo])
+      fi
+      squid_do_build_rock=true
+      ;;
     ufs)
-	squid_do_build_ufs=true
-	;;
+      if test "x$squid_disk_module_candidates_Blocking" != "xyes"; then
+        AC_MSG_ERROR([Storage module ufs requires DiskIO module: Blocking])
+      fi
+      squid_do_build_ufs=true
+      ;;
     esac
 done