[gtk+/gtk-2-24] Support automake 1.15
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] Support automake 1.15
- Date: Mon, 16 Feb 2015 15:30:21 +0000 (UTC)
commit dea9eae3af525adc69849dea60b653ceaa19766e
Author: Ting-Wei Lan <lantw src gnome org>
Date: Tue Jan 27 15:45:24 2015 +0800
Support automake 1.15
https://bugzilla.gnome.org/show_bug.cgi?id=743544
autogen.sh | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index fba2472..078f483 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,7 +48,10 @@ fi
DIE=1
}
-if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.15 --version < /dev/null > /dev/null 2>&1 ; then
+ AUTOMAKE=automake-1.15
+ ACLOCAL=aclocal-1.15
+else if automake-1.14 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.14
ACLOCAL=aclocal-1.14
else if automake-1.13 --version < /dev/null > /dev/null 2>&1 ; then
@@ -68,8 +71,8 @@ else if automake-1.7 --version < /dev/null > /dev/null 2>&1 ; then
ACLOCAL=aclocal-1.7
else
echo
- echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x or 1.14.x"
- echo "installed to compile $PROJECT."
+ echo "You must have automake 1.7.x, 1,10.x, 1.11.x, 1.12.x, 1.13.x, 1.14.x"
+ echo "or 1.15.x installed to compile $PROJECT."
echo "Install the appropriate package for your distribution,"
echo "or get the source tarball at http://ftp.gnu.org/gnu/automake/"
DIE=1
@@ -79,6 +82,7 @@ fi
fi
fi
fi
+fi
if test "$DIE" -eq 1; then
exit 1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]