diff options
| author | Stepan Kasal <kasal@ucw.cz> | 2005-09-20 06:27:53 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2005-09-20 06:27:53 +0000 |
| commit | bb4d2fba58ed308ab5481175fa500a0ea32ca14e (patch) | |
| tree | e2ab44579d5baa9fbd93796cd09d5e7c099fab9c | |
| parent | ca0b6684c39baea5bbeeaddab6066401ef5f82dd (diff) | |
| download | gnome-common-bb4d2fba58ed308ab5481175fa500a0ea32ca14e.tar.gz | |
Prefer newer versions of Automake. From bug #305641.
2005-09-20 Stepan Kasal <kasal@ucw.cz>
* macros2/gnome-autogen.sh: Prefer newer versions of Automake.
From bug #305641.
svn path=/trunk/; revision=3772
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 8 |
2 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +2005-09-20 Stepan Kasal <kasal@ucw.cz> + + * macros2/gnome-autogen.sh: Prefer newer versions of Automake. + From bug #305641. + 2005-09-20 James Henstridge <james@jamesh.id.au> * configure.in: bump version to 2.12.0 diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 1ddfdb1..448aa1c 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -289,10 +289,10 @@ AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/` case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;; - 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9" ;; - 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9" ;; - 1.8*) automake_progs="automake-1.8 automake-1.9" ;; + 1.5*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.9 automake-1.8" ;; 1.9*) automake_progs="automake-1.9" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ |