Merge tag '0.28.1'

[notmuch] / configure

diff --git a/configure b/configure
index ea22587b24ff257bfe8d2b2dff3e27e7d9d2f2f2..a6f5dfa2ca2b894da29ff4bd93ef96a3266587ab 100755 (executable)
--- a/configure
+++ b/configure
@@ -623,8 +623,8 @@ if [ -z "${EMACSETCDIR-}" ]; then
     EMACSETCDIR="\$(prefix)/share/emacs/site-lisp"
 fi
 
-printf "Checking if emacs is available... "
-if emacs --quick --batch > /dev/null 2>&1; then
+printf "Checking if emacs (>= 24) is available... "
+if emacs --quick --batch --eval '(if (< emacs-major-version 24) (kill-emacs 1))' > /dev/null 2>&1; then
     printf "Yes.\n"
     have_emacs=1
 else