[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - config_host/config_gpgme.h.in xmlsecurity/source

[Thorsten Behrens]

 config_host/config_gpgme.h.in                   |    8 ++++++++
 xmlsecurity/source/gpg/SEInitializer.cxx        |    2 ++
 xmlsecurity/source/gpg/SecurityEnvironment.cxx  |    2 ++
 xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |    2 ++
 4 files changed, 14 insertions(+)

New commits:
commit 85caee08ae6fa32f9db8be206bf3ca11bc3949b8
Author: Thorsten Behrens <Thorsten.Behrens at CIB.de>
Date:   Mon Dec 4 16:17:18 2017 +0100

    gpg4libre: add gpgme config header where gpgme.h is included
    
    Also pull in config_lgpl.h in that case.
    
    Squashed in is this fix, too:
    
      android: fix gpgme build
    
      No need to include config_lgpl.h when gpgme is disabled.
    
    Change-Id: Iae4e56ee8023066581c562c66305875a0fe15f37
    Reviewed-on: https://gerrit.libreoffice.org/45809
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 5daa364922ba75442e2aa834095e9bef16d141d9)
    Reviewed-on: https://gerrit.libreoffice.org/45836
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/config_host/config_gpgme.h.in b/config_host/config_gpgme.h.in
index 86f3f07931f6..d12608ef1eef 100644
--- a/config_host/config_gpgme.h.in
+++ b/config_host/config_gpgme.h.in
@@ -10,10 +10,18 @@
 /* Configuration for gpgme++.
  */
 
+#ifndef CONFIG_GPGME_H
+#define CONFIG_GPGME_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
 
+#endif
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/gpg/SEInitializer.cxx b/xmlsecurity/source/gpg/SEInitializer.cxx
index 59e45d1bd2ea..667e9ce355c7 100644
--- a/xmlsecurity/source/gpg/SEInitializer.cxx
+++ b/xmlsecurity/source/gpg/SEInitializer.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_gpgme.h>
+
 #include <gpg/SEInitializer.hxx>
 #include "SecurityEnvironment.hxx"
 #include "XMLSecurityContext.hxx"
diff --git a/xmlsecurity/source/gpg/SecurityEnvironment.cxx b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
index 2bbcf8ddf79b..152e8c600019 100644
--- a/xmlsecurity/source/gpg/SecurityEnvironment.cxx
+++ b/xmlsecurity/source/gpg/SecurityEnvironment.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_gpgme.h>
+
 #include "SecurityEnvironment.hxx"
 #include "CertificateImpl.hxx"
 
diff --git a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
index 795ae85e35a4..57d9b9321c61 100644
--- a/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
+++ b/xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_gpgme.h>
+
 #include <sal/config.h>
 #include <rtl/uuid.h>
 #include <cppuhelper/supportsservice.hxx>