Updating branch refs/heads/xfce-4.6
to ddc41d565069caaa74567a3c3765f384bb9d7b1c (commit)
from c360d1807f6db61b2de738cbcb9a969bbc42eca7 (commit)
commit ddc41d565069caaa74567a3c3765f384bb9d7b1c
Author: Mike Massonnet <[email protected]>
Date: Wed Oct 27 21:00:15 2010 +0200
Update build to Vala 0.10
acinclude.m4 | 14 +++++++-------
configure.ac.in | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index 7324209..d1208ce 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-1.0 and substitutes useful Vala variables.
+dnl # Check for the package vala-0.10 and substitutes useful Vala variables.
dnl #
AC_DEFUN([M8T_CHECK_VALA],
[
-PKG_CHECK_MODULES([VALA], [vala-1.0 >= $1])
+PKG_CHECK_MODULES([VALA], [vala-0.10 >= $1])
M8T_VALA_PROGS()
M8T_VAPI_DIR()
])
dnl # M8T_VALA_PROGS()
dnl #
-dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-1.0 pkgconfig file.
+dnl # Substitutes VALAC, VAPIGEN and VALAGI from vala-0.10 pkgconfig file.
dnl #
AC_DEFUN([M8T_VALA_PROGS],
[
AC_PATH_PROG([VALAC], [valac], [valac])
-AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-1.0`)
-AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-1.0`)
+AC_SUBST([VAPIGEN], `$PKG_CONFIG --variable=vapigen vala-0.10`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect vala-0.10`)
])
dnl # M8T_VAPI_DIR()
dnl #
-dnl # Substitutes vapidir from vala-1.0 pkgconfig file.
+dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
dnl #
AC_DEFUN([M8T_VAPI_DIR],
[
-AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-1.0`)
+AC_SUBST([vapidir], `$PKG_CONFIG --variable=vapidir vala-0.10`)
])
diff --git a/configure.ac.in b/configure.ac.in
index 56daa8c..02f6439 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -29,7 +29,7 @@ M8T_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.100])
M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.6.0])
dnl Check for Vala
-M8T_CHECK_VALA([0.7.1])
+M8T_CHECK_VALA([0.10.0])
AC_ARG_WITH([default-vapidir],
AC_HELP_STRING([--with-default-vapidir],
[Use default VAPI prefix from Vala
installation]),
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
