summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.in2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35ae23d9..be88c31d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2006-07-08 Behdad Esfahbod <behdad@gnome.org>
+ Bug 346297 – autogen doesn't work with automake-1.6
+ Patch from Priit Laes
+
+ * autogen.sh, configure.in: Require automake 1.7.
+
+2006-07-08 Behdad Esfahbod <behdad@gnome.org>
+
* pango/glyphstring.c (pango_glyph_string_get_width):
* pango/pango-glyph.h:
* pango/pango-layout.c (pango_layout_line_index_to_x),
diff --git a/autogen.sh b/autogen.sh
index ebc47e40..52545e43 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
-REQUIRED_AUTOMAKE_VERSION=1.6
+REQUIRED_AUTOMAKE_VERSION=1.7
PKG_NAME="pango"
diff --git a/configure.in b/configure.in
index 35c5d1f6..5903f605 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ AC_INIT(pango, pango_version(),
AC_CONFIG_SRCDIR([ChangeLog])
-AM_INIT_AUTOMAKE(1.6 gnits)
+AM_INIT_AUTOMAKE(1.7 gnits)
AM_CONFIG_HEADER([config.h])