diff options
| author | Malcolm Tredinnick <malcolm@src.gnome.org> | 2004-01-31 01:09:16 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm@src.gnome.org> | 2004-01-31 01:09:16 +0000 |
| commit | c6a1672f4b89fc98f8ffdb94ac69ef5ffb244452 (patch) | |
| tree | a2013153bf19960c3b1c821eafcdc4be8597cde4 | |
| parent | ef3e21ee571b0c03ca6898ecbe30d4e5db619c3a (diff) | |
| download | gnome-common-c6a1672f4b89fc98f8ffdb94ac69ef5ffb244452.tar.gz | |
Use automake-1.8 if available. Patch from alexander.winston@comcast.net
* autogen.sh: Use automake-1.8 if available. Patch from
alexander.winston@comcast.net (Alexander Winston). Bug #132966.
svn path=/trunk/; revision=3436
| -rw-r--r-- | macros2/ChangeLog | 5 | ||||
| -rw-r--r-- | macros2/autogen.sh | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index bcbbc5b..4cdd4bb 100644 --- a/macros2/ChangeLog +++ b/macros2/ChangeLog @@ -1,3 +1,8 @@ +2004-01-31 Malcolm Tredinnick <malcolm@commsecure.com.au> + + * autogen.sh: Use automake-1.8 if available. Patch from + alexander.winston@comcast.net (Alexander Winston). Bug #132966. + 2004-01-25 Malcolm Tredinnick <malcolm@commsecure.com.au> * autogen.sh: Deprecate the use of GNOME2_DIR and allow the use diff --git a/macros2/autogen.sh b/macros2/autogen.sh index a4a0070..4d94e49 100644 --- a/macros2/autogen.sh +++ b/macros2/autogen.sh @@ -261,9 +261,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" ;; - 1.6*) automake_progs="automake-1.6 automake-1.7" ;; - 1.7*) automake_progs="automake-1.7" ;; + 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8" ;; + 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8" ;; + 1.7*) automake_progs="automake-1.7 automake-1.8" ;; + 1.8*) automake_progs="automake-1.8" ;; 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 |