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 /RepositoryExternal.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 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index fcc478292f89..772c09883f9c 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1219,6 +1219,26 @@ $(call gb_LinkTarget_add_libs,$(1),$(GTHREAD_LIBS)) endef +ifeq ($(ENABLE_CUPS),TRUE) + +define gb_LinkTarget__use_cups +$(call gb_LinkTarget_add_defs,$(1),\ + -DENABLE_CUPS \ +) + +$(call gb_LinkTarget_add_libs,$(1),\ + -lcups \ +) + +endef + +else # ENABLE_CUPS + +define gb_LinkTarget__use_cups + +endef + +endif # ENABLE_DBUS ifeq ($(ENABLE_DBUS),TRUE) |