summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-05-10 09:19:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-05-10 10:18:32 +0100
commit9cee212202aa08fef7c7478608ceacebc8693a46 (patch)
treeb76a302c7b4a3af8d919e000a9edaf642e8e4d79
parent5f1d65fe21a1690bb31736ebada13380554d9c82 (diff)
fix use of cups for default case
27abb730b290f3516582d2d787ef64af76663f97 broke printing Change-Id: Ib1cd9b31c7e3e5644b5207cb28c4fd178837c19d
-rw-r--r--vcl/Library_vcl.mk6
-rw-r--r--vcl/unx/generic/printer/ppdparser.cxx2
2 files changed, 7 insertions, 1 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index a5b1848c8c47..bf03be2da259 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -436,6 +436,12 @@ $(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)\" \
diff --git a/vcl/unx/generic/printer/ppdparser.cxx b/vcl/unx/generic/printer/ppdparser.cxx
index 9acee5658a2b..45164979407f 100644
--- a/vcl/unx/generic/printer/ppdparser.cxx
+++ b/vcl/unx/generic/printer/ppdparser.cxx
@@ -655,7 +655,7 @@ const PPDParser* PPDParser::getParser( const String& rFile )
PrinterInfoManager& rMgr = PrinterInfoManager::get();
if( rMgr.getType() == PrinterInfoManager::CUPS )
{
-#if defined HAVE_CUPS_H
+#ifdef ENABLE_CUPS
pNewParser = const_cast<PPDParser*>(static_cast<CUPSManager&>(rMgr).createCUPSParser( aFile ));
#endif
}