[anjuta] vala: bgo#654502 - Allow building with libanjuta-0.14 (0.13 development tree)
- From: Johannes Schmid <jhs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [anjuta] vala: bgo#654502 - Allow building with libanjuta-0.14 (0.13 development tree)
- Date: Sun, 17 Jul 2011 08:43:22 +0000 (UTC)
commit e617e923a9280da3c02c6fbf195a2a5c9e6f450b
Author: Dominique Leuenberger <dominique-gnomezilla leuenberger net>
Date: Sun Jul 17 10:43:10 2011 +0200
vala: bgo#654502 - Allow building with libanjuta-0.14 (0.13 development tree)
configure.ac | 10 +++++++---
plugins/language-support-vala/Makefile.am | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4b4f853..58ef83f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,8 @@ dnl Glade
GLADEUI_REQUIRED=3.9.2
dnl Vala
-VALA_REQUIRED=0.11.2
+VALA12_REQUIRED=0.11.2
+VALA14_REQUIRED=0.13.0
dnl Introspection
GI_REQUIRED=0.9.5
@@ -251,11 +252,14 @@ else
AC_MSG_RESULT(no)
enable_vala="yes"
PKG_CHECK_MODULES(VALA,
- [libvala-0.12 >= $VALA_REQUIRED])
+ [libvala-0.14 >= $VALA14_REQUIRED],LIBVALA="libvala-0.14",
+ [PKG_CHECK_MODULES(VALA,
+ [libvala-0.12 >= $VALA12_REQUIRED],LIBVALA="libvala-0.12")])
+ AC_SUBST(LIBVALA)
fi
if test x$enable_vala = xyes; then
- AC_PATH_PROGS(VALAC, [valac-0.12 valac], valac)
+ AC_PATH_PROGS(VALAC, [valac-0.14 valac-0.12 valac], valac)
AC_SUBST(VALAC)
fi
diff --git a/plugins/language-support-vala/Makefile.am b/plugins/language-support-vala/Makefile.am
index 2f232d1..363cd4a 100644
--- a/plugins/language-support-vala/Makefile.am
+++ b/plugins/language-support-vala/Makefile.am
@@ -39,7 +39,7 @@ plugin_LTLIBRARIES = libanjuta-language-vala.la
# Plugin sources
libanjuta_language_vala_la_SOURCES = locator.vala plugin.vala provider.vala report.vala
-libanjuta_language_vala_la_VALAFLAGS = --pkg libvala-0.12 --pkg libanjuta-3.0
+libanjuta_language_vala_la_VALAFLAGS = --pkg $(LIBVALA) --pkg libanjuta-3.0
libanjuta_language_vala_la_LDFLAGS = $(ANJUTA_PLUGIN_LDFLAGS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]