diff --git a/aux/binpac b/aux/binpac
index be0147ae8d..668bfa1832 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit be0147ae8df149206408f669ea233931e8889718
+Subproject commit 668bfa183250c14056e5e7790f07f4cb2b06d275
diff --git a/aux/bro-aux b/aux/bro-aux
index e6fa79f8c6..fd60602c87 160000
--- a/aux/bro-aux
+++ b/aux/bro-aux
@@ -1 +1 @@
-Subproject commit e6fa79f8c6584476c6a50118990e9e69be41823b
+Subproject commit fd60602c87503124a0e1f1f886ebb9730835fd5c
diff --git a/aux/broccoli b/aux/broccoli
index 05a35440b0..c3f2610730 160000
--- a/aux/broccoli
+++ b/aux/broccoli
@@ -1 +1 @@
-Subproject commit 05a35440b0369e5e5e74731300ceddbe78cd53e4
+Subproject commit c3f26107302e6bcfc45c5681eb9d69b48fad7b62
diff --git a/aux/broctl b/aux/broctl
index 818bc09e35..5173da3952 160000
--- a/aux/broctl
+++ b/aux/broctl
@@ -1 +1 @@
-Subproject commit 818bc09e35691f3d5c6de56481dac79d5b87db75
+Subproject commit 5173da39523f6db4a087cc60d04f4fd6765f4e15
diff --git a/configure b/configure
index 01be939a4e..cc18423584 100755
--- a/configure
+++ b/configure
@@ -189,21 +189,9 @@ done
 if [ -d $builddir ]; then
     # If build directory exists, check if it has a CMake cache
     if [ -f $builddir/CMakeCache.txt ]; then
-        # If the Cmake cache exists, then check that it thinks
-        # the source tree exists where it's currently located
-        cmakehomedir=`grep CMAKE_HOME_DIRECTORY $builddir/CMakeCache.txt | \
-                      sed 's/CMAKE_HOME_DIRECTORY:INTERNAL=//g'`
-        if [ "$cmakehomedir" != "$sourcedir" ]; then
-            # The source tree moved since the build was last configured
-            echo "\
-The source tree has been moved from:
-    $cmakehomedir
-to:
-    $sourcedir
-To reconfigure in the new source directory, please delete:
-    $builddir/CMakeCache.txt" >&2
-            exit 1
-        fi
+        # If the CMake cache exists, delete it so that this configuration
+        # is not tainted by a previous one
+        rm -f $builddir/CMakeCache.txt
     fi
 else
     # Create build directory