From d5b5f901ba9a55acef85b19c43cb2405fd8daea5 Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Sat, 18 Aug 2012 16:10:44 +0200
Subject: Use vapi from GSSDP >= 0.12.2

---
 Makefile.am       | 16 ++++++++++++----
 configure.ac      | 14 +++++++++++++-
 tests/Makefile.am |  2 ++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3d625b7..11881df 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,17 @@ SUBDIRS = . tests
 pkgconfig_DATA= gupnp-vala-1.0.pc
 pkgconfigdir = $(libdir)/pkgconfig
 
-STAMP_FILES = gssdp-1.0.stamp
-VAPI_FILES = gssdp-1.0.vapi
-DEPS_FILES = gssdp-1.0.deps
+STAMP_FILES =
+VAPI_FILES =
+DEPS_FILES =
+GUPNP_DEPENDS =
+
+if WITH_GSSDP
+STAMP_FILES += gssdp-1.0.stamp
+VAPI_FILES += gssdp-1.0.vapi
+DEPS_FILES += gssdp-1.0.deps
+GUPNP_DEPENDS += gssdp-1.0.vapi
+endif
 
 if WITH_GUPNP
 STAMP_FILES += gupnp-1.0.stamp
@@ -45,7 +53,7 @@ gssdp-1.0.deps:
 
 gupnp-1.0.vapi: gupnp-1.0.stamp
 	@true
-gupnp-1.0.stamp: gssdp-1.0.vapi
+gupnp-1.0.stamp: $(GUPNP_DEPENDS)
 	$(QUIET_GEN)$(VAPIGEN) \
 		--quiet \
 		--vapidir=$(top_srcdir) \
diff --git a/configure.ac b/configure.ac
index adcaf99..0dd4142 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,18 @@ fi
 
 PKG_CHECK_MODULES(GSSDP, [gssdp-1.0 >= 0.11.0])
 
+dnl check if we have gssdp >= 0.12.2 which carries its own vapi
+PKG_CHECK_MODULES(NEW_GSSDP, [gssdp-1.0 >= 0.12.2],
+                  [
+                   has_new_gssdp=yes
+                   has_gssdp=no
+                   VALA_CHECK_PACKAGES([gssdp-1.0])
+                  ],
+                  [has_new_gssdp=no
+                   has_gssdp=yes
+                  ])
+AM_CONDITIONAL(WITH_GSSDP, [test "x$has_new_gssdp" = "xno"])
+
 PKG_CHECK_MODULES(GUPNP, [gupnp-1.0 >= 0.18.0],
                   has_gupnp=yes,
                   has_gupnp=no)
@@ -65,7 +77,7 @@ echo "     GUPnP Vala bindings"
 echo ""
 echo "       vapidir: ${VAPIDIR}"
 echo ""
-echo "           gssdp: yes"
+echo "           gssdp: ${has_gssdp}"
 echo "           gupnp: ${has_gupnp}"
 echo "        gupnp-av: ${has_gupnp_av}"
 echo "      gupnp-dlna: ${has_gupnp_dlna}"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9de0ec5..15ce8d3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,9 @@ include $(top_srcdir)/Makefile.decls
 
 all: Makefile all-tests
 
+if WITH_GSSDP
 GSSDP_TESTS = test-publisher test-browser
+endif
 if WITH_GUPNP
 GUPNP_TESTS = server-test proxy-test browsing-test introspection-test
 endif
-- 
cgit v1.2.1