From fbb8200059005a452e0db3be4cb86b48313b043a Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Tue, 29 May 2018 21:46:55 +0200
Subject: [PATCH] Revert "Fix P2P build against ostree 2018.6"

This reverts commit 34212ef249c15074c2b3ce7675437656784c94fb.

We need to wait until the p2p pr
(https://github.com/ostreedev/ostree/pull/1596) has landed, because otherwise
a git master build of ostree reports version 2018.6 and we assume it has
the p2p API.
---
 configure.ac | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index a0eb4501..a14792f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,27 +265,26 @@ AC_ARG_ENABLE(sudo,
               [SUDO_BIN="sudo"], [SUDO_BIN=""])
 AC_SUBST([SUDO_BIN])
 
-# Decide whether to build with peer to peer support. This requires API in
-# libostree which before 2018.6 was experimental.
-enable_p2p=no
-PKG_CHECK_MODULES(OSTREE_P2P_REQ, [ostree-1 >= $OSTREE_P2P_REQS ostree-1 < 2018.6],[
+# 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_P2P_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_WARN([Experimental API not found in ostree-1, so flatpak will be compiled without P2P support. OSTree < 2018.6 must be compiled with --enable-experimental-api.])
-    ],[
-      enable_p2p=yes
-      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])
-    ])
-], :)
-PKG_CHECK_MODULES(OSTREE_2018_6, [ostree-1 >= 2018.6],[
-  enable_p2p=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_WITH(system-install-dir,