diff options
| author | Rodney Dawes <dobey@free.fr> | 2003-12-08 23:18:12 +0000 |
|---|---|---|
| committer | Rodney Dawes <dobey@src.gnome.org> | 2003-12-08 23:18:12 +0000 |
| commit | 4712e3980c9729d7af23c69bf6aa4610eaf80a2b (patch) | |
| tree | b09a73e7b1f0dcc32eabf811dfd5e64e5331669b | |
| parent | 626c827638599e45cafb72dc4a8bd5944098b0b6 (diff) | |
| download | gnome-common-4712e3980c9729d7af23c69bf6aa4610eaf80a2b.tar.gz | |
Update automake checks to check incremental versions in the correct order,
2003-12-08 Rodney Dawes <dobey@free.fr>
* autogen.sh: Update automake checks to check incremental
versions in the correct order, Fixes #128691
svn path=/trunk/; revision=3071
| -rw-r--r-- | macros2/ChangeLog | 5 | ||||
| -rw-r--r-- | macros2/autogen.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index 895c7f5..f8533ad 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,8 @@ +2003-12-08 Rodney Dawes <dobey@free.fr> + + * autogen.sh: Update automake checks to check incremental + versions in the correct order, Fixes #128691 + 2003-11-19 Malcolm Tredinnick <malcolm@commsecure.com.au> * autogen.sh: Replace use of -or in a find command with -o. diff --git a/macros2/autogen.sh b/macros2/autogen.sh index 598edc5..bdde708 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -249,8 +249,8 @@ 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.7 automake-1.6 automake-1.5" ;; - 1.6*) automake_progs="automake-1.7 automake-1.6" ;; + 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7" ;; + 1.6*) automake_progs="automake-1.6 automake-1.7" ;; 1.7*) automake_progs="automake-1.7" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ |