From 89181c4e8e1d819bd72fef3f7259dbd1deffa2b1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 9 Jul 2013 20:31:55 -0400
Subject: [PATCH] Build without libsoup again

---
 Makefile-ostree.am          |  6 ++++--
 src/libostree/ostree-repo.c | 15 +++++++++++++++
 src/ostree/main.c           |  4 ++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 44cc5881..d5eaacde 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -38,7 +38,6 @@ ostree_SOURCES = src/ostree/main.c \
 	src/ostree/ot-builtin-remote.c \
 	src/ostree/ot-builtin-rev-parse.c \
 	src/ostree/ot-builtin-show.c \
-	src/ostree/ot-builtin-trivial-httpd.c \
 	src/ostree/ot-builtin-write-refs.c \
 	src/ostree/ot-main.h \
 	src/ostree/ot-main.c \
@@ -79,7 +78,10 @@ ostree_CFLAGS = $(ostree_bin_shared_cflags) $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 ostree_LDADD = $(ostree_bin_shared_ldadd) $(OT_INTERNAL_GIO_UNIX_LIBS)
 
 if USE_LIBSOUP
-ostree_SOURCES += src/ostree/ot-builtin-pull.c
+ostree_SOURCES += \
+	src/ostree/ot-builtin-pull.c \
+	src/ostree/ot-builtin-trivial-httpd.c \
+	$(NULL)
 ostree_CFLAGS += $(OT_INTERNAL_SOUP_CFLAGS)
 ostree_LDADD += $(OT_INTERNAL_SOUP_LIBS)
 endif
diff --git a/src/libostree/ostree-repo.c b/src/libostree/ostree-repo.c
index a151b713..bd891976 100644
--- a/src/libostree/ostree-repo.c
+++ b/src/libostree/ostree-repo.c
@@ -2325,3 +2325,18 @@ ostree_repo_read_commit (OstreeRepo *self,
  out:
   return ret;
 }
+
+#ifndef HAVE_LIBSOUP
+gboolean
+ostree_repo_pull (OstreeRepo               *repo,
+                  const char               *remote_name,
+                  char                    **refs_to_fetch,
+                  OstreeRepoPullFlags       flags,
+                  GCancellable             *cancellable,
+                  GError                  **error)
+{
+  g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+                       "This version of ostree was built without libsoup, and cannot fetch over HTTP");
+  return FALSE;
+}
+#endif
diff --git a/src/ostree/main.c b/src/ostree/main.c
index da6db638..3863a143 100644
--- a/src/ostree/main.c
+++ b/src/ostree/main.c
@@ -44,12 +44,16 @@ static OstreeCommand commands[] = {
   { "ls", ostree_builtin_ls, 0 },
   { "refs", ostree_builtin_refs, 0 },
   { "prune", ostree_builtin_prune, 0 },
+#ifdef HAVE_LIBSOUP 
   { "pull", ostree_builtin_pull, 0 },
+#endif
   { "pull-local", ostree_builtin_pull_local, 0 },
   { "remote", ostree_builtin_remote, 0 },
   { "rev-parse", ostree_builtin_rev_parse, 0 },
   { "show", ostree_builtin_show, 0 },
+#ifdef HAVE_LIBSOUP 
   { "trivial-httpd", ostree_builtin_trivial_httpd, OSTREE_BUILTIN_FLAG_NO_REPO },
+#endif
   { "write-refs", ostree_builtin_write_refs, 0 },
   { NULL }
 };