This makes the phodav dependency configureable & optional. --- configure.ac | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index d89bd6f..608d69c 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([folder-sharing], + AS_HELP_STRING([--enable-folder-sharing=@<:@auto/yes/no@:>@], + [Enable folder-sharing support @<:@default=auto@:>@]), + [], + [enable_folder_sharing="auto"]) + +if test "x$enable_folder_sharing" = "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_folder_sharing" = "xyes"; then + AC_MSG_ERROR([folder-sharing 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])) -- 1.9.2 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel