]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 4452: squid -z segfaults with ufs
authorMarcos Mello <marcosfrm@gmail.com>
Sun, 20 Mar 2016 12:00:54 +0000 (00:00 +1200)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 20 Mar 2016 12:00:54 +0000 (00:00 +1200)
configure.ac

index 17579681c5c0874ea4abda3b6f509582a712454c..6a2a3c0583afab7f85a91d0bba1e510bbe5ed674 100644 (file)
@@ -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