[evolution/kill-bonobo] Bug 586632 – Require automake 1.9

[Matthew Barnes <mbarnes src gnome org>]

commit 75c526305d3a03d536484a9ed3922fa2587df543
Author: H.Habighorst <tearofadragon googlemail com>
Date:   Tue Jun 23 11:17:39 2009 -0400

    Bug 586632 â?? Require automake 1.9

 autogen.sh   |    2 +-
 configure.ac |    6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 1e2af1a..5a60b6e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Evolution"
-REQUIRED_AUTOMAKE_VERSION=1.6
+REQUIRED_AUTOMAKE_VERSION=1.9
 
 (test -f $srcdir/configure.ac \
   && test -f $srcdir/ChangeLog \
diff --git a/configure.ac b/configure.ac
index 48f6e2f..ab6dbba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,17 +21,13 @@ m4_define([upgrade_revision], [0])
 # Autoconf / Automake Initialization
 AC_PREREQ(2.54)
 AC_INIT(evolution, [evo_version], http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
-AM_INIT_AUTOMAKE([gnu])
+AM_INIT_AUTOMAKE([gnu 1.9])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(README)
 
 # Gnome Doc Initialization
 GNOME_DOC_INIT
 
-# Gross hack to enable 'make dist' on automake 1.9+tar 1.14.
-# The extra brackets are to foil regex-based scans.
-m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
-
 # Some requirements have versioned package names
 # XXX In the spirit of getting rid of versioned
 #     files, can we please drop these suffixes?