[gimp] autogen.sh: require automake >= 1.10 and default to 1.11



commit 780d2b8e58cc7bcba70dcf4c28a24b4e03d11c1a
Author: Michael Natterer <mitch gimp org>
Date:   Thu Apr 14 21:03:11 2011 +0200

    autogen.sh: require automake >= 1.10 and default to 1.11
    
    Remove automake-1.9 from the list of possible versions because it
    fails to define $(builddir) which is required in some places.

 autogen.sh |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 82f02d2..e464296 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,14 +9,14 @@
 # tools and you shouldn't use this script.  Just call ./configure
 # directly.
 
-ACLOCAL=${ACLOCAL-aclocal-1.9}
+ACLOCAL=${ACLOCAL-aclocal-1.11}
 AUTOCONF=${AUTOCONF-autoconf}
 AUTOHEADER=${AUTOHEADER-autoheader}
-AUTOMAKE=${AUTOMAKE-automake-1.9}
+AUTOMAKE=${AUTOMAKE-automake-1.11}
 LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 
 AUTOCONF_REQUIRED_VERSION=2.54
-AUTOMAKE_REQUIRED_VERSION=1.9.6
+AUTOMAKE_REQUIRED_VERSION=1.10.0
 INTLTOOL_REQUIRED_VERSION=0.40.1
 LIBTOOL_REQUIRED_VERSION=1.5
 LIBTOOL_WIN32_REQUIRED_VERSION=2.2
@@ -163,9 +163,6 @@ elif (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
 elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
    AUTOMAKE=automake-1.10
    ACLOCAL=aclocal-1.10
-elif (automake-1.9 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.9
-   ACLOCAL=aclocal-1.9
 else
     echo
     echo "  You must have automake $AUTOMAKE_REQUIRED_VERSION or newer installed to compile $PROJECT."



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]