[tracker] build: Require Vala >= 0.12.0, to avoid introspection sed scripting/fixing



commit 466ac9ebf2cfe8ced69fb88e44b7ae360e6b0cc5
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Apr 7 10:45:01 2011 +0100

    build: Require Vala >= 0.12.0, to avoid introspection sed scripting/fixing
    
    This also fixes a distcheck issue which was quite nasty to try to fix.

 autogen.sh                        |    2 +-
 configure.ac                      |    3 ---
 src/libtracker-sparql/Makefile.am |   15 ---------------
 3 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 62a5120..6cb7639 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,7 +3,7 @@
 #
 # NOTE: compare_versions() is stolen from gnome-autogen.sh
 
-REQUIRED_VALA_VERSION=0.11.4
+REQUIRED_VALA_VERSION=0.12.0
 
 # Usage:
 #     compare_versions MIN_VERSION ACTUAL_VERSION
diff --git a/configure.ac b/configure.ac
index 3573cd4..c1bb174 100644
--- a/configure.ac
+++ b/configure.ac
@@ -483,9 +483,6 @@ fi
 
 AC_SUBST(VALAC)
 
-AX_VALA_CHECK_VERSION([0.11.8], vala_good_gir=true, vala_good_gir=false)
-AM_CONDITIONAL(VALA_GOOD_GIR, test "x$vala_good_gir" == "xtrue")
-
 ####################################################################
 # Check gettext/intltool support
 ####################################################################
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 13892cb..cf9cee8 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -75,21 +75,6 @@ EXTRA_DIST =                                           \
 -include $(INTROSPECTION_MAKEFILE)
 
 if HAVE_INTROSPECTION
-
-#  set introspectable=0 to the function that uses va_list. This is not needed with a modern vala ( >= 0.11.8)
-if VALA_GOOD_GIR
-Tracker- TRACKER_API_VERSION@.gir: $(noinst_LTLIBRARIES) Makefile
-else
-Tracker- TRACKER_API_VERSION@.gir: $(noinst_LTLIBRARIES) Makefile
-	if [[ -z `grep tracker_sparql_escape_uri_vprintf $@ |grep introspectable` ]] ; then \
-	  sed -i $@ -e "s/c\:identifier\=\"tracker_sparql_escape_uri_vprintf\"/&\ introspectable=\"0\"/g" ; \
-        fi
-	if [[ -z `grep scope $ ` ]] ; then \
-	  sed -i $@ -e "s/\"_callback_\"/&\ scope=\"async\"/g" ; \
-        fi
-
-endif
-
 Tracker- TRACKER_API_VERSION@.typelib: Tracker-$(TRACKER_API_VERSION).gir
 	@INTROSPECTION_COMPILER@ --shared-library=libtracker-sparql- TRACKER_API_VERSION@.so -o $@ $^
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]