From 1640c4c94e87e93830c55828ceffe80e8fa24543 Mon Sep 17 00:00:00 2001 From: Thorsten Behrens Date: Tue, 5 Dec 2017 18:34:44 +0100 Subject: 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 Reviewed-by: Thorsten Behrens (cherry picked from commit 2488ea55e9355cbfc15b2da4138661f0a0362c86) Reviewed-on: https://gerrit.libreoffice.org/45921 Tested-by: Thorsten Behrens --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'configure.ac') 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 -- cgit