79d74f036f
Downloaded from https://gnupg.org/ftp/gcrypt/libassuan/libassuan-3.0.1.tar.bz2 Change-Id: Ie56dd4d88998c6b2a825a502aa34bae3436d2b25 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169198 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> Tested-by: Jenkins
18 lines
636 B
Diff
18 lines
636 B
Diff
--- configure.ac 2017-02-13 14:34:06.983449082 +0100
|
|
+++ configure.ac 2017-02-13 15:36:50.944653536 +0100
|
|
@@ -399,7 +399,14 @@
|
|
|
|
|
|
# Checking for libgpg-error.
|
|
-AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found]))
|
|
+if test "${GPG_ERROR_CFLAGS+set}" != "set"; then
|
|
+ AM_PATH_GPG_ERROR(1.17,, AC_MSG_ERROR([libgpg-error was not found]))
|
|
+else
|
|
+ GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS"
|
|
+ GPG_ERROR_LIBS="$GPG_ERROR_LIBS"
|
|
+ AC_SUBST(GPG_ERROR_CFLAGS)
|
|
+ AC_SUBST(GPG_ERROR_LIBS)
|
|
+fi
|
|
AM_CONDITIONAL(USE_GPGRT_CONFIG, [test -n "$GPGRT_CONFIG" \
|
|
-a "$ac_cv_path_GPG_ERROR_CONFIG" = no])
|
|
|