Index: Makefile.in =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/Makefile.in,v retrieving revision 1.59 diff -u -r1.59 Makefile.in --- Makefile.in +++ Makefile.in @@ -113,8 +113,14 @@ nsAccessibilityHelper.cpp \ nsPrintJobFactoryGTK.cpp \ nsPrintJobGTK.cpp \ + $(NULL) + +ifdef MOZ_ENABLE_POSTSCRIPT +CPPSRCS = \ nsTempfilePS.cpp \ $(NULL) +endif + # build our subdirs, too ifdef ACCESSIBILITY Index: nsPrintJobFactoryGTK.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsPrintJobFactoryGTK.cpp,v retrieving revision 1.1 diff -u -r1.1 nsPrintJobFactoryGTK.cpp --- nsPrintJobFactoryGTK.cpp +++ nsPrintJobFactoryGTK.cpp @@ -74,10 +74,12 @@ { const char *printerName; aSpec->GetPrinterName(&printerName); +#ifdef USE_POSTSCRIPT if (nsPSPrinterList::kTypeCUPS == nsPSPrinterList::GetPrinterType( nsDependentCString(printerName))) newPJ = new nsPrintJobCUPS(); else +#endif newPJ = new nsPrintJobPipeGTK(); } } Index: nsPrintJobGTK.cpp =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsPrintJobGTK.cpp,v retrieving revision 1.2 diff -u -r1.2 nsPrintJobGTK.cpp --- nsPrintJobGTK.cpp +++ nsPrintJobGTK.cpp @@ -341,7 +341,7 @@ return NS_OK; } - +#ifdef USE_POSTSCRIPT /**** Print via CUPS ****/ /** @@ -467,7 +467,7 @@ return (result < 0x0300) ? NS_OK : NS_ERROR_GFX_PRINTER_CMD_FAILURE; } - +#endif #endif /* VMS */ Index: nsPrintJobGTK.h =================================================================== RCS file: /cvsroot/mozilla/widget/src/gtk2/nsPrintJobGTK.h,v retrieving revision 1.1 diff -u -r1.1 nsPrintJobGTK.h --- nsPrintJobGTK.h +++ nsPrintJobGTK.h @@ -39,15 +39,19 @@ #ifndef nsPrintJobGTK_h__ #define nsPrintJobGTK_h__ -#include "nsCUPSShim.h" #include "nsDebug.h" #include "nsIDeviceContext.h" // for NS_ERROR_GFX_PRINTING_NOT_IMPLEMENTED #include "nsILocalFile.h" #include "nsIPrintJobGTK.h" #include "nsString.h" -#include "nsTempfilePS.h" #include "nsDeviceContextSpecG.h" +#ifdef USE_POSTSCRIPT +#include "nsCUPSShim.h" +#include "nsTempfilePS.h" +#endif + + /* Print job class for print preview operations. */ class nsPrintJobPreviewGTK : public nsIPrintJobGTK { @@ -137,7 +141,7 @@ nsCString mPrinterName; }; - +#ifdef USE_POSTSCRIPT /* This class submits print jobs through CUPS. mDestHandle and * mDestination point to a temporary file used to assemble the * final print job. @@ -158,5 +162,6 @@ nsCString mNumCopies; nsCString mJobTitle; // IsVoid() if no title }; +#endif #endif /* nsPrintJobPS_h__ */