thanks, applied both
On Wed, May 21, 2014 at 8:07 AM, Tiziano Müller <tiziano.mueller@xxxxxxxxxxxxxxxxx> wrote:
This makes the phodav dependency configureable.
And name it after the corresponding channel.
---
configure.ac | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
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
--
1.9.2
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel
--
Marc-André Lureau
_______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel