@@ -4,12 +4,12 @@
 AS_IF([test configure.ac -nt configure], [
 	AC_MSG_ERROR([configure.ac is newer than configure! Run autoreconf!])
 ])
 
 AC_CONFIG_SRCDIR(src)
-AC_CONFIG_MACRO_DIR(m4)
 AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_MACRO_DIR(build-aux/m4)
 
 AC_CANONICAL_HOST
 
 dnl Used to disable checking for -pedantic on some platforms where it's broken
 check_pedantic="yes"