diff options
| author | Kjartan Maraas <kmaraas@gnome.org> | 2006-12-01 12:29:19 +0000 |
|---|---|---|
| committer | Kjartan Maraas <kmaraas@src.gnome.org> | 2006-12-01 12:29:19 +0000 |
| commit | e2376f175277350e79ea37b9904c7eaf2bec8618 (patch) | |
| tree | f8c8420c2b562461fcfb1f058469227ba32486e1 | |
| parent | f9e48085185e39c3fc130c1917294e5cca7e1322 (diff) | |
| download | shared-mime-info-e2376f175277350e79ea37b9904c7eaf2bec8618.tar.gz | |
Make automake 1.10 work too.
2006-12-01 Kjartan Maraas <kmaraas@gnome.org>
* macros2/gnome-autogen.sh: Make automake 1.10 work too.
svn path=/trunk/; revision=3894
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | macros2/gnome-autogen.sh | 11 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,7 @@ +2006-12-01 Kjartan Maraas <kmaraas@gnome.org> + + * macros2/gnome-autogen.sh: Make automake 1.10 work too. + 2006-10-20 Bastien Nocera <hadess@hadess.net> * macros2/gnome-autogen.sh: exit from the check_m4macros function as diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh index 6a69fc5b..ccd05600 100644 --- a/macros2/gnome-autogen.sh +++ b/macros2/gnome-autogen.sh @@ -300,11 +300,12 @@ 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.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" ;; + 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;; + 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.10" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1 |