[Xfce4-commits] <xfce4-vala:xfce-4.8> Update build to Vala 0.12

[Mike Massonnet]

Updating branch refs/heads/xfce-4.8
         to 5703c797f8366ff9784dbecbceedfddbe69e77fb (commit)
       from 8aab7e76b1acc2f6090622d829637fee7c0607dc (commit)

commit 5703c797f8366ff9784dbecbceedfddbe69e77fb
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Wed Apr 27 21:05:57 2011 +0200

    Update build to Vala 0.12

 acinclude.m4                |   14 +++++++-------
 configure.ac.in             |    4 ++--
 vapi/exo-1.vapi             |    2 +-
 vapi/libxfce4panel-1.0.vapi |    2 +-
 vapi/libxfce4ui-1.vapi      |    2 +-
 vapi/libxfce4util-1.0.vapi  |    2 +-
 vapi/libxfconf-0.vapi       |    2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d1208ce..ccba9af 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -18,31 +18,31 @@ PKG_CHECK_EXISTS([$2 >= $3], [],
 
 dnl # M8T_CHECK_VALA(minimum_version)
 dnl #
-dnl # Check for the package vala-0.10 and substitutes useful Vala variables.
+dnl # Check for the package libvala-0.12 and substitutes useful Vala variables.
 dnl #
 AC_DEFUN([M8T_CHECK_VALA],
 [
-PKG_CHECK_MODULES([VALA], [vala-0.10 >= $1])
+PKG_CHECK_MODULES([VALA], [libvala-0.12 >= $1])
 M8T_VALA_PROGS()
 M8T_VAPI_DIR()
 ])
 
 dnl # M8T_VALA_PROGS()
 dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.10 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from libvala-0.12 pkgconfig file.
 dnl #
 AC_DEFUN([M8T_VALA_PROGS],
 [
 AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-0.10`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen libvala-0.12`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.12`)
 ])
 
 dnl # M8T_VAPI_DIR()
 dnl #
-dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
+dnl # Substitutes vapidir from libvala-0.12 pkgconfig file.
 dnl #
 AC_DEFUN([M8T_VAPI_DIR],
 [
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-0.10`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir libvala-0.12`)
 ])
diff --git a/configure.ac.in b/configure.ac.in
index 4b78025..6f6bf2c 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -28,14 +28,14 @@ M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 M8T_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
 
 dnl Check for Vala
-M8T_CHECK_VALA([0.10.0])
+M8T_CHECK_VALA([0.12.0])
 AC_ARG_WITH([default-vapidir],
 		AC_HELP_STRING([--with-default-vapidir],
 				[Use default VAPI prefix from Vala installation]),
 		[],
 		[with_default_vapidir=no])
 if test x"$with_default_vapidir" == xno ; then
-	AC_SUBST([vapidir], [${datarootdir}/vala-0.10/vapi])
+	AC_SUBST([vapidir], [${datarootdir}/vala-0.12/vapi])
 fi
 
 dnl Makefile outputs
diff --git a/vapi/exo-1.vapi b/vapi/exo-1.vapi
index 5b233d3..f1b9280 100644
--- a/vapi/exo-1.vapi
+++ b/vapi/exo-1.vapi
@@ -1,4 +1,4 @@
-/* exo-1.vapi generated by vapigen-0.10, do not modify. */
+/* exo-1.vapi generated by vapigen-0.12, do not modify. */
 
 [CCode (cprefix = "Exo", lower_case_cprefix = "exo_")]
 namespace Exo {
diff --git a/vapi/libxfce4panel-1.0.vapi b/vapi/libxfce4panel-1.0.vapi
index bccf44b..dc77dbc 100644
--- a/vapi/libxfce4panel-1.0.vapi
+++ b/vapi/libxfce4panel-1.0.vapi
@@ -1,4 +1,4 @@
-/* libxfce4panel-1.0.vapi generated by vapigen-0.10, do not modify. */
+/* libxfce4panel-1.0.vapi generated by vapigen-0.12, do not modify. */
 
 [CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
diff --git a/vapi/libxfce4ui-1.vapi b/vapi/libxfce4ui-1.vapi
index 13d704e..c2d5050 100644
--- a/vapi/libxfce4ui-1.vapi
+++ b/vapi/libxfce4ui-1.vapi
@@ -1,4 +1,4 @@
-/* libxfce4ui-1.vapi generated by vapigen-0.10, do not modify. */
+/* libxfce4ui-1.vapi generated by vapigen-0.12, do not modify. */
 
 [CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
diff --git a/vapi/libxfce4util-1.0.vapi b/vapi/libxfce4util-1.0.vapi
index 778b521..ee52364 100644
--- a/vapi/libxfce4util-1.0.vapi
+++ b/vapi/libxfce4util-1.0.vapi
@@ -1,4 +1,4 @@
-/* libxfce4util-1.0.vapi generated by vapigen-0.10, do not modify. */
+/* libxfce4util-1.0.vapi generated by vapigen-0.12, do not modify. */
 
 [CCode (cprefix = "Xfce", lower_case_cprefix = "xfce_")]
 namespace Xfce {
diff --git a/vapi/libxfconf-0.vapi b/vapi/libxfconf-0.vapi
index 42694c7..6db19bc 100644
--- a/vapi/libxfconf-0.vapi
+++ b/vapi/libxfconf-0.vapi
@@ -1,4 +1,4 @@
-/* libxfconf-0.vapi generated by vapigen-0.10, do not modify. */
+/* libxfconf-0.vapi generated by vapigen-0.12, do not modify. */
 
 [CCode (cprefix = "Xfconf", lower_case_cprefix = "xfconf_")]
 namespace Xfconf {