configure.ac | 19 -------------------
1 file changed, 19 deletions(-)
New commits:
commit 240ecad069ac4d38d7491c4b405b9c5065335f58
Author: Tor Lillqvist <[email protected]>
AuthorDate: Fri Oct 14 14:42:51 2022 +0300
Commit: Tor Lillqvist <[email protected]>
CommitDate: Fri Oct 14 14:48:59 2022 +0200
Don't bother with sanity check for fd hack in all or none of the related
libs
Get rid of the check that produces the error "cairo, fontconfig,
freetype, graphite, and harfbuzz must all be either used from the
system or bundled".
It should be enough that in CPLinux-LOKit.conf we bundle all the
libraries that need a "fd hack" for downloaded fonts in COOL.
If somebody combines these libraries in a different way and then
attempts to use the result for COOL and use the font downloading
feature, it won't work, but it's their own fault.
Change-Id: I7c6f6bc3ee2209cb4d7a167bd3ce80a9cfb74e17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141367
Tested-by: Tor Lillqvist <[email protected]>
Reviewed-by: Tor Lillqvist <[email protected]>
diff --git a/configure.ac b/configure.ac
index 5d650956063d..5c514dedb5a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13541,25 +13541,6 @@ AC_SUBST(CAIRO_LIBS)
AC_SUBST(ENABLE_CAIRO_CANVAS)
AC_SUBST(SYSTEM_CAIRO)
-if test -z "$with_system_cairo"; then
- with_system_cairo=yes
-fi
-
-case "$_os" in
- Linux)
- AC_MSG_CHECKING([for compatibility of system/bundled font-related
libraries])
- if test "$with_system_harfbuzz" != "$with_system_fontconfig" ||
- test "$with_system_fontconfig" != "$with_system_freetype" ||
- test "$with_system_freetype" != "$with_system_cairo" ||
- test "$with_system_cairo" != "$with_system_graphite"; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cairo, fontconfig, freetype, graphite, and harfbuzz
must all be either used from the system or bundled])
- else
- AC_MSG_RESULT([yes])
- fi
- ;;
-esac
-
dnl ===================================================================
dnl Test whether to use avahi
dnl ===================================================================
