Author: kschenk
Date: Fri Feb 5 18:01:59 2016
New Revision: 1728723
URL: http://svn.apache.org/viewvc?rev=1728723&view=rev
Log:
#i126118# more changes to fix null second op in ifndef statements.
Modified:
openoffice/trunk/main/vcl/Library_vcl.mk
Modified: openoffice/trunk/main/vcl/Library_vcl.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/vcl/Library_vcl.mk?rev=1728723&r1=1728722&r2=1728723&view=diff
==============================================================================
--- openoffice/trunk/main/vcl/Library_vcl.mk (original)
+++ openoffice/trunk/main/vcl/Library_vcl.mk Fri Feb 5 18:01:59 2016
@@ -191,13 +191,13 @@ $(eval $(call gb_Library_set_defs,vcl,\
-D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
## handle fontconfig
-ifneq ($(ENABLE_FONTCONFIG),)
+ifeq ($(ENABLE_FONTCONFIG),TRUE)
$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
-DENABLE_FONTCONFIG \
))
## handle CUPS
-ifneq ($(ENABLE_CUPS),)
+ifeq ($(ENABLE_CUPS),TRUE)
$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
-DENABLE_CUPS \
@@ -522,6 +522,7 @@ $(eval $(call gb_Library_set_ldflags,vcl
-framework Carbon \
-framework CoreFoundation \
))
+# ??? what about this
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.7)
$(eval $(call gb_Library_set_ldflags,vcl, $$(LDFLAGS) -framework QuickTime ))
endif
