[libgda/LIBGDA_4.0] Avoid Libsoup automagic dependency, fixes bug #584398

[Vivien Malerba <vivien src gnome org>]

commit 38c2005cd0e7495326a1e159005cc2acadf93f0f
Author: Vivien Malerba <malerba gnome-db org>
Date:   Wed Jun 3 22:44:15 2009 +0200

    Avoid Libsoup automagic dependency, fixes bug #584398
---
 configure.in |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/configure.in b/configure.in
index 0a1f96d..e1d1b89 100644
--- a/configure.in
+++ b/configure.in
@@ -1335,12 +1335,23 @@ export LD_LIBRARY_PATH="$save_LD_LIBRARY_PATH"
 dnl ************************
 dnl Check for libsoup
 dnl ************************
-PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, have_libsoup=yes, have_libsoup=no)
-AM_CONDITIONAL(LIBSOUP, test x"$have_libsoup" = "xyes")
-if test x"$have_libsoup" = "xyes"
+
+AC_ARG_WITH(libsoup,
+	AS_HELP_STRING([--with-libsoup], [Enable libsoup support]),
+	,with_libsoup=auto)
+
+if test "$with_libsoup" = "auto" -o "$with_libsoup" = "yes"
 then
-        LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS -DHAVE_LIBSOUP"
+	PKG_CHECK_MODULES(LIBSOUP, libsoup-2.4, [
+		AC_DEFINE(HAVE_LIBSOUP, [1], [libsoup support enable])
+		have_libsoup=yes], [
+		if test "$with_libsoup" = "yes"
+		then
+			AC_MSG_ERROR([libsoup support requested but not found.])
+		fi
+		have_libsoup=no])
 fi
+AM_CONDITIONAL(LIBSOUP, test "$have_libsoup" = "yes")
 AC_SUBST(LIBSOUP_CFLAGS)
 AC_SUBST(LIBSOUP_LIBS)