RepositoryExternal.mk | 10 ++++------
configure.ac | 20 +++-----------------
2 files changed, 7 insertions(+), 23 deletions(-)
New commits:
commit ce54ba96f38b4af3aab1a7064078ee406eb021c6
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Fri Dec 24 05:55:34 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Dec 30 02:13:17 2021 +0100
Use libo_CHECK_SYSTEM_MODULE for eot
Change-Id: I019a2047d05019b161c4f08c1d17a084a2224ebc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127639
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 54ad3e952bcd..c2f0e6570d17 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3250,9 +3250,9 @@ endif # MSC
endif # SYSTEM_LIBORCUS
-ifeq ($(ENABLE_EOT),TRUE)
-ifneq ($(SYSTEM_LIBEOT),)
+ifeq ($(ENABLE_EOT),TRUE)
+ifeq ($(SYSTEM_LIBEOT),TRUE)
define gb_LinkTarget__use_libeot
$(call gb_LinkTarget_set_include,$(1),\
@@ -3284,16 +3284,14 @@ $(call
gb_ExternalProject_use_external_project,$(1),libeot)
endef
-endif # SYSTEM_LIBEOT
-
+endif # !SYSTEM_LIBEOT
else # !ENABLE_EOT
gb_LinkTarget__use_libeot :=
gb_ExternalProject__use_libeot :=
-endif # ENABLE_EOT
+endif # !ENABLE_EOT
-### X11 stuff ###
ifeq ($(USING_X11), TRUE)
diff --git a/configure.ac b/configure.ac
index d07ced70939f..93076f8692c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -911,6 +911,7 @@ cygwin*|wsl*)
using_freetype_fontconfig=no
using_x11=no
test_openldap=no
+ test_eot=no
build_skia=yes
_os=WINNT
@@ -929,6 +930,7 @@ darwin*|macos*) # macOS
using_freetype_fontconfig=no
using_x11=no
build_skia=yes
+ test_eot=no
if test -n "$LODE_HOME" ; then
mac_sanitize_path
AC_MSG_NOTICE([sanitized the PATH to $PATH])
@@ -1709,11 +1711,6 @@ libo_FUZZ_ARG_ENABLE(gstreamer-1-0,
[Disable building with the gstreamer 1.0 avmedia backend.]),
,test "${enable_gstreamer_1_0+set}" = set || enable_gstreamer_1_0=yes)
-libo_FUZZ_ARG_ENABLE([eot],
- [AS_HELP_STRING([--enable-eot],
- [Enable support for Embedded OpenType fonts.])],
-,test "${enable_eot+set}" = set || enable_eot=no)
-
libo_FUZZ_ARG_ENABLE(cve-tests,
AS_HELP_STRING([--disable-cve-tests],
[Prevent CVE tests to be executed]),
@@ -9360,18 +9357,7 @@ dnl Check for system xmlsec
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28])
-AC_MSG_CHECKING([whether to enable Embedded OpenType support])
-if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_eot" = "yes"; then
- ENABLE_EOT="TRUE"
- AC_DEFINE([ENABLE_EOT])
- AC_MSG_RESULT([yes])
-
- libo_CHECK_SYSTEM_MODULE([libeot],[LIBEOT],[libeot >= 0.01])
-else
- ENABLE_EOT=
- AC_MSG_RESULT([no])
-fi
-AC_SUBST([ENABLE_EOT])
+libo_CHECK_SYSTEM_MODULE([eot],[EOT],[libeot >= 0.01],disabled)
dnl ===================================================================
dnl Check for DLP libs
