aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--configure.in6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cb952f884a..ee009d8994 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-19 Harish Krishnaswamy <kharish@novell.com>
+
+ * configure.in: Fix to allow longer file names
+ on 'make dist' using automake 1.9.
+
2006-01-17 Harish Krishnaswamy <kharish@novell.com>
* configure.in, NEWS: Release updates, version bump.
diff --git a/configure.in b/configure.in
index 82360c10f8..02a6489fe7 100644
--- a/configure.in
+++ b/configure.in
@@ -3,8 +3,12 @@ AC_PREREQ(2.52)
AC_INIT(evolution, 2.5.5, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution)
AC_CONFIG_SRCDIR(README)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+# 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])])
+
+AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST