From d0671ac3da29f0ed072875f8e9fef9e874577723 Mon Sep 17 00:00:00 2001 From: djcb Date: Tue, 24 Apr 2018 14:55:26 +0300 Subject: [PATCH] mu4e: bump minimal required emacs to 24.4 We didn't really support older versions anyway, so let's make it official. --- Makefile.am | 28 ++++++++++++++-------------- configure.ac | 8 +++++--- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9b0cf8b7..b55cb8af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -## Copyright (C) 2008-2013 Dirk-Jan C. Binnema +## Copyright (C) 2008-2018 Dirk-Jan C. Binnema ## ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -52,7 +52,7 @@ tags: # which is a sign that it needs some refactoring. requires the pmccabe # tool. If all is fine, it outputs nothing cc10: - @$(PMCCABE) `find . -name '*.c' -o -name '*.cc'` \ + @$(PMCCABE) `find . -name '*.c' -o -name '*.cc'` \ | grep -v mu-str-normalize.c \ | grep -v mu_str_subject_normalize \ | grep -v tests \ @@ -77,20 +77,20 @@ fixme: # check whether we can run make distcheck from the repo version gitcheck: - cd `mktemp -d`; \ - git clone git://github.com/djcb/mu.git ; \ - cd mu; \ - autoreconf -i ; \ - ./configure ; \ + cd `mktemp -d`; \ + git clone git://github.com/djcb/mu.git ; \ + cd mu; \ + autoreconf -i ; \ + ./configure ; \ make distcheck -EXTRA_DIST= \ - TODO \ - HACKING \ - gtest.mk \ - NEWS \ - NEWS.org \ +EXTRA_DIST= \ + TODO \ + HACKING \ + gtest.mk \ + NEWS \ + NEWS.org \ autogen.sh -doc_DATA = \ +doc_DATA = \ NEWS.org diff --git a/configure.ac b/configure.ac index 55c0718b..26421a31 100644 --- a/configure.ac +++ b/configure.ac @@ -73,11 +73,13 @@ AC_ARG_ENABLE([mu4e], AS_IF([test "x$enable_mu4e" != "xno"], [ AM_PATH_LISPDIR AS_IF([test "x$lispdir" != "xno"], [ - emacs_version="`$EMACS --version | head -1`" + emacs_version="$($EMACS --version | head -1)" lispdir="${lispdir}/mu4e/" ]) - AS_CASE([$emacs_version],[*23*|*24*|*25*|*26*|*27*],[build_mu4e=yes], - [AC_WARN([emacs is too old to build mu4e (need emacs >= 23.x)])]) + AS_CASE([$emacs_version], + [*24.4*|*24.5*],[build_mu4e=yes], + [*25*|*26*|*27*],[build_mu4e=yes], + [AC_WARN([emacs is too old to build mu4e (need emacs >= 24.4)])]) ]) AM_CONDITIONAL(BUILD_MU4E, test "x$build_mu4e" = "xyes")