1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

build: Require automake 1.14.

* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
This commit is contained in:
Werner Koch 2015-01-05 14:55:36 +01:00
parent ac2cb47fc5
commit 445bb17d5f
2 changed files with 4 additions and 6 deletions

View File

@ -17,8 +17,8 @@ variables to override the default tool names:
AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake AUTOMAKE_SUFFIX is used as a suffix for all tools from the automake
package. For example package. For example
AUTOMAKE_SUFFIX="-1.7" ./autogen.sh AUTOMAKE_SUFFIX="-1.14" ./autogen.sh
uses "automake-1.7" and "aclocal-1.7. uses "automake-1.14" and "aclocal-1.14.
AUTOMAKE_PREFIX is used as a prefix for all tools from the automake AUTOMAKE_PREFIX is used as a prefix for all tools from the automake
page and may be combined with AUTOMAKE_SUFFIX. e.g.: page and may be combined with AUTOMAKE_SUFFIX. e.g.:
AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh AUTOMAKE_PREFIX=/usr/foo/bin ./autogen.sh

View File

@ -19,7 +19,7 @@
# Process this file with autoconf to produce a configure script. # Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61) 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 # 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 # (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_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([sm/gpgsm.c]) AC_CONFIG_SRCDIR([sm/gpgsm.c])
AC_CONFIG_HEADER([config.h]) AC_CONFIG_HEADER([config.h])
# Note: For automake 1.13 add the option AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
# serial-tests
AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AB_INIT AB_INIT