Merge lp:~bratsche/xsplash/automake-1.11 into lp:xsplash

Proposed by Cody Russell
Status: Merged
Merged at revision: not available
Proposed branch: lp:~bratsche/xsplash/automake-1.11
Merge into: lp:xsplash
Diff against target: 23 lines
1 file modified
autogen.sh (+7/-6)
To merge this branch: bzr merge lp:~bratsche/xsplash/automake-1.11
Reviewer Review Type Date Requested Status
Ted Gould (community) Approve
Review via email: mp+12599@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ted Gould (ted) wrote :

The change looks fine, but you should just use the GNOME Common autogen script. Then you get other people to do these updates for you :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'autogen.sh'
--- autogen.sh 2009-08-24 21:59:01 +0000
+++ autogen.sh 2009-09-29 17:11:09 +0000
@@ -311,12 +311,13 @@
311311
312case $REQUIRED_AUTOMAKE_VERSION in312case $REQUIRED_AUTOMAKE_VERSION in
313 1.4*) automake_progs="automake-1.4" ;;313 1.4*) automake_progs="automake-1.4" ;;
314 1.5*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;314 1.5*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
315 1.6*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;315 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
316 1.7*) automake_progs="automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;316 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
317 1.8*) automake_progs="automake-1.10 automake-1.9 automake-1.8" ;;317 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
318 1.9*) automake_progs="automake-1.10 automake-1.9" ;;318 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
319 1.10*) automake_progs="automake-1.10" ;;319 1.10*) automake_progs="automake-1.11 automake-1.10" ;;
320 1.11*) automake_progs="automake-1.11" ;;
320esac321esac
321version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \322version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
322 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1323 "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz" || DIE=1

Subscribers

People subscribed via source and target branches