diff options
| author | Thorsten Behrens <thorsten.behrens@cib.de> | 2017-11-15 21:31:07 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-11-22 17:57:08 +0100 |
| commit | 50a55d862034b7a06510c014332236f44e306831 (patch) | |
| tree | 422addf00716499a75d07cfb69d53aa0e2b0f118 /configure.ac | |
| parent | bafbaa3fed95f28f368b0bd4256dbe2a714e3bd8 (diff) | |
gpg4libre: cleanup gpgme & add gbuild lib for gpgmepp
This moves the external to gpgmepp, since that's what we _actually_
link against; plus tons of enablement for Windows build, mostly
related to linker probs integration.
There's still no good way to build a DLL with autotools, so we fall
back to gbuild manual make, see also tdf#91480
Change-Id: Ifd8217ef58536612d2389d48e343db133a13fb9c
Reviewed-on: https://gerrit.libreoffice.org/44970
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index 25d3f4153f5b..08a9c9cccf39 100644 --- a/configure.ac +++ b/configure.ac @@ -10128,7 +10128,11 @@ fi AC_SUBST(ENABLE_PDFIUM) SYSTEM_GPGMEPP= -if test "$_os" = "Linux" -o "$_os" = "Darwin"; then +# need matching cygwin arch for building gpgme sadly, for the while +if test "$_os" = "Linux" -o "$_os" = "Darwin" \ + -o \( "$_os" = "WINNT" -a "$host_cpu" = "i686" -a "$WINDOWS_SDK_ARCH" = "x86" \) \ + -o \( "$_os" = "WINNT" -a "$host_cpu" = "x86_64" -a "$WINDOWS_SDK_ARCH" = "x64" \) ; then + dnl =================================================================== dnl Check for system gpgme dnl =================================================================== @@ -10150,23 +10154,13 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then AC_MSG_RESULT([internal]) AC_DEFINE([GPGME_CAN_EXPORT_MINIMAL_KEY]) BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGMEPP" - if test "$_os" = "WINNT"; then - BUILD_TYPE="$BUILD_TYPE GLIB2" - fi - GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" - GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error" LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src" - LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan" + if test "$_os" != "WINNT"; then + GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error" + LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan" + fi fi -else - # TODO(davido): Windows build must be protected with a configure option - # unless CI doesn't support libtool with windres with gcc preprocessor - BUILD_TYPE="$BUILD_TYPE LIBASSUAN LIBGPGERROR GPGMEPP" - GPG_ERROR_CFLAGS="-I${WORKDIR}/UnpackedTarball/libgpg-error/src" - GPG_ERROR_LIBS="-L${WORKDIR}/UnpackedTarball/libgpg-error/src/.libs -lgpg-error" - LIBASSUAN_CFLAGS="-I${WORKDIR}/UnpackedTarball/libassuan/src" - LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan" fi AC_SUBST(SYSTEM_GPGMEPP) AC_SUBST(GPG_ERROR_CFLAGS) |