[Libreoffice-commits] core.git: config_host/config_gpgme.h.in

Miklos Vajna vmiklos at collabora.co.uk
Tue Dec 5 08:26:10 UTC 2017


 config_host/config_gpgme.h.in |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 2824eb4939dc7e40d1503d52f4fd143fe5f5e60e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Dec 5 09:24:38 2017 +0100

    android: fix gpgme build
    
    No need to include config_lgpl.h when gpgme is disabled.
    
    Change-Id: I03f8b093a355452df928607e0f52e3793d5ca0d1

diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index aa894a9f2d97..d12608ef1eef 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -13,10 +13,11 @@
 #ifndef CONFIG_GPGME_H
 #define CONFIG_GPGME_H
 
-#include "config_lgpl.h"
-
 // Defined if gpgme support is available
 #define GPGME_HAVE_GPGME 0
+#if GPGME_HAVE_GPGME
+#include "config_lgpl.h"
+#endif
 
 // Defined if gpgme supports exporting minimal key.
 #define GPGME_CAN_EXPORT_MINIMAL_KEY 0


More information about the Libreoffice-commits mailing list