summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorThorsten Behrens <Thorsten.Behrens@CIB.de>2017-12-05 18:34:44 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-12-06 12:02:53 +0100
commit1640c4c94e87e93830c55828ceffe80e8fa24543 (patch)
treec86a4b545f9d9f3476b2049e0fdef867d8f8fe4e /configure.ac
parent6900730a61de8c55af7157b072a42a7742ccddb3 (diff)
Revert "gpg4libre: add glib2 dependency for Windows"
As it turns out, gpgme works perfectly fine w/o glib (though it really wants it configured out of the box) This reverts commit daee5fc5569c1807f5c8dae502d305eb06141e8b. Change-Id: I60002bf3b524696eeae397a26c280a67dcdbfd7a Reviewed-on: https://gerrit.libreoffice.org/45908 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 2488ea55e9355cbfc15b2da4138661f0a0362c86) Reviewed-on: https://gerrit.libreoffice.org/45921 Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d0caf9491ef1..e5afc95810aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10160,8 +10160,9 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin" \
[AC_MSG_ERROR([gpgme headers not found, install gpgme development package])], [])
else
AC_MSG_RESULT([internal])
- AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP"
+ AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY])
+
GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src"
LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src"
if test "$_os" != "WINNT"; then