From 6607fd1971c0bea9da156410d0f9225dd505560a Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 24 Nov 2017 12:04:12 +0000 Subject: [PATCH] build: Add --enable-p2p configure argument MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This mirrors the one for flatpak.git. There are bits of the flatpak-builder code which are P2P-specific and which couldn’t be enabled before. Signed-off-by: Philip Withnall Closes: #68 Approved by: alexlarsson --- configure.ac | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/configure.ac b/configure.ac index da818506..aea3e5db 100644 --- a/configure.ac +++ b/configure.ac @@ -145,6 +145,28 @@ AS_IF([test "x$with_dwarf_header" = "xyes"], AS_IF([test "x$ac_cv_header_dwarf_h" != "xyes"], [AC_MSG_ERROR([dwarf.h is required but was not found])])]) +# Do we enable building peer to peer support using libostree’s experimental (non-stable) API? +# If so, OSTREE_ENABLE_EXPERIMENTAL_API needs to be #defined before ostree.h is +# included. +AC_ARG_ENABLE([p2p], + [AS_HELP_STRING([--enable-p2p], + [Enable unstable peer to peer support [default=no]])],, + [enable_p2p=no]) +AS_IF([test x$enable_p2p = xyes],[ + PKG_CHECK_MODULES(OSTREE, [ostree-1 >= $OSTREE_REQS]) + + ostree_features=$($PKG_CONFIG --variable=features ostree-1) + AS_CASE(["$ostree_features"], + [*experimental*],[have_ostree_experimental=yes]) + + AS_IF([test "x$have_ostree_experimental" != "xyes"], + [AC_MSG_ERROR([Experimental API not found in ostree-1, which is needed for --enable-p2p. OSTree must be compiled with --enable-experimental-api.])]) + + AC_DEFINE([OSTREE_ENABLE_EXPERIMENTAL_API],[1],[Define if libostree experimental API should be enabled]) + AC_DEFINE([FLATPAK_ENABLE_P2P],[1],[Define if peer to peer support should be enabled]) +]) +AM_CONDITIONAL([ENABLE_P2P],[test x$enable_p2p = xyes]) + AC_ARG_ENABLE(documentation, AC_HELP_STRING([--enable-documentation], [Build documentation]),, enable_documentation=yes)