From 21781c3fe922592a34371abdc09dcd13d75b2340 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 1 Dec 2016 17:31:29 +0000
Subject: Add --enable-print option to configure to allow building without
 print support on X11 platforms.

Also, the NO_PRINT_SUPPORT preprocessor variable is renamed FL_NO_PRINT_SUPPORT.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12131 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Printer.cxx                             | 8 ++++----
 src/drivers/Posix/Fl_Posix_Printer_Driver.cxx  | 4 ++--
 src/drivers/PostScript/Fl_PostScript.cxx       | 4 ++++
 src/drivers/PostScript/Fl_PostScript_image.cxx | 6 ++++--
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Printer.cxx b/src/Fl_Printer.cxx
index be80abc6d..c0982687c 100644
--- a/src/Fl_Printer.cxx
+++ b/src/Fl_Printer.cxx
@@ -21,11 +21,11 @@
 #include <config.h>
 
 #ifdef FL_PORTING
-#  pragma message "FL_PORTING: implement print support for your platform, or define NO_PRINT_SUPPORT"
-#define NO_PRINT_SUPPORT 1
+#  pragma message "FL_PORTING: implement print support for your platform, or define FL_NO_PRINT_SUPPORT"
+#define FL_NO_PRINT_SUPPORT 1
 #endif
 
-#if defined(NO_PRINT_SUPPORT)
+#if defined(FL_NO_PRINT_SUPPORT)
 #include <FL/Fl_PostScript.H>
 
 Fl_Printer::Fl_Printer(void) {
@@ -239,7 +239,7 @@ Fl_Printer::~Fl_Printer(void)
   delete printer;
 }
 
-#endif // defined(NO_PRINT_SUPPORT)
+#endif // defined(FL_NO_PRINT_SUPPORT)
 
 //
 // End of "$Id$".
diff --git a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
index 24fb4c77e..0b5b1e88b 100644
--- a/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
+++ b/src/drivers/Posix/Fl_Posix_Printer_Driver.cxx
@@ -18,7 +18,7 @@
 
 #include "../../config_lib.h"
 
-#if defined(FL_CFG_PRN_PS)
+#if defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT)
 
 #include <FL/Fl_PostScript.H>
 #include <FL/Fl_Printer.H>
@@ -133,7 +133,7 @@ int Fl_Posix_Printer_Driver::start_job(int pages, int *firstpage, int *lastpage)
   return ps->start_postscript(pages, format, layout); // start printing
 }
 
-#endif // defined(FL_CFG_PRN_PS)
+#endif // defined(FL_CFG_PRN_PS) && !defined(FL_NO_PRINT_SUPPORT)
 
 
 //
diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx
index e764ed0bf..75facf987 100644
--- a/src/drivers/PostScript/Fl_PostScript.cxx
+++ b/src/drivers/PostScript/Fl_PostScript.cxx
@@ -16,6 +16,8 @@
 //     http://www.fltk.org/str.php
 //
 
+#include <config.h>
+#if !defined(FL_NO_PRINT_SUPPORT)
 #include <FL/Fl.H>
 #include <FL/fl_ask.H>
 #include <FL/fl_draw.H>
@@ -1477,6 +1479,8 @@ void Fl_PostScript_File_Device::end_job (void)
 
 #endif // FL_DOXYGEN
 
+#endif // !defined(FL_NO_PRINT_SUPPORT)
+
 //
 // End of "$Id$".
 //
diff --git a/src/drivers/PostScript/Fl_PostScript_image.cxx b/src/drivers/PostScript/Fl_PostScript_image.cxx
index 0dc683bff..4b3d316bb 100644
--- a/src/drivers/PostScript/Fl_PostScript_image.cxx
+++ b/src/drivers/PostScript/Fl_PostScript_image.cxx
@@ -16,7 +16,8 @@
 //     http://www.fltk.org/str.php
 //
 
-#ifndef FL_DOXYGEN
+#include <config.h>
+#if !defined(FL_DOXYGEN) && !defined(FL_NO_PRINT_SUPPORT)
 
 #include <stdio.h>
 #include <math.h>
@@ -649,7 +650,8 @@ void Fl_PostScript_Graphics_Driver::draw(Fl_Bitmap * bitmap,int XP, int YP, int
   pop_clip();
 }
 
-#endif // FL_DOXYGEN
+#endif // !defined(FL_DOXYGEN) && !defined(FL_NO_PRINT_SUPPORT)
+
 
 //
 // End of "$Id$"
-- 
cgit v1.2.3