[Xfce4-commits] <xfce4-vala:master> Update build to Vala 0.16

[Mike Massonnet]

Updating branch refs/heads/master
         to b1b13aeb6c279221fd5bcaa01810e4364e270079 (commit)
       from 8aab7e76b1acc2f6090622d829637fee7c0607dc (commit)

commit b1b13aeb6c279221fd5bcaa01810e4364e270079
Author: Mike Massonnet <mmassonnet at gmail.com>
Date:   Wed Oct 17 02:12:09 2012 +0200

    Update build to Vala 0.16

 acinclude.m4    |   14 +++++++-------
 autogen.sh      |   21 +--------------------
 configure.ac.in |   16 ++++++++--------
 3 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index d1208ce..b47cb49 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 vala-0.16 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.16 >= $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 vala-0.16 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.16`)
+AC_SUBST([VALAGI], `$PKG_CONFIG --variable=vala_gen_introspect libvala-0.16`)
 ])
 
 dnl # M8T_VAPI_DIR()
 dnl #
-dnl # Substitutes vapidir from vala-0.10 pkgconfig file.
+dnl # Substitutes vapidir from vala-0.16 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.16`)
 ])
diff --git a/autogen.sh b/autogen.sh
index f6165e2..3bb92fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,10 +1,4 @@
 #!/bin/sh
-#
-# Copyright (c) 2002-2005
-#         The Xfce development team. All rights reserved.
-#
-# Written for Xfce by Benedikt Meurer <benny at xfce.org>.
-#
 
 (type xdt-autogen) >/dev/null 2>&1 || {
   cat >&2 <<EOF
@@ -16,20 +10,7 @@ EOF
   exit 1
 }
 
-echo 'dnl *** This file is automatically generated from configure.ac.in ***' \
-    >configure.ac
-echo 'dnl *** DO NOT EDIT! ***' >>configure.ac
-echo >>configure.ac
-
-# substitute revision
-if [ -d .git ]; then
-    revision=$(git log -1 --pretty=format:%h 2>&1 || echo NOHEAD)
-else
-    revision=UNKNOWN
-fi
-sed -e "s/@REVISION@/${revision}/g" \
-    < "configure.ac.in" >> "configure.ac"
-
+XDT_AUTOGEN_REQUIRED_VERSION="4.7.3" \
 xdt-autogen $@
 
 # vi:set ts=2 sw=2 et ai:
diff --git a/configure.ac.in b/configure.ac.in
index 4b78025..6503a4a 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -6,7 +6,7 @@ dnl
 
 dnl Version information
 m4_define([project_version_major], [4])
-m4_define([project_version_minor], [8])
+m4_define([project_version_minor], [10])
 m4_define([project_version_micro], [0])
 m4_define([project_version_build], [@REVISION@])
 m4_define([project_version_tag], []) # leave empty for release
@@ -21,21 +21,21 @@ dnl Check for basic programs
 AC_PROG_INSTALL()
 
 dnl Check for required packages
-M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
-M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.8.0])
-M8T_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
-M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
-M8T_CHECK_PACKAGE([EXO], [exo-1], [0.6.0])
+M8T_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+M8T_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.10.0])
+M8T_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+M8T_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.10.0])
+M8T_CHECK_PACKAGE([EXO], [exo-1], [0.8.0])
 
 dnl Check for Vala
-M8T_CHECK_VALA([0.10.0])
+M8T_CHECK_VALA([0.16.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.16/vapi])
 fi
 
 dnl Makefile outputs