packaging/ostree
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Make libsoup optional again

Browse Source 
The "remote cookies" code broke this.  While I'm not sure anyone is
actually using ostree-without-http, it isn't too hard to keep the
build time conditional going.  Further, this work is preparatory for
libcurl porting.

Closes: #621
Approved by: jlebon
This commit is contained in:
Colin Walters authored and Atomic Bot committed 2016-12-08 16:04:16 +00:00
1 parent 7519457382
commit 7f2830cb4e
4 files changed
+21 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/ostree/ot-builtin-remote.c
+5 -3
View File
@@ -33,13 +33,15 @@ typedef struct {
static OstreeRemoteCommand remote_subcommands[] = {
{ "add", ot_remote_builtin_add },
{ "add-cookie", ot_remote_builtin_add_cookie },
{ "delete", ot_remote_builtin_delete },
{ "delete-cookie", ot_remote_builtin_delete_cookie },
{ "show-url", ot_remote_builtin_show_url },
{ "list", ot_remote_builtin_list },
{ "list-cookies", ot_remote_builtin_list_cookies },
{ "gpg-import", ot_remote_builtin_gpg_import },
#ifdef HAVE_LIBSOUP
{ "add-cookie", ot_remote_builtin_add_cookie },
{ "delete-cookie", ot_remote_builtin_delete_cookie },
{ "list-cookies", ot_remote_builtin_list_cookies },
#endif
{ "refs", ot_remote_builtin_refs },
{ "summary", ot_remote_builtin_summary },
{ NULL, NULL }
src/ostree/ot-remote-builtins.h
+4 -2
View File
@@ -25,12 +25,14 @@
G_BEGIN_DECLS
gboolean ot_remote_builtin_add (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_add_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_delete (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_delete_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_gpg_import (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_list (int argc, char **argv, GCancellable *cancellable, GError **error);
#ifdef HAVE_LIBSOUP
gboolean ot_remote_builtin_add_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_list_cookies (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_delete_cookie (int argc, char **argv, GCancellable *cancellable, GError **error);
#endif
gboolean ot_remote_builtin_show_url (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_refs (int argc, char **argv, GCancellable *cancellable, GError **error);
gboolean ot_remote_builtin_summary (int argc, char **argv, GCancellable *cancellable, GError **error);