[libchamplain] Do not depend on libsoup-gnome-2.4

[Jiří Techet <jiritechet src gnome org>]

commit f2025d9099d72a2b96cd9ceb66a0d546b89ddc51
Author: Jonas Danielsson <jonas threetimestwo org>
Date:   Tue Feb 25 16:40:00 2014 +0100

    Do not depend on libsoup-gnome-2.4
    
    Everything in libsoup-gnome is deprecated.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=725126

 champlain-gtk/Makefile.am                      |    2 +-
 champlain-uninstalled.pc.in                    |    2 +-
 champlain.pc.in                                |    2 +-
 champlain/Makefile.am                          |    5 +--
 champlain/champlain-network-bbox-tile-source.c |    4 ---
 champlain/champlain-network-tile-source.c      |    4 ---
 configure.ac                                   |   27 +-----------------------
 demos/Makefile.am                              |    4 +-
 8 files changed, 8 insertions(+), 42 deletions(-)
---
diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 549c197..6a5777b 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -88,7 +88,7 @@ GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = \
        --c-include="champlain-gtk/champlain-gtk.h" \
        --include-uninstalled=$(top_builddir)/champlain/Champlain- CHAMPLAIN_API_VERSION@.gir
 GtkChamplain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
-       $(SOUP_CFLAGS) $(GTK_CFLAGS) $(DEPS_CFLAGS) \
+       $(GTK_CFLAGS) $(DEPS_CFLAGS) \
        -I$(top_srcdir) -I$(top_builddir)\
        -DCHAMPLAIN_COMPILATION -DCHAMPLAIN_GTK_COMPILATION
 
diff --git a/champlain-uninstalled.pc.in b/champlain-uninstalled.pc.in
index 9afc281..365d836 100644
--- a/champlain-uninstalled.pc.in
+++ b/champlain-uninstalled.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Libs: ${abs_top_builddir}/champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
 Cflags: -I${abs_top_srcdir} -I${abs_top_builddir}
 Requires: gobject-2.0 glib-2.0 clutter-1.0
-Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
+Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 libsoup-2.4
diff --git a/champlain.pc.in b/champlain.pc.in
index 6d38c26..6d847ce 100644
--- a/champlain.pc.in
+++ b/champlain.pc.in
@@ -9,4 +9,4 @@ Version: @VERSION@
 Libs: -L${libdir} -lchamplain- CHAMPLAIN_API_VERSION@
 Cflags: -I${includedir}/libchamplain- CHAMPLAIN_API_VERSION@
 Requires: gobject-2.0 glib-2.0 clutter-1.0
-Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 @SOUP_DEP@
+Requires.private: gdk-3.0 gio-2.0 cairo sqlite3 libsoup-2.4
diff --git a/champlain/Makefile.am b/champlain/Makefile.am
index b1723aa..2d947d4 100644
--- a/champlain/Makefile.am
+++ b/champlain/Makefile.am
@@ -129,7 +129,7 @@ nodist_libchamplain_ CHAMPLAIN_API_VERSION@_la_SOURCES = \
        $(libchamplain_headers_built)   \
        $(libchamplain_sources_built)
 
-libchamplain_ CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(SOUP_LIBS) $(MEMPHIS_LIBS) $(LIBM)
+libchamplain_ CHAMPLAIN_API_VERSION@_la_LIBADD = $(DEPS_LIBS) $(MEMPHIS_LIBS) $(LIBM)
 
 libchamplain_ CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
        -version-info $(LIBRARY_VERSION)\
@@ -138,7 +138,6 @@ libchamplain_ CHAMPLAIN_API_VERSION@_la_LDFLAGS = \
 
 AM_CPPFLAGS =                          \
        $(DEPS_CFLAGS)                  \
-       $(SOUP_CFLAGS)                  \
        $(MEMPHIS_CFLAGS)               \
        -DDATADIR=\""$(datadir)"\"      \
        -I$(top_srcdir)                 \
@@ -179,7 +178,7 @@ Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_INCLUDES = Clutter-1.0 $(memphis_gir_
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_EXPORT_PACKAGES = champlain- CHAMPLAIN_API_VERSION@ 
$(memphis_package)
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_SCANNERFLAGS = --identifier-prefix=Champlain 
--symbol-prefix=champlain --c-include="champlain/champlain.h"
 Champlain_ CHAMPLAIN_API_VERSION_NORM@_gir_CFLAGS = \
