diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-09-14 11:31:50 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-09-17 10:46:27 +0100 |
commit | 68ffb332f5717f9ef6af11497372becddaac7ef0 (patch) | |
tree | 0b391b9749805a7a002ecb0b5a522eac20f538de /vcl/Library_vcl.mk | |
parent | c20ba023c738c0c76a07c94cb43c0a6d06f12374 (diff) |
nothing propagates HAVE_CUPS_H so cups is always disabled
regression from 22f2e5f286d55cd5c1ead07fb82cd78027abf490
so, lets follow the same pattern as else where and fixup
ENABLE_CUPS to be TRUE when enabled and lets just link
against cups and not do the dlopen dance
Change-Id: I3cff1bd98a7474c403d7ff66183e76e26e407de8
Diffstat (limited to 'vcl/Library_vcl.mk')
-rw-r--r-- | vcl/Library_vcl.mk | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 836edb374c0a..6c68a6fb4e2d 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -498,12 +498,6 @@ $(eval $(call gb_Library_add_defs,vcl,\ ) \ )) -ifeq ($(ENABLE_CUPS),YES) -$(eval $(call gb_Library_add_defs,vcl,\ - -DENABLE_CUPS\ -)) -endif - ifeq ($(GUIBASE),unx) $(eval $(call gb_Library_add_defs,vcl,\ -DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \ @@ -515,15 +509,15 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/unx/generic/plugadapt/salplug \ vcl/unx/generic/printer/jobdata \ vcl/unx/generic/printer/ppdparser \ - $(if $(filter YES,$(ENABLE_CUPS)),\ + $(if $(filter TRUE,$(ENABLE_CUPS)),\ vcl/unx/generic/printer/cupsmgr \ - vcl/unx/generic/printer/printerinfomanager \ - ) \ - $(if $(filter NO,$(ENABLE_CUPS)),\ + vcl/unx/generic/printer/printerinfomanager, \ + else \ vcl/null/printerinfomanager \ ) \ )) $(eval $(call gb_Library_use_externals,vcl,\ + cups \ dbus \ fontconfig \ freetype \ |