aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-05-02 17:57:58 -0400
committerGlenn Morris2014-05-02 17:57:58 -0400
commitcd626254b7031392ff12ba2806f0e68b0ccda8e3 (patch)
treeea81cb59eaa72c8178961126835d890de301c2e5
parent3e3fbb995473fb3822904d4d216386370a790fe3 (diff)
downloademacs-cd626254b7031392ff12ba2806f0e68b0ccda8e3.tar.gz
emacs-cd626254b7031392ff12ba2806f0e68b0ccda8e3.zip
* configure.ac (AC_CONFIG_MACRO_DIR): Use it.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac2
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 @@
12014-05-02 Glenn Morris <rgm@gnu.org> 12014-05-02 Glenn Morris <rgm@gnu.org>
2 2
3 * configure.ac (AC_CONFIG_MACRO_DIR): Use it.
4
3 * autogen.sh (get_version): Handle no leading whitespace. 5 * autogen.sh (get_version): Handle no leading whitespace.
4 (check_version, main): Handle program names with hyphens. 6 (check_version, main): Handle program names with hyphens.
5 7
diff --git a/configure.ac b/configure.ac
index d27c2676bb6..837a619d8a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,8 @@ done
83AC_CONFIG_HEADERS(src/config.h:src/config.in) 83AC_CONFIG_HEADERS(src/config.h:src/config.in)
84AC_CONFIG_SRCDIR(src/lisp.h) 84AC_CONFIG_SRCDIR(src/lisp.h)
85AC_CONFIG_AUX_DIR(build-aux) 85AC_CONFIG_AUX_DIR(build-aux)
86dnl automake 1.13 and later understand this, making -I m4 unnecessary.
87AC_CONFIG_MACRO_DIR(m4)
86 88
87xcsdkdir= 89xcsdkdir=
88AC_CHECK_PROGS(XCRUN, [xcrun]) 90AC_CHECK_PROGS(XCRUN, [xcrun])