Catch up with the new location for the telepathy-glib.vapi bindings file.

diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 60ed3e5..fdc6935 100644 (file)
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -5,8 +5,9 @@ AM_CPPFLAGS = \
        -DG_LOG_DOMAIN=\"TelepathyBackend\" \
        $(NULL)
 
-VALAFLAGS += $(TP_VALA_VALAFLAGS)
-VALAFLAGS += --vapidir=. --vapidir=$(top_srcdir)/folks
+VALAFLAGS += \
+       --vapidir=. \
+       --vapidir=$(top_srcdir)/folks
 
 noinst_LTLIBRARIES = libtp-lowlevel.la
 folks_telepathydir = $(libdir)
@@ -46,7 +47,7 @@ tp-lowlevel.gi: $(libtp-lowlevel_la_SOURCES) libtp-lowlevel.la
        $(AM_V_GEN)$(VALA_GEN_INTROSPECT) --namespace=Folks \
                $(srcdir)/tp-lowlevel.h \
                $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) $(GEE_CFLAGS) \
-               $(TP_VALA_CFLAGS) $(TP_GLIB_CFLAGS) -I$(top_srcdir)/folks \
+               $(TP_GLIB_CFLAGS) -I$(top_srcdir)/folks \
                .libs/libtp-lowlevel.so > tp-lowlevel.gi
 
 # copy the metadata file as necessary, to work around gnome bug #624278
@@ -54,7 +55,7 @@ tp-lowlevel.vapi: tp-lowlevel.gi tp-lowlevel.metadata
        test -e tp-lowlevel.metadata || \
                (cp $(srcdir)/tp-lowlevel.metadata . && \
                touch tp-lowlevel.metadata.copied)
-       $(AM_V_GEN)$(VAPIGEN) $(TP_VALA_VALAFLAGS) --library tp-lowlevel \
+       $(AM_V_GEN)$(VAPIGEN) $(VALAFLAGS) --library tp-lowlevel \
                --metadata=tp-lowlevel.metadata --pkg gio-2.0 \
                --pkg telepathy-glib \
                tp-lowlevel.gi
@@ -99,7 +100,6 @@ libfolks_telepathy_la_CPPFLAGS = \
        $(DBUS_GLIB_CFLAGS) \
        $(GEE_CFLAGS) \
        $(TP_GLIB_CFLAGS) \
-       $(TP_VALA_CFLAGS) \
        $(AM_CPPFLAGS) \
        $(NULL)
 
@@ -109,7 +109,6 @@ libfolks_telepathy_la_LIBADD = \
        $(DBUS_GLIB_LIBS) \
        $(GEE_LIBS) \
        $(TP_GLIB_LIBS) \
-       $(TP_VALA_LIBS) \
        $(top_builddir)/folks/libfolks.la \
        $(NULL)
 
@@ -165,7 +164,6 @@ libfolks_backend_telepathy_la_CPPFLAGS = \
        $(DBUS_GLIB_CFLAGS) \
        $(GEE_CFLAGS) \
        $(TP_GLIB_CFLAGS) \
-       $(TP_VALA_CFLAGS) \
        $(AM_CPPFLAGS) \
        $(NULL)
 
@@ -175,7 +173,6 @@ libfolks_backend_telepathy_la_LIBADD = \
        $(DBUS_GLIB_LIBS) \
        $(GEE_LIBS) \
        $(TP_GLIB_LIBS) \
-       $(TP_VALA_LIBS) \
        -L$(abs_top_srcdir)/backends/telepathy/.libs \
        -lfolks-telepathy \
        $(NULL)

diff --git a/configure.ac b/configure.ac
index 92cadf0..b0e1a1b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -59,8 +59,7 @@ AC_SUBST(LDFLAGS)
 # Dependencies
 # -----------------------------------------------------------
 GLIB_REQUIRED=2.24.0
-TP_GLIB_REQUIRED=0.11.10
-TP_VALA_REQUIRED=0.11.10
+TP_GLIB_REQUIRED=0.11.11
 VALA_REQUIRED=0.9.4
 
 PKG_CHECK_MODULES(VALA, vala-1.0 >= $VALA_REQUIRED)
@@ -84,6 +83,8 @@ VALACFLAGS="$VALACFLAGS --target-glib=2.24"
 AC_SUBST(VALACFLAGS)
 AC_SUBST(VALAFLAGS)
 
+VAPIDIR=`$PKG_CONFIG --variable=vapidir vala-1.0`
+AC_SUBST(VAPIDIR)
 VAPIGEN=`$PKG_CONFIG --variable=vapigen vala-1.0`
 AC_SUBST(VAPIGEN)
 
@@ -111,17 +112,13 @@ PKG_CHECK_MODULES(GEE, gee-1.0)
 AC_SUBST(GEE_CFLAGS)
 AC_SUBST(GEE_LIBS)
 
-PKG_CHECK_MODULES(TP_VALA, telepathy-vala >= $TP_VALA_REQUIRED)
-AC_SUBST(TP_VALA_CFLAGS)
-AC_SUBST(TP_VALA_LIBS)
-
-TP_VALA_VALAFLAGS=`$PKG_CONFIG --variable=valaflags telepathy-vala`
-AC_SUBST(TP_VALA_VALAFLAGS)
-
 PKG_CHECK_MODULES(TP_GLIB, telepathy-glib >= $TP_GLIB_REQUIRED)
 AC_SUBST(TP_GLIB_CFLAGS)
 AC_SUBST(TP_GLIB_LIBS)
 
+AS_IF([test ! -e "$VAPIDIR/telepathy-glib.vapi"],
+       [AC_MSG_ERROR([missing telepathy-glib Vala bindings])])
+
 # -----------------------------------------------------------
 # Backends
 # -----------------------------------------------------------