-       $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(MEMPHIS_CFLAGS) \
+       $(DEPS_CFLAGS) $(MEMPHIS_CFLAGS) \
        -I$(top_srcdir) -I$(top_builddir) \
        -DCHAMPLAIN_COMPILATION
 
diff --git a/champlain/champlain-network-bbox-tile-source.c b/champlain/champlain-network-bbox-tile-source.c
index 01559c0..b7ae650 100644
--- a/champlain/champlain-network-bbox-tile-source.c
+++ b/champlain/champlain-network-bbox-tile-source.c
@@ -38,11 +38,7 @@
 #include "champlain-version.h"
 #include "champlain-tile.h"
 
-#ifdef HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
-#else
 #include <libsoup/soup.h>
-#endif
 
 G_DEFINE_TYPE (ChamplainNetworkBboxTileSource, champlain_network_bbox_tile_source, 
CHAMPLAIN_TYPE_TILE_SOURCE)
 
diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
index 0e8e153..0b35246 100644
--- a/champlain/champlain-network-tile-source.c
+++ b/champlain/champlain-network-tile-source.c
@@ -51,11 +51,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <glib-object.h>
-#ifdef HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
-#else
 #include <libsoup/soup.h>
-#endif
 #include <math.h>
 #include <sys/stat.h>
 #include <string.h>
diff --git a/configure.ac b/configure.ac
index bef646e..847b0d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ PKG_CHECK_MODULES(DEPS,
       cairo >= 1.4
       gio-2.0 >= 2.16
       sqlite3 >= 3.0
+      libsoup-2.4 >= 2.42
   ]
 )
 AC_SUBST(DEPS_CFLAGS)
@@ -83,31 +84,6 @@ GNOME_MAINTAINER_MODE_DEFINES
 GOBJECT_INTROSPECTION_CHECK([0.6.3])
 
 # -----------------------------------------------------------
-# Check for libsoup, use libsoup-gnome if available
-# -----------------------------------------------------------
-PKG_CHECK_MODULES(SOUP_GNOME, libsoup-gnome-2.4 >= 2.42, [
-    have_soup_gnome="yes"
-    SOUP_CFLAGS=$SOUP_GNOME_CFLAGS
-    SOUP_LIBS=$SOUP_GNOME_LIBS
-    SOUP_DEP="libsoup-gnome-2.4"
-    AC_DEFINE(HAVE_LIBSOUP_GNOME,1,[libsoup gnome integration])
-    ], have_soup_gnome="no")
-
-
-if test "x$have_soup_gnome" = "xno"; then
-  PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42,
-     have_soup="yes", have_soup="no")
-  SOUP_DEP="libsoup-2.4"
-fi
-
-if test "x$have_soup" = "xno" && test "x$have_soup_gnome" = "xno"; then
-   AC_MSG_ERROR([Could not find libsoup or libsoup-gnome.])
-fi
-
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
-AC_SUBST(SOUP_DEP)
-# -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
 
@@ -252,7 +228,6 @@ echo "                 Prefix: ${prefix}"
 echo "         Compiler flags: ${CFLAGS} ${CPPFLAGS}"
 echo "          Documentation: ${enable_gtk_doc}"
 echo "                  Debug: ${enable_debug}"
-echo "          libsoup-gnome: ${have_soup_gnome}"
 echo "              Gtk+ View: ${enable_gtk}"
 echo ""
 echo "Extra renderers:"
diff --git a/demos/Makefile.am b/demos/Makefile.am
index 6433420..46b883c 100644
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -20,8 +20,8 @@ polygons_SOURCES = polygons.c
 polygons_LDADD = $(DEPS_LIBS) ../champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
 
 url_marker_SOURCES = url-marker.c
-url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(SOUP_CFLAGS) $(WARN_CFLAGS)
-url_marker_LDADD = $(SOUP_LIBS) $(DEPS_LIBS) ../champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
+url_marker_CPPFLAGS = $(DEPS_CFLAGS) $(WARN_CFLAGS)
+url_marker_LDADD = $(DEPS_LIBS) ../champlain/libchamplain- CHAMPLAIN_API_VERSION@.la
 
 create_destroy_test_SOURCES = create-destroy-test.c
 create_destroy_test_LDADD = $(DEPS_LIBS) ../champlain/libchamplain- CHAMPLAIN_API_VERSION@.la