diff options
| author | Werner Koch <[email protected]> | 2015-01-05 13:55:36 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-01-05 13:55:36 +0000 |
| commit | 445bb17d5fe6b53db078082fb033dbc67eea8307 (patch) | |
| tree | 1a43ae3925f1760531b9e00ad37fb210209bc8db | |
| parent | agent: Make --allow-loopback-pinentry gpgconf changeable. (diff) | |
| download | gnupg-445bb17d5fe6b53db078082fb033dbc67eea8307.tar.gz gnupg-445bb17d5fe6b53db078082fb033dbc67eea8307.zip | |
build: Require automake 1.14.
* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
| -rw-r--r-- | README.GIT | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/README.GIT b/README.GIT index ee2c6383f..57dab7a21 100644 --- a/README.GIT +++ b/README.GIT @@ -17,8 +17,8 @@ variables to override the default tool names: AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake package. For example - AUTOMAKE_SUFFIX="-1.7" ./autogen.sh - uses "automake-1.7" and "aclocal-1.7. + AUTOMAKE_SUFFIX="-1.14" ./autogen.sh + uses "automake-1.14" and "aclocal-1.14. AUTOMAKE_PREFIX is used as a prefix for all tools from the automake page and may be combined with AUTOMAKE_SUFFIX. e.g.: AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh diff --git a/configure.ac b/configure.ac index 16843f45d..30a639e11 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -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 gnupg-2.n.m) and run "./autogen.sh --force". Please @@ -78,9 +78,7 @@ VERSION=$PACKAGE_VERSION AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([sm/gpgsm.c]) AC_CONFIG_HEADER([config.h]) -# Note: For automake 1.13 add the option -# serial-tests -AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) AC_CANONICAL_HOST AB_INIT |