[gtk+/gtk-2-24] Allow building with automake 1.12
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-24] Allow building with automake 1.12
- Date: Wed, 1 Aug 2012 06:49:06 +0000 (UTC)
commit 1d07ef714dfe4ce872a7eaa1e66c65cb31af99b8
Author: Matthias Clasen <mclasen redhat com>
Date: Wed Aug 1 08:47:31 2012 +0200
Allow building with automake 1.12
autogen.sh | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 43d0ef8..06238dc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -48,7 +48,10 @@ fi
DIE=1
}
-if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
+if automake-1.12 --version < /dev/null > /dev/null 2>&1 ; then
+ AUTOMAKE=automake-1.12
+ ACLOCAL=aclocal-1.12
+else if automake-1.11 --version < /dev/null > /dev/null 2>&1 ; then
AUTOMAKE=automake-1.11
ACLOCAL=aclocal-1.11
else if automake-1.10 --version < /dev/null > /dev/null 2>&1 ; then
@@ -66,6 +69,7 @@ else
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]