vcl/Library_vcl.mk | 5 +++-- vcl/Library_vclplug_gen.mk | 2 +- vcl/Library_vclplug_gtk.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 62be661944e18f630cd7ca3a688bfb02f8dee3f5 Author: Kay Schenk <ksch...@apache.org> Date: Fri Feb 5 18:05:05 2016 +0000 #i126118# More fixes for null second op in ifndef statements. diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk index 75a6346..ff40252 100755 --- a/vcl/Library_vclplug_gtk.mk +++ b/vcl/Library_vclplug_gtk.mk @@ -44,7 +44,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gtk,\ -DVERSION=\"$(UPD)$(LAST_MINOR)\" \ )) -ifneq ($(ENABLE_DBUS),) +ifeq ($(ENABLE_DBUS),TRUE) $(eval $(call gb_Library_set_include,vclplug_gtk,\ $$(INCLUDE) \ $(shell pkg-config --cflags-only-I dbus-glib-1) \ commit 3ba2da6418ef50d77ce55b859f63bcbc8a973bb7 Author: Kay Schenk <ksch...@apache.org> Date: Fri Feb 5 18:03:36 2016 +0000 #i126118# More changes to fix null operands in ifndef statements. diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk index eeebe12..bd2826a 100755 --- a/vcl/Library_vclplug_gen.mk +++ b/vcl/Library_vclplug_gen.mk @@ -116,7 +116,7 @@ $(eval $(call gb_Library_set_defs,vclplug_gen,\ ## handle RandR -ifneq ($(ENABLE_RANDR),) +ifeq ($(ENABLE_RANDR),TRUE) $(eval $(call gb_Library_set_defs,vclplug_gen,\ $$(DEFS) \ -DUSE_RANDR \ commit 476fd8ac05f0331e9d67dcf2eaa96e1a8b75bbbd Author: Kay Schenk <ksch...@apache.org> Date: Fri Feb 5 18:01:59 2016 +0000 #i126118# more changes to fix null second op in ifndef statements. diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 70eb695..bcc51dd 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 _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits