configure.ac | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit d480af79c6d67341e650a5b920bf66c2865309e0
Author: Rene Engelhard <r...@debian.org>
AuthorDate: Wed Sep 14 18:29:39 2022 +0200
Commit: René Engelhard <r...@debian.org>
CommitDate: Wed Sep 14 22:50:46 2022 +0200
fix system-abseil build
after c97c60f70e9e6de594f7e0e0b85f17944c640dcf
"external: update pdfium to 5298"
Change-Id: I4a0a37ebf6cbc070d2fc5e17c89fd307a53de7fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139949
Tested-by: René Engelhard <r...@debian.org>
Tested-by: Jenkins
Reviewed-by: René Engelhard <r...@debian.org>
diff --git a/configure.ac b/configure.ac
index 12cc87525782..340e87d75b55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12044,8 +12044,13 @@ if test "$ENABLE_PDFIUM" = "TRUE"; then
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(absl/types/bad_optional_access.h, [],
[AC_MSG_ERROR(abseil headers not found.)], [])
- AC_CHECK_LIB([absl_bad_optional_access], [main],
[ABSEIL_LIBS=-labsl_bad_optional_access],
+ AC_CHECK_HEADER(absl/types/bad_variant_access.h, [],
+ [AC_MSG_ERROR(abseil headers not found.)], [])
+ AC_CHECK_LIB([absl_bad_optional_access], [main], [],
[AC_MSG_ERROR([libabsl_bad_optional_access library not
found.])])
+ AC_CHECK_LIB([absl_bad_variant_access], [main], [],
+ [AC_MSG_ERROR([libabsl_bad_variant_access library not
found.])])
+ ABSEIL_LIBS="-labsl_bad_optional_access -labsl_bad_variant_access"
AC_LANG_POP([C++])
ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e
"s/-I/${ISYSTEM?}/g")
FilterLibs "${ABSEIL_LIBS}"
