summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Persch <chpe@svn.gnome.org>2007-01-11 20:38:01 +0000
committerChristian Persch <chpe@src.gnome.org>2007-01-11 20:38:01 +0000
commit2ea58dc73f96b36311d4b54d24596b96b484732f (patch)
treee906d3095718f701752eddacd792d2942bde3c94
parentcee011dd3be37adf6e3cca2abf27c210440960c6 (diff)
downloadshared-mime-info-2ea58dc73f96b36311d4b54d24596b96b484732f.tar.gz
Default to AM 1.9. Bug #323868, patch by Christian Kirbach.
2007-01-11 Christian Persch <chpe@svn.gnome.org> * macros2/gnome-autogen.sh: Default to AM 1.9. Bug #323868, patch by Christian Kirbach. svn path=/trunk/; revision=3898
-rw-r--r--ChangeLog5
-rw-r--r--macros2/gnome-autogen.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ec251d7c..cb02104e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2007-01-11 Christian Persch <chpe@svn.gnome.org>
+ * macros2/gnome-autogen.sh: Default to AM 1.9. Bug #323868, patch by
+ Christian Kirbach.
+
+2007-01-11 Christian Persch <chpe@svn.gnome.org>
+
* macros2/gnome-common.m4: Define more deprecation symbols.
Bug #343441.
diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index ccd05600..ed12f7da 100644
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -7,7 +7,7 @@ srcdir=${srcdir:-.}
# default version requirements ...
REQUIRED_AUTOCONF_VERSION=${REQUIRED_AUTOCONF_VERSION:-2.53}
-REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.4}
+REQUIRED_AUTOMAKE_VERSION=${REQUIRED_AUTOMAKE_VERSION:-1.9}
REQUIRED_LIBTOOL_VERSION=${REQUIRED_LIBTOOL_VERSION:-1.4.3}
REQUIRED_GETTEXT_VERSION=${REQUIRED_GETTEXT_VERSION:-0.10.40}
REQUIRED_GLIB_GETTEXT_VERSION=${REQUIRED_GLIB_GETTEXT_VERSION:-2.2.0}