mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENABLE_CORETEXT: Harmonize ENABLE_* variable to TRUE/<nothing>

Browse Source 
Change-Id: I39153ee042b171f7cd1ffa6b50c490d2c9fa33cb
Reviewed-on: https://gerrit.libreoffice.org/5685
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
This commit is contained in:
Norbert Thiebaud
2013-08-29 11:29:19 -05:00
committed by Fridrich Strba
parent 587d9693bd
commit e57a14a6da
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -11234,12 +11234,12 @@ AC_SUBST(WITH_HELPPACK_INTEGRATION)
dnl =================================================================== dnl ===================================================================
dnl Test whether to use CoreText framework dnl Test whether to use CoreText framework
dnl =================================================================== dnl ===================================================================
ENABLE_CORETEXT=NO ENABLE_CORETEXT=
if test "$_os" = "Darwin"; then if test "$_os" = "Darwin"; then
AC_MSG_CHECKING([whether to use CoreText framework]) AC_MSG_CHECKING([whether to use CoreText framework])
if test "$enable_coretext" != no -o "$BITNESS_OVERRIDE" = 64; then if test "$enable_coretext" != no -o "$BITNESS_OVERRIDE" = 64; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_CORETEXT=YES ENABLE_CORETEXT=TRUE
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi

2
vcl/Library_vcl.mk
View File

@@ -356,7 +356,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
-DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \ -DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
)) ))
ifeq ($(ENABLE_CORETEXT),YES) ifeq ($(ENABLE_CORETEXT),TRUE)
$(eval $(call gb_Library_add_defs,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\
-DENABLE_CORETEXT \ -DENABLE_CORETEXT \