From: Colin Walters <walters@verbum.org>
Date: Mon, 8 Jan 2018 14:28:47 +0000 (-0500)
Subject: bin: Fix cookie builtin build with curl but no soup
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~27^2~19
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c8d9da8d96d06b60e4760094695b125121f95868;p=ostree.git

bin: Fix cookie builtin build with curl but no soup

Prep for supporting `--with-curl --without-soup`.

Closes: #1397
Approved by: cgwalters
---

diff --git a/src/ostree/ot-builtin-remote.c b/src/ostree/ot-builtin-remote.c
index dfb07d03..b89e8ba3 100644
--- a/src/ostree/ot-builtin-remote.c
+++ b/src/ostree/ot-builtin-remote.c
@@ -41,7 +41,7 @@ static OstreeCommand remote_subcommands[] = {
   { "gpg-import", OSTREE_BUILTIN_FLAG_NONE,
     ot_remote_builtin_gpg_import,
     "Import GPG keys" },
-#ifdef HAVE_LIBSOUP
+#ifdef HAVE_LIBCURL_OR_LIBSOUP
   { "add-cookie", OSTREE_BUILTIN_FLAG_NONE,
     ot_remote_builtin_add_cookie,
     "Add a cookie to remote" },
diff --git a/src/ostree/ot-remote-builtins.h b/src/ostree/ot-remote-builtins.h
index ce788524..60f4165e 100644
--- a/src/ostree/ot-remote-builtins.h
+++ b/src/ostree/ot-remote-builtins.h
@@ -31,7 +31,7 @@ BUILTINPROTO(add);
 BUILTINPROTO(delete);
 BUILTINPROTO(gpg_import);
 BUILTINPROTO(list);
-#ifdef HAVE_LIBSOUP
+#ifdef HAVE_LIBCURL_OR_LIBSOUP
 BUILTINPROTO(add_cookie);
 BUILTINPROTO(list_cookies);
 BUILTINPROTO(delete_cookie);