[Libreoffice-commits] core.git: configure.ac vcl/Library_vcl.mk

Norbert Thiebaud nthiebaud at gmail.com
Fri Aug 30 00:08:24 PDT 2013


 configure.ac       |    4 ++--
 vcl/Library_vcl.mk |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e57a14a6dae8a38ccd81dcebd36050aec98c3756
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Aug 29 11:29:19 2013 -0500

    ENABLE_CORETEXT: Harmonize ENABLE_* variable to TRUE/<nothing>
    
    Change-Id: I39153ee042b171f7cd1ffa6b50c490d2c9fa33cb
    Reviewed-on: https://gerrit.libreoffice.org/5685
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/configure.ac b/configure.ac
index cc8721f..fc46d55 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11234,12 +11234,12 @@ AC_SUBST(WITH_HELPPACK_INTEGRATION)
 dnl ===================================================================
 dnl Test whether to use CoreText framework
 dnl ===================================================================
-ENABLE_CORETEXT=NO
+ENABLE_CORETEXT=
 if test "$_os" = "Darwin"; then
     AC_MSG_CHECKING([whether to use CoreText framework])
     if test "$enable_coretext" != no -o "$BITNESS_OVERRIDE" = 64; then
         AC_MSG_RESULT([yes])
-        ENABLE_CORETEXT=YES
+        ENABLE_CORETEXT=TRUE
     else
         AC_MSG_RESULT([no])
     fi
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index cc1a21d..e37ec15 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -356,7 +356,7 @@ $(eval $(call gb_Library_add_defs,vcl,\
 	-DMACOSX_BUNDLE_IDENTIFIER=\"$(MACOSX_BUNDLE_IDENTIFIER)\" \
 ))
 
-ifeq ($(ENABLE_CORETEXT),YES)
+ifeq ($(ENABLE_CORETEXT),TRUE)
 
 $(eval $(call gb_Library_add_defs,vcl,\
     -DENABLE_CORETEXT \


More information about the Libreoffice-commits mailing list