From: Cosimo Cecchi Date: Fri, 31 Jul 2009 22:18:25 +0000 (-0400) Subject: Fix Bug 588224 – Does not build with automake 1.11 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14f6c6d0e287edd15876c0d81fa599b6a447728c;p=libchamplain Fix Bug 588224 – Does not build with automake 1.11 --- diff --git a/AUTHORS b/AUTHORS index ef2843e..2779b3a 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,3 +21,4 @@ Patryk Zawadski Sebastian Reichel Tim Horton Frederic Peters +Cosimo Cecchi diff --git a/autogen.sh b/autogen.sh index 04e6af7..32bb0de 100755 --- a/autogen.sh +++ b/autogen.sh @@ -311,12 +311,13 @@ 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.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" ;; + 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" ;; + 1.6*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;; + 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;; + 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;; + 1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;; + 1.10*) automake_progs="automake-1.11 automake-1.10" ;; + 1.11*) automake_progs="automake-1.11" ;; 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