[gegl] Require Automake 1.10



commit fa84ebdbce2f3f2cf6d0cb866036cfe6c7e61450
Author: Martin Nordholts <martinn src gnome org>
Date:   Sat Aug 14 14:05:19 2010 +0200

    Require Automake 1.10
    
    Require Automake 1.10, the new compositions tests framework uses
    abs_builddir, only present from 1.10 and beyond.

 autogen.sh |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 6873a2c..694eb03 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}
 AUTOCONF=${AUTOCONF-autoconf}
 AUTOHEADER=${AUTOHEADER-autoheader}
-AUTOMAKE=${AUTOMAKE-automake-1.9}
+AUTOMAKE=${AUTOMAKE-automake}
 LIBTOOLIZE=${LIBTOOLIZE-libtoolize}
 
 AUTOCONF_REQUIRED_VERSION=2.54
-AUTOMAKE_REQUIRED_VERSION=1.9.6
+AUTOMAKE_REQUIRED_VERSION=1.10.0
 GLIB_REQUIRED_VERSION=2.8.0
 INTLTOOL_REQUIRED_VERSION=0.31
 LIBTOOL_REQUIRED_VERSION=1.5
@@ -156,9 +156,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]