[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - configure.ac

[Luboš Luňák (via logerrit)]

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

New commits:
commit dad392e43b888fe78a3bc10eca921c4b2d65445d
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Apr 14 21:43:43 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Apr 14 23:41:52 2021 +0200

    disable Skia if --disable -gui
    
    There are link errors because of SkiaZone, and Skia is not even
    linked in for non-GUI.
    
    Change-Id: I942dbf79c2012b5dfd4259a7c4ecc680500174b8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114111
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/configure.ac b/configure.ac
index 57e1f7c0f180..2e1454d8edd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11695,7 +11695,7 @@ AC_SUBST(POPPLER_LIBS)
 # Skia?
 AC_MSG_CHECKING([whether to build Skia])
 ENABLE_SKIA=
-if test "$enable_skia" != "no" -a "$build_skia" = "yes"; then
+if test "$enable_skia" != "no" -a "$build_skia" = "yes" -a -z "$DISABLE_GUI"; then
     if test "$enable_skia" = "debug"; then
         AC_MSG_RESULT([yes (debug)])
         ENABLE_SKIA_DEBUG=TRUE