diff --git a/common b/common
index 8a9436f47d..2c019822f7 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 8a9436f47d6e851edbf25d4cceaf071bdc6d11a2
+Subproject commit 2c019822f7097285eba6c1898ef9f3e996fadc8f
diff --git a/configure.ac b/configure.ac
index ca6586fe2c..b45c2796cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ AM_CONFIG_HEADER(config.h)
 
 dnl Add parameters for aclocal
 dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
-ACLOCAL="cat m4/*.m4>acinclude.m4;$ACLOCAL $ACLOCAL_FLAGS"
+ACLOCAL="$ACLOCAL -I m4 -I common/m4 $ACLOCAL_FLAGS"
 
 AM_MAINTAINER_MODE