summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2017-09-24 10:28:05 +0200
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-11-22 17:54:58 +0100
commit5f981d30e2f186ab6b7fc925832b6eb1ae658308 (patch)
tree2b62f6060bfe1788c7937325aac0b2bc57b9eada /configure.ac
parent4be15fdd7974564faa97454fda415b3882c4142f (diff)
gpg4libre: build libassuan natively on windows
Change-Id: Id374ebc5ed70a1b4313dc74461524ac2b864b114 Reviewed-on: https://gerrit.libreoffice.org/42745 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.ac8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index fe5731470d2e..dacb5ee98ffe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10160,7 +10160,13 @@ if test "$_os" = "Linux" -o "$_os" = "Darwin"; then
LIBASSUAN_LIBS="-L${WORKDIR}/UnpackedTarball/libassuan/src/.libs -lassuan"
fi
else
- BUILD_TYPE="$BUILD_TYPE LIBGPGERROR"
+ # 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"
+ 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)