diff --git a/autogen.sh b/autogen.sh
index f8f681fc53..48c68e084a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,6 +32,7 @@ version_check "libtool" "" "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 4 0 || DIE=1
 version_check "pkg-config" "" "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1
 
 autoconf_2.52d_check || DIE=1
+aclocal_check || DIE=1
 
 CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-debug --enable-DEBUG'
 # if no arguments specified then this will be printed
@@ -45,7 +46,7 @@ fi
 
 toplevel_check $srcfile
 
-tool_run "aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
+tool_run "$aclocal" "-I m4 -I common/m4 $ACLOCAL_FLAGS"
 
 # FIXME : why does libtoolize keep complaining about aclocal ?
 
diff --git a/common b/common
index 22ee9f5959..745e216da0 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 22ee9f59590241153f1b162344d760c303b1305a
+Subproject commit 745e216da016ee67bb498de56969c266ffa29d8c