diff options
| author | djcb <djcb@djcbsoftware.nl> | 2017-10-29 11:22:22 +0200 |
|---|---|---|
| committer | djcb <djcb@djcbsoftware.nl> | 2017-10-29 11:25:12 +0200 |
| commit | 8c531bd92bf8d22a1acb234f0f12ea05f7b71974 (patch) | |
| tree | 6118d45c239c966232eba6c6e7b0279aa86d4ed7 | |
| parent | a55b010ca54268dd62b8263d22ae7aae15000d0e (diff) | |
configure: don't require autoconf-archive
We ship the few macros we need or make them conditional
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | mu4e/mu4e.texi | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index ed8026d..03c7f4c 100644 --- a/configure.ac +++ b/configure.ac @@ -24,16 +24,8 @@ AC_CONFIG_SRCDIR([mu/mu.cc]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -m4_ifndef([AX_COMPILER_FLAGS],[ - AC_MSG_ERROR([ - *** autoconf-archive >= 20150925 required for the build setup. - *** Please install it, or get an official release from - *** https://github.com/djcb/mu/releases -]) -]) - -AX_IS_RELEASE([git-directory]) -AX_CHECK_ENABLE_DEBUG([yes]) +m4_ifdef([AX_IS_RELEASE],[AX_IS_RELEASE([git-directory])]) +m4_ifdef([AX_CHECK_ENABLE_DEBUG],[AX_CHECK_ENABLE_DEBUG([yes])]) AM_INIT_AUTOMAKE([1.14 foreign no-dist-gzip tar-ustar dist-xz]) @@ -53,7 +45,7 @@ AC_PROG_INSTALL AC_HEADER_STDC AX_CXX_COMPILE_STDCXX_14 -AX_COMPILER_FLAGS(,,[yes]) +m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes])]) AX_VALGRIND_CHECK # for now, use AM_PROG_LIBTOOL, as we don't want to require diff --git a/mu4e/mu4e.texi b/mu4e/mu4e.texi index 8e7bdda..f56cdfb 100644 --- a/mu4e/mu4e.texi +++ b/mu4e/mu4e.texi @@ -317,8 +317,8 @@ Xapian, GMime and their dependencies must be 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}, @t{texinfo}) installed: +different, and require you to have autotools (@t{autoconf}, +@t{automake}, @t{libtool}, @t{texinfo}) installed: @example # get from git (alternatively, use a github tarball) |