2 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 936177a4422..c9ca6bfa9c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-05-02  Glenn Morris  <rgm@gnu.org>
 
+        * configure.ac (AC_CONFIG_MACRO_DIR): Use it.
+
         * autogen.sh (get_version): Handle no leading whitespace.
         (check_version, main): Handle program names with hyphens.
 
diff --git a/configure.ac b/configure.ac
index d27c2676bb6..837a619d8a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,8 @@ done
 AC_CONFIG_HEADERS(src/config.h:src/config.in)
 AC_CONFIG_SRCDIR(src/lisp.h)
 AC_CONFIG_AUX_DIR(build-aux)
+dnl automake 1.13 and later understand this, making -I m4 unnecessary.
+AC_CONFIG_MACRO_DIR(m4)
 
 xcsdkdir=
 AC_CHECK_PROGS(XCRUN, [xcrun])