]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Bug 4452: squid -z segfaults with ufs
authorMarcos Mello <marcosfrm@gmail.com>
Wed, 23 Mar 2016 14:48:36 +0000 (03:48 +1300)
committerAmos Jeffries <squid3@treenet.co.nz>
Wed, 23 Mar 2016 14:48:36 +0000 (03:48 +1300)
configure.ac

index 4dcfd8997f0a13dab8e5a94dcd451e325a4e34da..77ffa4c07221ed46c0455cfe24194506aa2dd435 100644 (file)
@@ -833,15 +833,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