diff options
| author | Werner Koch <[email protected]> | 2015-01-28 08:49:10 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2015-01-28 09:11:23 +0000 |
| commit | 77dfed442db065ce0c9e0afb8a0f6fd3ae169a64 (patch) | |
| tree | 0946c5d5322c60dd14614fc505989aa9f9a1b1e4 | |
| parent | w32: Fix assuan_connect_fd (diff) | |
| download | libassuan-77dfed442db065ce0c9e0afb8a0f6fd3ae169a64.tar.gz libassuan-77dfed442db065ce0c9e0afb8a0f6fd3ae169a64.zip | |
Require the use of automake 1.14
* configure.ac (AM_INIT_AUTOMAKE): Add serial-tests.
* src/Makefile.am (INCLUDES): Rename to AM_CPPFLAGS and remove the
nonexistent ../include/.
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index dffc18d..0a1ab88 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # configure.ac - for libassuan # Copyright (C) 2001, 2002, 2003, 2006, 2007, 2009, # 2011, 2012, 2013 Free Software Foundation, Inc. -# Copyright (C) 2013, 2014 g10 Code GmbH +# Copyright (C) 2013, 2014, 2015 g10 Code GmbH # # This file is part of Assuan. # @@ -20,8 +20,9 @@ # 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 libassuan-n.m.k) and run "./autogen.sh --force". Please @@ -74,7 +75,7 @@ PACKAGE=$PACKAGE_NAME VERSION=$PACKAGE_VERSION AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) AM_MAINTAINER_MODE AC_CONFIG_SRCDIR(src/assuan.h.in) AC_CONFIG_MACRO_DIR(m4) diff --git a/src/Makefile.am b/src/Makefile.am index 8ec2b31..435155e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = libassuan-config.in libassuan.m4 libassuan.vers \ versioninfo.rc.in libassuan.def mkheader.c gpgcedev.def -INCLUDES = -I.. -I$(top_srcdir)/include +AM_CPPFLAGS = -I.. bin_SCRIPTS = libassuan-config m4datadir = $(datadir)/aclocal |