[grilo-plugins] Link upnp plugin to libgssdp

[Andreas Henriksson <ah src gnome org>]

commit 34e6e236a116b12e8c0c5a3a39e77283ac4ba2b1
Author: Andreas Henriksson <andreas fatal se>
Date:   Wed Oct 10 16:43:25 2012 +0200

    Link upnp plugin to libgssdp
    
    The upnp plugin uses gssdp but doesn't link to it.
    This used to work since gupnp leaked linker flags.
    Since gupnp 0.19.0 the pkg-config files has been
    fixed, so this means grilo-plugins needs to be fixed
    to link to everything it needs directly and not
    relying on anything else pulling in linker flags.

 configure.ac         |    7 ++++++-
 src/upnp/Makefile.am |    2 ++
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6445612..47485ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,6 +111,8 @@ PKG_CHECK_MODULES(XML, libxml-2.0, HAVE_XML=yes, HAVE_XML=no)
 
 PKG_CHECK_MODULES(GIO, gio-2.0, HAVE_GIO=yes, HAVE_GIO=no)
 
+PKG_CHECK_MODULES(GSSDP, gssdp-1.0, HAVE_GSSDP=yes, HAVE_GSSDP=no)
+
 PKG_CHECK_MODULES(GUPNP, gupnp-1.0 >= 0.13, HAVE_GUPNP=yes, HAVE_GUPNP=no)
 
 PKG_CHECK_MODULES(GUPNPAV, gupnp-av-1.0 >= 0.5, HAVE_GUPNPAV=yes, HAVE_GUPNPAV=no)
@@ -323,6 +325,9 @@ AC_ARG_ENABLE(upnp,
         [
                 case "$enableval" in
                      yes)
+                        if test "x$HAVE_GSSDP" = "xno"; then
+                           AC_MSG_ERROR([gssdp not found, install it or use --disable-upnp])
+                        fi
                         if test "x$HAVE_GUPNP" = "xno"; then
                            AC_MSG_ERROR([gupnp not found, install it or use --disable-upnp])
                         fi
@@ -335,7 +340,7 @@ AC_ARG_ENABLE(upnp,
                 esac
         ],
         [
-                if test "x$HAVE_GUPNP" = "xyes" -a "x$HAVE_GUPNPAV" = "xyes" -a "x$HAVE_XML" = "xyes"; then
+                if test "x$HAVE_GSSDP" = "xyes" -a "x$HAVE_GUPNP" = "xyes" -a "x$HAVE_GUPNPAV" = "xyes" -a "x$HAVE_XML" = "xyes"; then
                         enable_upnp=yes
                 else
                         enable_upnp=no
diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am
index 7829b4a..eec9a84 100644
--- a/src/upnp/Makefile.am
+++ b/src/upnp/Makefile.am
@@ -9,6 +9,7 @@ ext_LTLIBRARIES	= libgrlupnp.la
 
 libgrlupnp_la_CFLAGS =		\
 	$(DEPS_CFLAGS)		\
+	$(GSSDP_CFLAGS)		\
 	$(GUPNP_CFLAGS)		\
 	$(GUPNPAV_CFLAGS)	\
 	$(GTHREAD_CFLAGS)	\
@@ -16,6 +17,7 @@ libgrlupnp_la_CFLAGS =		\
 
 libgrlupnp_la_LIBADD =	\
 	$(DEPS_LIBS)	\
+	$(GSSDP_LIBS)	\
 	$(GUPNP_LIBS)	\
 	$(GUPNPAV_LIBS)	\
 	$(GTHREAD_LIBS)	\