[Spice-commits] 2 commits - configure.ac

[Marc-André Lureau]

 configure.ac |   24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 1e5c0990feb47e49a14fc6942a3c5d95a283b9c4
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date:   Wed May 21 08:07:44 2014 +0200

    Do not depend on libsoup directly
    
    The libsoup-dependency is not directly used but comes in as a dependency
    of phodav and phodav has libsoup correctly recorded in its pkg-config
    file.

diff --git a/configure.ac b/configure.ac
index 70ab75c..f47ee20 100644
--- a/configure.ac
+++ b/configure.ac
@@ -267,9 +267,6 @@ PKG_CHECK_MODULES(GTHREAD, gthread-2.0 > 2.0.0)
 AC_SUBST(GTHREAD_CFLAGS)
 AC_SUBST(GTHREAD_LIBS)
 
-PKG_CHECK_MODULES(SOUP, libsoup-2.4)
-AC_SUBST(SOUP_CFLAGS)
-AC_SUBST(SOUP_LIBS)
 AC_ARG_ENABLE([webdav],
   AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
                  [Enable webdav support @<:@default=auto@:>@]),
commit b637cd43daf1a6e1c8cbdd3e3a88e5626f88901c
Author: Tiziano Müller <tiziano.mueller at stepping-stone.ch>
Date:   Wed May 21 08:07:43 2014 +0200

    Introduce --enable/disable-webdav option
    
    This makes the phodav dependency configureable.
    And name it after the corresponding channel.

diff --git a/configure.ac b/configure.ac
index d89bd6f..70ab75c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,10 +270,23 @@ AC_SUBST(GTHREAD_LIBS)
 PKG_CHECK_MODULES(SOUP, libsoup-2.4)
 AC_SUBST(SOUP_CFLAGS)
 AC_SUBST(SOUP_LIBS)
+AC_ARG_ENABLE([webdav],
+  AS_HELP_STRING([--enable-webdav=@<:@auto/yes/no@:>@],
+                 [Enable webdav support @<:@default=auto@:>@]),
+  [],
+  [enable_webdav="auto"])
+
+if test "x$enable_webdav" = "xno"; then
+  have_phodav="no"
+else
+  PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
+  AC_SUBST(PHODAV_CFLAGS)
+  AC_SUBST(PHODAV_LIBS)
 
-PKG_CHECK_MODULES(PHODAV, [libphodav-1.0], [have_phodav=yes], [have_phodav=no])
-AC_SUBST(PHODAV_CFLAGS)
-AC_SUBST(PHODAV_LIBS)
+  if test "x$have_phodav" = "xno" && test "x$enable_webdav" = "xyes"; then
+    AC_MSG_ERROR([webdav support explicitly requested, but some required packages are not available])
+  fi
+fi
 AS_IF([test "x$have_phodav" = "xyes"],
        AC_DEFINE(USE_PHODAV, [1], [Define if supporting phodav]))
 
@@ -754,7 +767,7 @@ AC_MSG_NOTICE([
         Smartcard support:        ${have_smartcard}
         USB redirection support:  ${have_usbredir} ${with_usbredir_hotplug}
         DBus:                     ${have_dbus}
-        PhoDAV:                   ${have_phodav}
+        WebDAV support:           ${have_phodav}
 
         Now type 'make' to build $PACKAGE