From 3f8f878fa38d9b515544be08ed5df4127dc1bc12 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 21 Sep 2017 11:01:29 -0400
Subject: [PATCH] tree-wide: Squash a few warnings when building with no
 features

Noticed these since I had a local configured build with no features for testing
the PAPR context for it.

Closes: #1201
Approved by: jlebon
---
 src/ostree/ot-builtin-commit.c | 2 ++
 src/ostree/ot-builtin-export.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index eb5e99b0..1665765f 100644
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -224,6 +224,7 @@ commit_filter (OstreeRepo         *self,
   return OSTREE_REPO_COMMIT_FILTER_ALLOW;
 }
 
+#ifdef HAVE_LIBARCHIVE
 typedef struct {
   GRegex *regex;
   const char *replacement;
@@ -245,6 +246,7 @@ handle_translate_pathname (OstreeRepo *repo,
   g_assert (ret);
   return ret;
 }
+#endif
 
 static gboolean
 commit_editor (OstreeRepo     *repo,
diff --git a/src/ostree/ot-builtin-export.c b/src/ostree/ot-builtin-export.c
index aa79824e..b68cbb6d 100644
--- a/src/ostree/ot-builtin-export.c
+++ b/src/ostree/ot-builtin-export.c
@@ -68,15 +68,15 @@ ostree_builtin_export (int argc, char **argv, GCancellable *cancellable, GError
   g_autoptr(GOptionContext) context = NULL;
   g_autoptr(OstreeRepo) repo = NULL;
   gboolean ret = FALSE;
-  const char *rev;
   g_autoptr(GFile) root = NULL;
   g_autoptr(GFile) subtree = NULL;
   g_autofree char *commit = NULL;
   g_autoptr(GVariant) commit_data = NULL;
 #ifdef HAVE_LIBARCHIVE
+  const char *rev;
   g_autoptr(OtAutoArchiveWrite) a = NULL;
-#endif
   OstreeRepoExportArchiveOptions opts = { 0, };
+#endif
 
   context = g_option_context_new ("COMMIT - Stream COMMIT to stdout in tar format");