summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2015-01-05 17:46:05 +0100
committerWerner Koch <wk@gnupg.org>2015-02-27 11:21:25 +0100
commitc123e313e90a6ffb14c9be3ddaab3ad44a44f2b6 (patch)
tree3db2c00139edb282e7026e8bfbbbfbd167197aaa
parent5e72b6c76ebee720f69b8a5c212f52d38eb50287 (diff)
downloadlibgcrypt-c123e313e90a6ffb14c9be3ddaab3ad44a44f2b6.tar.gz
build: Require automake 1.14.
* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests and dist-bzip2. * Makefile.am (AUTOMAKE_OPTIONS): Remove. Signed-off-by: Werner Koch <wk@gnupg.org>
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac4
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 937bdaff..bc0e5c52 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,6 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
DISTCHECK_CONFIGURE_FLAGS = --disable-random-daemon \
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
diff --git a/configure.ac b/configure.ac
index 4220047b..e0dfb42a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# (Process this file with autoconf to produce a configure script.)
AC_REVISION($Revision$)
AC_PREREQ(2.60)
-min_automake_version="1.10"
+min_automake_version="1.14"
# To build a release you need to create a tag with the version number
# (git tag -s libgcrypt-n.m.k) and run "./autogen.sh --force". Please
@@ -74,7 +74,7 @@ VERSION=$PACKAGE_VERSION
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([src/libgcrypt.vers])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
AC_CONFIG_HEADER(config.h)
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_LIBOBJ_DIR([compat])