RepositoryExternal.mk | 6 +++---
config_host.mk.in | 2 +-
config_host/config_eot.h.in | 6 +++---
configure.ac | 2 +-
vcl/source/gdi/embeddedfontshelper.cxx | 4 ++--
vcl/source/gdi/pdfwriter_impl.cxx | 2 +-
6 files changed, 11 insertions(+), 11 deletions(-)
New commits:
commit 88c511981e31c73dced95b5dc3c200fdf2a4e932
Author: Jan-Marek Glogowski <glo...@fbihome.de>
AuthorDate: Thu Dec 30 10:48:32 2021 +0100
Commit: Jan-Marek Glogowski <glo...@fbihome.de>
CommitDate: Thu Dec 30 15:30:35 2021 +0100
Fix uppercase EOT => LIBEOT usage
Originally I had these hunks included, but somehow came to think
that using EOT instead of LIBEOT would work... well I'm obviously
wrong, so re-add the uppercase LIBEOT usage.
Still uses the lowercase "eot", because of the autoconf switches.
Regression from commit ce54ba96f38b4af3aab1a7064078ee406eb021c6
("Use libo_CHECK_SYSTEM_MODULE for eot").
Change-Id: Id3e1c97cdb67621f0c0cfd67b78836f62df0e8e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127737
Tested-by: Julien Nabet <serval2...@yahoo.fr>
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index c2f0e6570d17..709376b80034 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3251,7 +3251,7 @@ endif # MSC
endif # SYSTEM_LIBORCUS
-ifeq ($(ENABLE_EOT),TRUE)
+ifeq ($(ENABLE_LIBEOT),TRUE)
ifeq ($(SYSTEM_LIBEOT),TRUE)
define gb_LinkTarget__use_libeot
@@ -3285,12 +3285,12 @@ $(call
gb_ExternalProject_use_external_project,$(1),libeot)
endef
endif # !SYSTEM_LIBEOT
-else # !ENABLE_EOT
+else # !ENABLE_LIBEOT
gb_LinkTarget__use_libeot :=
gb_ExternalProject__use_libeot :=
-endif # !ENABLE_EOT
+endif # !ENABLE_LIBEOT
ifeq ($(USING_X11), TRUE)
diff --git a/config_host.mk.in b/config_host.mk.in
index 1025ee4805f9..dfcd2f169b1c 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -154,7 +154,6 @@ export ENABLE_DBGUTIL=@ENABLE_DBGUTIL@
export ENABLE_DBUS=@ENABLE_DBUS@
export ENABLE_DCONF=@ENABLE_DCONF@
export ENABLE_DEBUG=@ENABLE_DEBUG@
-export ENABLE_EOT=@ENABLE_EOT@
export ENABLE_EVOAB2=@ENABLE_EVOAB2@
export ENABLE_FIREBIRD_SDBC=@ENABLE_FIREBIRD_SDBC@
export ENABLE_FORMULA_LOGGER=@ENABLE_FORMULA_LOGGER@
@@ -169,6 +168,7 @@ export ENABLE_HEADLESS=@ENABLE_HEADLESS@
export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@
export ENABLE_JAVA=@ENABLE_JAVA@
export ENABLE_LDAP=@ENABLE_LDAP@
+export ENABLE_LIBEOT=@ENABLE_LIBEOT@
export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
export ENABLE_LTO=@ENABLE_LTO@
export ENABLE_LWP=@ENABLE_LWP@
diff --git a/config_host/config_eot.h.in b/config_host/config_eot.h.in
index d1c87a053b95..ade94ab5d1e1 100644
--- a/config_host/config_eot.h.in
+++ b/config_host/config_eot.h.in
@@ -1,6 +1,6 @@
-#ifndef CONFIG_EOT_H
-#define CONFIG_EOT_H
+#ifndef CONFIG_LIBEOT_H
+#define CONFIG_LIBEOT_H
-#define ENABLE_EOT 0
+#define ENABLE_LIBEOT 0
#endif
diff --git a/configure.ac b/configure.ac
index 825482217b26..010552a5ba04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9345,7 +9345,7 @@ dnl Check for system xmlsec
dnl ===================================================================
libo_CHECK_SYSTEM_MODULE([xmlsec], [XMLSEC], [xmlsec1-nss >= 1.2.28])
-libo_CHECK_SYSTEM_MODULE([eot],[EOT],[libeot >= 0.01],disabled)
+libo_CHECK_SYSTEM_MODULE([eot],[LIBEOT],[libeot >= 0.01],disabled)
dnl ===================================================================
dnl Check for DLP libs
diff --git a/vcl/source/gdi/embeddedfontshelper.cxx
b/vcl/source/gdi/embeddedfontshelper.cxx
index 34d227e5f5b2..f21e73498ebd 100644
--- a/vcl/source/gdi/embeddedfontshelper.cxx
+++ b/vcl/source/gdi/embeddedfontshelper.cxx
@@ -26,7 +26,7 @@
#include <sft.hxx>
-#if ENABLE_EOT
+#if ENABLE_LIBEOT
extern "C"
{
namespace libeot
@@ -108,7 +108,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( const
uno::Reference< io::XInputStrea
break;
}
bool sufficientFontRights(false);
-#if ENABLE_EOT
+#if ENABLE_LIBEOT
if( eot )
{
unsigned uncompressedFontSize = 0;
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx
b/vcl/source/gdi/pdfwriter_impl.cxx
index e89b1f65949f..53552f4ec4c8 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -85,7 +85,7 @@
#include <config_eot.h>
-#if ENABLE_EOT
+#if ENABLE_LIBEOT
#include <libeot/libeot.h>
#endif
