diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-12-04 16:17:18 +0100 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-12-05 14:04:51 +0100 |
| commit | 85caee08ae6fa32f9db8be206bf3ca11bc3949b8 (patch) | |
| tree | cb35d53a747ae01dde846d2acfef2c94f813f3a1 /config_host | |
| parent | 3ffdb4db76a39891fa6ad684b7b725b8429935c1 (diff) | |
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@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 5daa364922ba75442e2aa834095e9bef16d141d9)
Reviewed-on: https://gerrit.libreoffice.org/45836
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'config_host')
| -rw-r--r-- | config_host/config_gpgme.h.in | 8 |
1 files changed, 8 insertions, 0 deletions
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: */ |