[vte/vte-0-48] build: vala: Fix check for valac >= 0.31.1
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vte/vte-0-48] build: vala: Fix check for valac >= 0.31.1
- Date: Wed, 26 Apr 2017 09:24:10 +0000 (UTC)
commit 129c4e74d9d53bff8c45401e71f075d685b8503e
Author: Christian Persch <chpe src gnome org>
Date: Wed Apr 26 11:21:41 2017 +0200
build: vala: Fix check for valac >= 0.31.1
Need to always check this, since we build (but not install) the
test application when --enable-vala is given.
https://bugzilla.gnome.org/show_bug.cgi?id=781720
(cherry picked from commit 66c974291c38822e7591dccfe8b3665fea5f2b28)
configure.ac | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b36ed68..78401db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -388,24 +388,19 @@ m4_ifdef([VAPIGEN_CHECK],
# Test Application
# ****************
-AC_MSG_CHECKING([whether to build the test application])
+AC_MSG_CHECKING([whether to install the vala test application])
AC_ARG_ENABLE([test-application],
- [AS_HELP_STRING([--disable-test-application],[Disable test application])],
+ [AS_HELP_STRING([--disable-test-application],[Disable installing the vala test application])],
[],[enable_test_application=$enable_vala])
AC_MSG_RESULT([$enable_test_application])
AM_PROG_VALAC([0.24.0],[],[
- if test "$enable_test_application" != "no"; then
- AC_MSG_ERROR([vala support enabled by vala compiler not found])
+ if test "$enable_vala" != "no"; then
+ AC_MSG_ERROR([Vala requested but vala compiler >= 0.24.0 not found])
fi])
-if test "$enable_test_application" = "yes"; then
- PKG_CHECK_MODULES([GTK_3_16],[gtk+-$GTK_API_VERSION >= 3.16],[have_gtk_3_16=yes],[have_gtk_3_16=no])
- AM_PROG_VALAC([0.31.1],[have_vala_0_31=yes],[have_vala_0_31=no])
-else
- have_gtk_3_16=no
- have_vala_0_31=no
-fi
+PKG_CHECK_MODULES([GTK_3_16],[gtk+-$GTK_API_VERSION >= 3.16],[have_gtk_3_16=yes],[have_gtk_3_16=no])
+AM_PROG_VALAC([0.31.1],[have_vala_0_31=yes],[have_vala_0_31=no])
AM_CONDITIONAL([ENABLE_TEST_APPLICATION],[test "$enable_test_application" = "yes"])
AM_CONDITIONAL([HAVE_GTK_3_16],[test "$have_gtk_3_16" = "yes"])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]