build: Require automake 1.14.

* Makefile.am (AUTOMAKE_OPTIONS): Move to ...
* configure.ac (AM_INIT_AUTOMAKE): here.  Add option serial-tests.
* kbx/Makefile.am (INCLUDES): Remove.  Include ../am/cmacros.

4 files changed, 12 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 447976e6c..892a85784 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,12 +19,11 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
-EXTRA_DIST = scripts/config.rpath autogen.sh README.SVN              \
+EXTRA_DIST = scripts/config.rpath autogen.sh README.GIT              \
 	     ChangeLog-2011 po/ChangeLog-2011 scripts/ChangeLog-2011
 
 DISTCLEANFILES = g10defs.h
diff --git a/README.SVN b/README.GIT
index c6422829f..57dab7a21 100644
--- a/README.SVN
+++ b/README.GIT
@@ -1,11 +1,11 @@
-If you are building from Subversion, run the script
+If you are building from GIT, run the script
 
 ./autogen.sh
 
 first, to make sure that you have all the necessary maintainer tools
 are installed and to build the actual configuration files.  If you
-have just updated from SVN, you should add the option "--force" to
-autogen.sh so that meta data from SVN is noticed.  Then run
+have just checked out from GIT, you should add the option "--force" to
+autogen.sh so that meta data is noticed by autom4te.cache.  Then run
 
 ./configure --enable-maintainer-mode
 
@@ -16,9 +16,9 @@ tools, or the tools are not installed, you may use environment
 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.
+                  package.  For example
+                     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
@@ -37,15 +37,13 @@ It is also possible to use the variable name AUTOMAKE, AUTOCONF,
 ACLOCAL, AUTOHEADER, GETTEXT and MSGMERGE to directly specify the name
 of the programs to run.  It is however better to use the suffix and
 prefix forms as described above because that does not require
-knowledge about the actual tools used by autgen.sh.
+knowledge about the actual tools used by autogen.sh.
 
 
 Please don't use autopoint, libtoolize or autoreconf unless you are
 the current maintainer and want to update the standard configuration
-files.  All those files should be in the SVN and only updated manually
+files.  All those files should be in GIT and only updated manually
 if the maintainer decides that newer versions are required.  The
 maintainer should also make sure that the required version of automake
 et al. are properly indicated at the top of configure.ac and take care
 to copy the files and not merely use symlinks.
-
-
diff --git a/configure.ac b/configure.ac
index 3f83bdca1..eeca02229 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,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
@@ -63,7 +63,7 @@ VERSION=$PACKAGE_VERSION
 AC_CONFIG_AUX_DIR(scripts)
 AC_CONFIG_SRCDIR(sm/gpgsm.c)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
+AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
 AC_CANONICAL_HOST
 AB_INIT
 
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index 0d6a066e6..65c0af244 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -18,12 +18,11 @@
 
 ## Process this file with automake to produce Makefile.in
 
-localedir = $(datadir)/locale
-INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
 
 EXTRA_DIST = mkerrors ChangeLog-2011
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common -I$(top_srcdir)/intl \
 	       $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
+include $(top_srcdir)/am/cmacros.am
 
 noinst_LIBRARIES = libkeybox.a
 bin_PROGRAMS = kbxutil