configure.ac: Make gpgme a hard dependency

In anticipation of API enhancements for GPG signature verification, which
would otherwise require a non-functional stub version were GPGME excluded.

GPGME is a pretty lightweight dependency, and the motivation to exclude
it is not clear.
This commit is contained in:
Matthew Barnes committed 2015-03-11 12:03:33 -04:00
1 parent 8724adc193
commit 187e8d632e
7 files changed
+11 -64

No files matched your search

-6
View File
@@ -960,7 +960,6 @@ scan_commit_object (OtPullData *pull_data,
GINT_TO_POINTER (depth));
}
#ifdef HAVE_GPGME
if (pull_data->gpg_verify)
{
if (!ostree_repo_verify_commit (pull_data->repo,
@@ -971,7 +970,6 @@ scan_commit_object (OtPullData *pull_data,
error))
goto out;
}
#endif
if (!ostree_repo_load_variant (pull_data->repo, OSTREE_OBJECT_TYPE_COMMIT, checksum,
&commit, error))
@@ -1698,14 +1696,10 @@ ostree_repo_pull_with_options (OstreeRepo *self,
{
pull_data->remote_name = g_strdup (remote_name_or_baseurl);
#ifdef HAVE_GPGME
if (!_ostree_repo_get_remote_boolean_option (self,
remote_name_or_baseurl, "gpg-verify",
TRUE, &pull_data->gpg_verify, error))
goto out;
#else
pull_data->gpg_verify = FALSE;
#endif
}
pull_data->phase = OSTREE_PULL_PHASE_FETCHING_REFS;
-14
View File
@@ -34,11 +34,9 @@
#include "ostree-repo-file-enumerator.h"
#include "ostree-gpg-verifier.h"
#ifdef HAVE_GPGME
#include <locale.h>
#include <gpgme.h>
#include <glib/gstdio.h>
#endif
/**
* SECTION:libostree-repo
@@ -2937,7 +2935,6 @@ sign_data (OstreeRepo *self,
GCancellable *cancellable,
GError **error)
{
#ifdef HAVE_GPGME
gboolean ret = FALSE;
gs_unref_object GFile *tmp_signature_file = NULL;
gs_unref_object GOutputStream *tmp_signature_output = NULL;
@@ -3061,11 +3058,6 @@ out:
if (signature_file)
g_mapped_file_unref (signature_file);
return ret;
#else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"This version of ostree was compiled without GPG support");
return FALSE;
#endif
}
/**
@@ -3204,7 +3196,6 @@ _ostree_repo_gpg_verify_file_with_metadata (OstreeRepo *self,
GCancellable *cancellable,
GError **error)
{
#ifdef HAVE_GPGME
gboolean ret = FALSE;
gs_unref_object OstreeGpgVerifier *verifier = NULL;
gs_unref_variant GVariant *signaturedata = NULL;
@@ -3278,11 +3269,6 @@ _ostree_repo_gpg_verify_file_with_metadata (OstreeRepo *self,
ret = TRUE;
out:
return ret;
#else
g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
"This version of ostree was compiled without GPG support");
return FALSE;
#endif
}
/**