X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=cfa9c09bd3dc4c186c163c6b223b56598789ba3e;hp=a357eb916fef846445e4e4167f3a5c0a7eeec444;hb=8c0bebedc5edbff5ddc46b66da1177ec18f48c69;hpb=9ca14bcbab0cd6c2b9a7717927390245a853ab05 diff --git a/configure b/configure index a357eb91..cfa9c09b 100755 --- a/configure +++ b/configure @@ -829,8 +829,8 @@ if [ -z "${EMACSETCDIR-}" ]; then fi if [ $WITH_EMACS = "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 "Checking if emacs (>= 25) is available... " + if emacs --quick --batch --eval '(if (< emacs-major-version 25) (kill-emacs 1))' > /dev/null 2>&1; then printf "Yes.\n" else printf "No (disabling emacs related parts of build)\n" @@ -1536,7 +1536,7 @@ EOF if [ $WITH_PYTHON_DOCS = "1" ]; then echo "tags.add('WITH_PYTHON')" fi - printf "rsti_dir = '%s'\n" $(realpath emacs) + printf "rsti_dir = '%s'\n" "$(cd emacs && pwd -P)" } > sphinx.config # Finally, after everything configured, inform the user how to continue.