From cc030a5929ab1dc372b3256fc624925739b9bba4 Mon Sep 17 00:00:00 2001
From: Matthias Andree <matthias.andree@gmx.de>
Date: Fri, 17 Feb 2006 16:23:35 +0000
Subject: Specify minimum versions and options for automake consistently, bump
 automake version to 1.8 (was 1.5).

svn path=/branches/BRANCH_6-3/; revision=4691
---
 Makefile.am  | 2 +-
 configure.ac | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 34cd3373..438d277f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # Makefile for fetchmail
 
 SUBDIRS=		m4 po
-AUTOMAKE_OPTIONS=	foreign no-dist-gzip dist-bzip2
+AUTOMAKE_OPTIONS=	1.8 foreign no-dist-gzip dist-bzip2
 
 AM_CFLAGS=		@CEFLAGS@
 AM_CPPFLAGS=		@CPFLAGS@ -I$(srcdir)/libesmtp
diff --git a/configure.ac b/configure.ac
index 6b807dca..0fb66389 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,9 +12,9 @@ AC_CONFIG_LIBOBJ_DIR([.])
 
 AC_CANONICAL_TARGET
 
-dnl we may need a newer automake version - the oldest tested is 1.7
+dnl automake options are in Makefile.am
 AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(1.5 foreign no-installinfo)
+AM_INIT_AUTOMAKE
 
 dnl autobuild support, see <http://josefsson.org/autobuild/>
 (
-- 
cgit v1.2.3