configure.ac |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f725b2c2afae70d7886b89a2936ab9ced53b599
Author:     Miklos Vajna <vmik...@collabora.com>
AuthorDate: Fri Feb 14 13:46:09 2025 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Feb 14 14:59:28 2025 +0100

    configure: fix --disable-skia build of pdfium
    
    A problem since commit 6007fbef5c2e4a0b80a4c0031ff36117aa41e63f (Update
    pdfium to 7012, 2025-02-13), it's one thing that pdfium needs to be
    built with clang-cl on Windows (similar to Skia), but our configure
    didn't configure clang-cl when skia was off. So do it when either skia
    or pdfium is enabled.
    
    Reported at
    
<https://lists.freedesktop.org/archives/libreoffice/2025-February/093003.html>.
    
    Change-Id: I261b98511b664182d46a4a11ecbb40ad91663c41
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181665
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins

diff --git a/configure.ac b/configure.ac
index 97493ace6fb3..41cc74e1648c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12803,7 +12803,7 @@ LO_CLANG_CXXFLAGS_INTRINSICS_FMA=
 LO_CLANG_VERSION=
 HAVE_LO_CLANG_DLLEXPORTINLINES=
 
-if test "$ENABLE_SKIA" = TRUE -a "$COM_IS_CLANG" != TRUE; then
+if test \( "$ENABLE_SKIA" = TRUE -o "$ENABLE_PDFIUM" = TRUE \) -a 
"$COM_IS_CLANG" != TRUE; then
     if test -n "$LO_CLANG_CC" -a -n "$LO_CLANG_CXX"; then
         AC_MSG_CHECKING([for Clang])
         AC_MSG_RESULT([$LO_CLANG_CC / $LO_CLANG_CXX])

Reply via email to