From 6384b03f11282bfce08f7463db026f6dbbc30c72 Mon Sep 17 00:00:00 2001
From: Jens Georg <jensg@openismus.com>
Date: Mon, 15 Apr 2013 13:01:26 +0200
Subject: [PATCH] Depend on vapigen >= 0.20 on newer g-i

---
 configure.ac  | 23 +++++++++++++++++++++--
 m4/vapigen.m4 |  6 ++++--
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8f71ce2..aad7a19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -81,14 +81,24 @@ AS_IF([test "x$[]enable_strict_c" = "xyes"],
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 # vapigen
+have_vapigen=no
 AS_IF([test "x$found_introspection" = "xyes"],
       [
-       VALA_PROG_VAPIGEN([0.14])
+       dnl output of g-i >= 1.36.0 needs vapigen >= 0.20 to process
+       AC_MSG_CHECKING([whether G-I is 1.36 or newer])
+       VAPIGEN_MIN_VERSION=0.14
+       AS_IF([pkg-config --atleast-version=1.36.0 gobject-introspection-1.0],
+             [
+              AC_MSG_RESULT([yes])
+              VAPIGEN_MIN_VERSION=0.20
+             ],[AC_MSG_RESULT([no])]
+       )
+       GUPNP_PROG_VAPIGEN([$VAPIGEN_MIN_VERSION])
       ]
 )
+AS_IF([test "x$VAPIGEN" != "x"], [have_vapigen=yes])
 AM_CONDITIONAL([HAVE_VAPIGEN], [test "x$VAPIGEN" != "x"])
 
-
 dnl Check for Win32
 AC_MSG_CHECKING([for Win32])
 case "$host" in
@@ -117,3 +127,12 @@ gssdp-1.0.pc
 gssdp-1.0-uninstalled.pc
 ])
 AC_OUTPUT
+
+echo "
+    ${PACKAGE} ${VERSION}
+    ---------------------
+
+    Prefix:                ${prefix}
+    GObject-Introspection: ${found_introspection}
+    VALA bindings:         ${have_vapigen}
+"
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
index df6395d..c909726 100644
--- a/m4/vapigen.m4
+++ b/m4/vapigen.m4
@@ -26,7 +26,7 @@ dnl dropped everything but VALA_PROG_VAPIGEN - Jens Georg <mail@jensge.org>
 #
 # VALA_PROG_VAPIGEN([MINIMUM-VERSION])
 # ------------------------------------
-AC_DEFUN([VALA_PROG_VAPIGEN],
+AC_DEFUN([GUPNP_PROG_VAPIGEN],
 [AC_PATH_PROG([VAPIGEN], [vapigen], [])
   AS_IF([test -z "$VAPIGEN"],
     [AC_MSG_WARN([No Vala API Generator found. You will not be able to generate .vapi files.])],
@@ -37,5 +37,7 @@ AC_DEFUN([VALA_PROG_VAPIGEN],
            [AC_MSG_RESULT([yes])],
            [AC_MSG_RESULT([yes])],
            [AC_MSG_RESULT([no])
-            AC_MSG_WARN([Vala API Generator $1 not found.])])])])
+            AC_MSG_WARN([Vala API Generator $1 not found.])
+            VAPIGEN=""
+           ])])])
 ])
-- 
2.7.4