Make configuration fail if vapigen is missing

diff --git a/backends/telepathy/Makefile.am b/backends/telepathy/Makefile.am
index 8719e99..5c7bf6a 100644 (file)
--- a/backends/telepathy/Makefile.am
+++ b/backends/telepathy/Makefile.am
@@ -1,6 +1,3 @@
-GEN_INTROSPECT = $(shell pkg-config vala-1.0 --variable="gen_introspect")
-VAPIGEN = $(shell pkg-config vala-1.0 --variable="vapigen")
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/folks \
        -include $(CONFIG_HEADER) \
@@ -54,7 +51,7 @@ libtp_lowlevel_la_LDFLAGS = \
        $(NULL)
 
 tp-lowlevel.gi: $(libtp-lowlevel_la_SOURCES) libtp-lowlevel.la
-       $(VGI_V)$(GEN_INTROSPECT) --namespace=Folks tp-lowlevel.h \
+       $(VGI_V)$(VALA_GEN_INTROSPECT) --namespace=Folks tp-lowlevel.h \
                $(shell pkg-config telepathy-glib --cflags) \
                $(GLIB_CFLAGS) $(DBUS_GLIB_CFLAGS) $(GEE_CFLAGS) \
                $(TP_VALA_CFLAGS) -I$(top_srcdir)/folks \

diff --git a/configure.ac b/configure.ac
index 712f194..5de6716 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -42,6 +42,7 @@ AC_PROG_LIBTOOL
 AC_PATH_PROG(VALAC, valac, valac)
 AC_SUBST(VALAC)
 
+PKG_PROG_PKG_CONFIG([0.21])
 AC_SUBST(PKG_CONFIG_PATH)
 
 # require GLib >= 2.24 so GLib.Array, etc. reffing is handled automatically
@@ -49,6 +50,15 @@ VALACFLAGS="$VALACFLAGS --target-glib=2.24"
 AC_SUBST(VALACFLAGS)
 AC_SUBST(VALAFLAGS)
 
+VAPIGEN=`$PKG_CONFIG --variable=vapigen vala-1.0`
+AC_SUBST(VAPIGEN)
+
+VALA_GEN_INTROSPECT=`$PKG_CONFIG --variable=gen_introspect vala-1.0`
+AC_SUBST(VALA_GEN_INTROSPECT)
+
+AS_IF([test "$VAPIGEN" = "" -o "$VALA_GEN_INTROSPECT" = ""],
+       [AC_MSG_ERROR([Vala must be built with --enable-vapigen])])
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)

diff --git a/folks/Makefile.am b/folks/Makefile.am
index 8e53d1a..d3b2dee 100644 (file)
--- a/folks/Makefile.am
+++ b/folks/Makefile.am
@@ -1,6 +1,3 @@
-GEN_INTROSPECT = $(shell pkg-config vala-1.0 --variable="gen_introspect")
-VAPIGEN = $(shell pkg-config vala-1.0 --variable="vapigen")
-
 sharedir = $(datadir)/folks
 backenddir = $(libdir)/folks