diff options
| author | Kay Schenk <kschenk@apache.org> | 2016-02-05 18:01:59 +0000 |
|---|---|---|
| committer | Kay Schenk <kschenk@apache.org> | 2016-02-05 18:01:59 +0000 |
| commit | 476fd8ac05f0331e9d67dcf2eaa96e1a8b75bbbd (patch) | |
| tree | 593bd156c340b3cef427bfa53ff2bcd705d14489 | |
| parent | 51e9a26e702cdbdeb864844b5092d7f24ba28141 (diff) | |
#i126118# more changes to fix null second op in ifndef statements.
Notes
Notes:
reject: environment variables are TRUE/<empty> already
| -rwxr-xr-x | vcl/Library_vcl.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 70eb695593e4..bcc51ddd5d53 100755 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -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 |