[seahorse] Meson: fix non-existant pgp_dep if disabled.
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Meson: fix non-existant pgp_dep if disabled.
- Date: Tue, 21 Nov 2017 19:05:21 +0000 (UTC)
commit 27fd5066895055948b8932115a1572294a367e96
Author: Niels De Graef <nielsdegraef gmail com>
Date: Tue Nov 21 20:04:50 2017 +0100
Meson: fix non-existant pgp_dep if disabled.
libseahorse/Makefile.am | 93 -------------------------------------------
libseahorse/meson.build | 5 ++-
libseahorse/seahorse-util.c | 2 +
3 files changed, 6 insertions(+), 94 deletions(-)
---
diff --git a/libseahorse/meson.build b/libseahorse/meson.build
index 15f1682..15f2922 100644
--- a/libseahorse/meson.build
+++ b/libseahorse/meson.build
@@ -36,9 +36,12 @@ libseahorse_deps = [
libtreemultidnd_dep,
common_dep,
ssh_dep,
- pgp_dep,
]
+if with_pgp
+ libseahorse_deps += pgp_dep
+endif
+
libseahorse_lib = static_library('libseahorse',
libseahorse_sources,
dependencies: libseahorse_deps,
diff --git a/libseahorse/seahorse-util.c b/libseahorse/seahorse-util.c
index c229ab8..f054cd7 100644
--- a/libseahorse/seahorse-util.c
+++ b/libseahorse/seahorse-util.c
@@ -26,7 +26,9 @@
#include "seahorse-util.h"
#include "seahorse-widget.h"
+#if WITH_PGP
#include "pgp/seahorse-pgp.h"
+#endif
#include "ssh/seahorse-ssh.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]