Update to automake 1.14.

diff --git a/Makefile.am b/Makefile.am
index 61c98e1..f8f7aac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
 DISTCHECK_CONFIGURE_FLAGS = --disable-pinentry-qt4
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog

diff --git a/assuan/Makefile.am b/assuan/Makefile.am
index 0790a0e..2553f3e 100644 (file)
--- a/assuan/Makefile.am
+++ b/assuan/Makefile.am
@@ -20,7 +20,7 @@
 ## Process this file with automake to produce Makefile.in
 
 EXTRA_DIST = mkerrors ChangeLog-old
-INCLUDES = -I.. -I$(top_srcdir)/include
+AM_CPPFLAGS = -I.. -I$(top_srcdir)/include
 BUILT_SOURCES = assuan-errors.c
 MOSTLYCLEANFILES = assuan-errors.c
 

diff --git a/autogen.sh b/autogen.sh
index 31cfeeb..7effd56 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -202,12 +202,12 @@ if [ "$myhost" = "find-version" ]; then
 
     case "$version_parts" in
       2)
-        matchstr1="$package-$major.[0-9][0-9]*"
+        matchstr1="$package-$major.[0-9]*"
         matchstr2="$package-$major-base"
         vers="$major.$minor"
         ;;
       *)
-        matchstr1="$package-$major.$minor.[0-9][0-9]*"
+        matchstr1="$package-$major.$minor.[0-9]*"
         matchstr2="$package-$major.$minor-base"
         vers="$major.$minor.$micro"
         ;;
@@ -310,7 +310,7 @@ if [ "$myhost" = "w32" ]; then
 
     $tsdir/configure --enable-maintainer-mode ${SILENT} \
              --prefix=${w32root}  \
-             --host=${host} --build=${build} \
+             --host=${host} --build=${build} SYSROOT=${w32root} \
              ${configure_opts} ${extraoptions} "$@"
     rc=$?
     exit $rc

diff --git a/configure.ac b/configure.ac
index 1cbd8b2..3bd7952 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -19,8 +19,8 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 # (Process this file with autoconf to produce a configure script.)
-AC_PREREQ(2.57)
-min_automake_version="1.10"
+AC_PREREQ(2.69)
+min_automake_version="1.14"
 
 # To build a release you need to create a tag with the version number
 # (git tag -s pinentry-n.m.k) and run "./autogen.sh --force".  Please
@@ -47,7 +47,7 @@ AC_INIT([pinentry],[mym4_full_version], [http://bugs.gnupg.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_CONFIG_HEADER(config.h)
 AC_CONFIG_SRCDIR(pinentry/pinentry.h)
-AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
 
 AC_GNU_SOURCE