configure.ac | 58 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
New commits: commit 30d6787b98131fce5a280f005b75e9d496f21573 Author: Jan-Marek Glogowski <[email protected]> AuthorDate: Mon Dec 6 08:02:27 2021 +0100 Commit: Jan-Marek Glogowski <[email protected]> CommitDate: Mon Dec 6 12:41:51 2021 +0100 configure.ac: tabs to spaces Regression from commit 214fa233338c09156c67f85818b6a2ea6b3235bd ("add with-system-abseil/with-system-openjpeg for pdfium"). Change-Id: I218cd4762f295c8d253afb670d3f3ebd5e104c45 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126398 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <[email protected]> diff --git a/configure.ac b/configure.ac index 14ba2345fade..d3bafb98b93c 100644 --- a/configure.ac +++ b/configure.ac @@ -11945,35 +11945,35 @@ fi AC_SUBST(ENABLE_PDFIUM) if test "$ENABLE_PDFIUM" = "TRUE"; then - AC_MSG_CHECKING([which OpenJPEG library to use]) - if test "$with_system_openjpeg" = "yes"; then - SYSTEM_OPENJPEG2=TRUE - AC_MSG_RESULT([external]) - PKG_CHECK_MODULES( OPENJPEG2, libopenjp2 ) - OPENJPEG2_CFLAGS=$(printf '%s' "$OPENJPEG2_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - FilterLibs "${OPENJPEG2_LIBS}" - OPENJPEG2_LIBS="${filteredlibs}" - else - SYSTEM_OPENJPEG2=FALSE - AC_MSG_RESULT([internal]) - fi - AC_MSG_CHECKING([which Abseil library to use]) - if test "$with_system_abseil" = "yes"; then - AC_MSG_RESULT([external]) - SYSTEM_ABSEIL=TRUE - AC_LANG_PUSH([C++]) - AC_CHECK_HEADER(absl/types/bad_optional_access.h, [], - [AC_MSG_ERROR(abseil headers not found.)], []) - #ABSEIL_CFLAGS=-I/usr/include - AC_CHECK_LIB([absl_bad_optional_access], [main], [ABSEIL_LIBS=-labsl_bad_optional_access], - [ AC_MSG_ERROR([libabsl_bad_optional_access library not found.]) ]) - AC_LANG_POP([C++]) - ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") - FilterLibs "${ABSEIL_LIBS}" - ABSEIL_LIBS="${filteredlibs}" - else - AC_MSG_RESULT([internal]) - fi + AC_MSG_CHECKING([which OpenJPEG library to use]) + if test "$with_system_openjpeg" = "yes"; then + SYSTEM_OPENJPEG2=TRUE + AC_MSG_RESULT([external]) + PKG_CHECK_MODULES( OPENJPEG2, libopenjp2 ) + OPENJPEG2_CFLAGS=$(printf '%s' "$OPENJPEG2_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "${OPENJPEG2_LIBS}" + OPENJPEG2_LIBS="${filteredlibs}" + else + SYSTEM_OPENJPEG2=FALSE + AC_MSG_RESULT([internal]) + fi + + AC_MSG_CHECKING([which Abseil library to use]) + if test "$with_system_abseil" = "yes"; then + AC_MSG_RESULT([external]) + SYSTEM_ABSEIL=TRUE + 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_MSG_ERROR([libabsl_bad_optional_access library not found.])]) + AC_LANG_POP([C++]) + ABSEIL_CFLAGS=$(printf '%s' "$ABSEIL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g") + FilterLibs "${ABSEIL_LIBS}" + ABSEIL_LIBS="${filteredlibs}" + else + AC_MSG_RESULT([internal]) + fi fi AC_SUBST(SYSTEM_OPENJPEG2) AC_SUBST(SYSTEM_ABSEIL)
