[gupnp-tools] Fix linking against recent gupnp stack

[Jens Georg <jensgeorg src gnome org>]

commit f8496566d6608fa5ed41190beb8b29933aa698f8
Author: Jens Georg <mail jensge org>
Date:   Mon Oct 8 16:04:44 2012 +0200

    Fix linking against recent gupnp stack

 configure.ac                  |    6 +++++-
 src/av-cp/Makefile.am         |    3 +++
 src/discover/Makefile.am      |    2 +-
 src/network-light/Makefile.am |    9 ++++++++-
 src/universal-cp/Makefile.am  |    9 ++++++++-
 src/upload/Makefile.am        |    1 +
 6 files changed, 26 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9da4ef4..d96ce4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,12 +25,14 @@ LT_INIT([])
 
 GSSDP_REQUIRED=0.10
 GUPNP_REQUIRED=0.13
+SOUP_REQUIRED=2.4
 GUPNP_AV_REQUIRED=0.5.5
 GTK_REQUIRED=3.0.0
 GTHREAD_REQUIRED=2.12
 GIO_REQUIRED=2.12
 ICON_THEME_REQUIRED=2.20
 GTKSOURCEVIEW_REQUIRED=3.0.0
+LIBXML_REQUIRED=2.24
 
 AC_MSG_CHECKING([for Win32])
 case "$host" in
@@ -46,10 +48,12 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
 
 PKG_CHECK_MODULES(LIBGSSDP, gssdp-1.0 >= $GSSDP_REQUIRED)
 PKG_CHECK_MODULES(LIBGUPNP, gupnp-1.0 >= $GUPNP_REQUIRED)
+PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4 >= $SOUP_REQUIRED)
+PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= LIBXML_REQUIRED)
 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
 PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= $GTHREAD_REQUIRED)
 PKG_CHECK_MODULES(GNOME_ICON_THEME, gnome-icon-theme >= $ICON_THEME_REQUIRED)
-PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED)
+PKG_CHECK_MODULES(GIO, gobject-2.0 >= $GIO_REQUIRED gio-2.0 >= $GIO_REQUIRED)
 PKG_CHECK_MODULES(GTKSOURCEVIEW, gtksourceview-3.0 >= GTKSOURCEVIEW_REQUIRED,
                   AC_DEFINE([HAVE_GTK_SOURCEVIEW], [1], [Use GtkSourceView])
                   AC_SUBST([TEXT_VIEW],[GtkSourceView]),
diff --git a/src/av-cp/Makefile.am b/src/av-cp/Makefile.am
index d59064d..483d007 100644
--- a/src/av-cp/Makefile.am
+++ b/src/av-cp/Makefile.am
@@ -26,6 +26,9 @@ gupnp_av_cp_SOURCES = main.c \
 		      renderer-controls.h
 
 gupnp_av_cp_LDADD = ../common/libutil.a \
+		    $(LIBGSSDP_LIBS) \
+		    $(LIBSOUP_LIBS) \
+		    $(LIBXML_LIBS) \
 		    $(LIBGUPNP_LIBS) \
 		    $(LIBGUPNP_AV_LIBS) \
 		    $(GTK_LIBS) \
diff --git a/src/discover/Makefile.am b/src/discover/Makefile.am
index 4ec01d2..9c500a6 100644
--- a/src/discover/Makefile.am
+++ b/src/discover/Makefile.am
@@ -7,6 +7,6 @@ bin_PROGRAMS = gssdp-discover
 
 gssdp_discover_SOURCES = gssdp-discover.c
 
-gssdp_discover_LDADD = $(LIBGSSDP_LIBS)
+gssdp_discover_LDADD = $(LIBGSSDP_LIBS) $(GIO_LIBS)
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/src/network-light/Makefile.am b/src/network-light/Makefile.am
index 7c1f066..afc64f4 100644
--- a/src/network-light/Makefile.am
+++ b/src/network-light/Makefile.am
@@ -20,7 +20,14 @@ gupnp_network_light_SOURCES = main.c \
 			      main.h \
 			      gui.h \
 			      upnp.h
-gupnp_network_light_LDADD = ../common/libutil.a $(LIBGUPNP_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) $(UUID_LIBS)
+gupnp_network_light_LDADD = ../common/libutil.a \
+			    $(LIBXML_LIBS) \
+			    $(LIBSOUP_LIBS) \
+			    $(LIBGSSDP_LIBS) \
+			    $(LIBGUPNP_LIBS) \
+			    $(GTK_LIBS) \
+			    $(GTHREAD_LIBS) \
+			    $(UUID_LIBS)
 
 gupnp_network_light_LDFLAGS = -export-dynamic
 
diff --git a/src/universal-cp/Makefile.am b/src/universal-cp/Makefile.am
index e38d12b..7397e7b 100644
--- a/src/universal-cp/Makefile.am
+++ b/src/universal-cp/Makefile.am
@@ -22,7 +22,14 @@ gupnp_universal_cp_SOURCES = main.c \
 			     details-treeview.h \
 			     event-treeview.h \
 			     action-dialog.h
-gupnp_universal_cp_LDADD = ../common/libutil.a $(GTK_LIBS) $(LIBGUPNP_LIBS) $(GTHREAD_LIBS)
+gupnp_universal_cp_LDADD = ../common/libutil.a \
+			   $(GTK_LIBS) \
+			   $(LIBGSSDP_LIBS) \
+			   $(LIBSOUP_LIBS) \
+			   $(LIBXML_LIBS) \
+			   $(GTHREAD_LIBS) \
+			   $(LIBGUPNP_LIBS)
+
 gupnp_universal_cp_LDFLAGS = -export-dynamic
 
 if OS_WIN32
diff --git a/src/upload/Makefile.am b/src/upload/Makefile.am
index bcb27fe..b45478e 100644
--- a/src/upload/Makefile.am
+++ b/src/upload/Makefile.am
@@ -19,6 +19,7 @@ gupnp_upload_SOURCES = main.c \
 		       transfer.h
 
 gupnp_upload_LDADD = $(LIBGUPNP_LIBS)    \
+		     $(LIBGSSDP_LIBS)    \
 		     $(LIBGUPNP_AV_LIBS) \
 	    	     $(GTHREAD_LIBS)     \
 	    	     $(GIO_LIBS)