[gnome-builder] build: require vala 0.38
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] build: require vala 0.38
- Date: Tue, 18 Apr 2017 20:53:23 +0000 (UTC)
commit 0c4c950b6ca1e288b0245f41872afc2e941a563a
Author: Christian Hergert <chergert redhat com>
Date: Tue Apr 18 13:52:53 2017 -0700
build: require vala 0.38
This probably means we can simplify some code in the vala-pack plugin too.
plugins/vala-pack/configure.ac | 8 ++++++--
plugins/vala-pack/meson.build | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/plugins/vala-pack/configure.ac b/plugins/vala-pack/configure.ac
index ae92e11..80328aa 100644
--- a/plugins/vala-pack/configure.ac
+++ b/plugins/vala-pack/configure.ac
@@ -1,6 +1,10 @@
VAPIGEN_CHECK
-PKG_CHECK_MODULES(VALA, [libvala-0.36],[have_libvala=yes],[have_libvala=no])
-VALA_VERSION=0.36
+PKG_CHECK_MODULES(VALA, [libvala-0.38],[have_libvala=yes],[have_libvala=no])
+VALA_VERSION=0.38
+AS_IF([test x$have_libvala = xno],[
+ PKG_CHECK_MODULES(VALA, [libvala-0.36],[have_libvala=yes],[have_libvala=no])
+ VALA_VERSION=0.36
+])
AS_IF([test x$have_libvala = xno],[
PKG_CHECK_MODULES(VALA, [libvala-0.34],[have_libvala=yes],[have_libvala=no])
VALA_VERSION=0.34
diff --git a/plugins/vala-pack/meson.build b/plugins/vala-pack/meson.build
index 2e667b0..8cfe02f 100644
--- a/plugins/vala-pack/meson.build
+++ b/plugins/vala-pack/meson.build
@@ -7,6 +7,7 @@ endif
add_languages('vala')
libvala_options = [
+ ['libvala-0.38', ''],
['libvala-0.36', ''],
['libvala-0.34', ''],
['libvala-0.32', ''],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]