diff --git a/.travis.yml b/.travis.yml index 80b75eb9..66260aea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,6 @@ install: - export PATH="$HOME/.evm/bin:$PATH" - evm install $EVM_EMACS --use script: - - autoreconf -i - - ./configure + - ./autogen.sh - make - make check diff --git a/configure.ac b/configure.ac index 8d731baf..70167605 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ ## along with this program; if not, write to the Free Software Foundation, ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -AC_PREREQ([2.69]) +AC_PREREQ([2.68]) AC_INIT([mu],[0.9.19],[https://github.com/djcb/mu/issues],[mu]) AC_COPYRIGHT([Copyright (C) 2008-2016 Dirk-Jan C. Binnema]) AC_CONFIG_HEADERS([config.h]) @@ -24,6 +24,9 @@ AC_CONFIG_SRCDIR([mu/mu.cc]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([xua]) # Win/DOS don't like 'aux' +m4_ifdef([AX_COMPILER_FLAGS], [], + AC_MSG_ERROR([Please install autoconf-archive])) + AX_IS_RELEASE([git-directory]) AX_CHECK_ENABLE_DEBUG([yes]) diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index badf6290..2d51803b 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -298,7 +298,7 @@ $ sudo yum install webkitgtk3-devel @anchor{Building from a release tarball} Using a release-tarball (as available from -GoogleCode@footnote{@url{http://code.google.com/p/mu0/downloads/list}}, +GoogleCode@footnote{@url{https://github.com/djcb/mu/releases}}, installation follows the typical steps: @example @@ -314,17 +314,17 @@ Xapian, GMime and their dependencies must be installed. @subsection Building from git @anchor{Building from git} -Alternatively, if you build from the git repository or use a tarball like the -ones that @t{github} produces, the instructions are slightly different, and -require you to have @t{autotools} (Autoconf, Automake, Libtool, and friends) -installed: +Alternatively, if you build from the git repository or use a tarball +like the ones that @t{github} produces, the instructions are slightly +different, and require you to have @t{autotools} (@t{autoconf}, +@t{autoconf-archive}, @t{automake}, @t{libtool}, and friends) installed: @example # get from git (alternatively, use a github tarball) $ git clone git://github.com/djcb/mu.git $ cd mu -$ autoreconf -i && ./configure && make +$ ./autogen.sh && ./configure && make # On the BSDs: use gmake instead of make $ sudo make install @end example