diff options
| -rw-r--r-- | CMake/options.cmake | 4 | ||||
| -rw-r--r-- | configh.cmake.in | 2 | ||||
| -rw-r--r-- | configh.in | 3 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/Fl_Printer.cxx | 8 | ||||
| -rw-r--r-- | src/drivers/Posix/Fl_Posix_Printer_Driver.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/PostScript/Fl_PostScript_image.cxx | 6 |
8 files changed, 24 insertions, 13 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index a605b6903..75c6946e4 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -376,9 +376,9 @@ else() endif(OPTION_USE_XDBE AND HAVE_XDBE_H) ####################################################################### -set(NO_PRINT_SUPPORT FALSE) +set(FL_NO_PRINT_SUPPORT FALSE) if(X11_FOUND AND NOT OPTION_PRINT_SUPPORT) - set(NO_PRINT_SUPPORT TRUE) + set(FL_NO_PRINT_SUPPORT TRUE) endif(X11_FOUND AND NOT OPTION_PRINT_SUPPORT) ####################################################################### diff --git a/configh.cmake.in b/configh.cmake.in index 03bd1424a..e6394a612 100644 --- a/configh.cmake.in +++ b/configh.cmake.in @@ -358,7 +358,7 @@ * Do we want print support? */ -#cmakedefine NO_PRINT_SUPPORT 1 +#cmakedefine FL_NO_PRINT_SUPPORT 1 /* * Do we want filename handling and a filechooser? diff --git a/configh.in b/configh.in index ee9508ce3..64081490b 100644 --- a/configh.in +++ b/configh.in @@ -357,10 +357,9 @@ /* * Do we want print support? - * *FIXME* Not yet implemented in configure ! */ -#undef NO_PRINT_SUPPORT +#undef FL_NO_PRINT_SUPPORT /* * Do we want filename handling and a filechooser? diff --git a/configure.ac b/configure.ac index 417e91a0f..2b592920d 100644 --- a/configure.ac +++ b/configure.ac @@ -992,6 +992,12 @@ case $host_os_gui in GLDEMOS="" fi + dnl Check whether print support was disabled... + AC_ARG_ENABLE(print, [ --enable-print turn on print support (X11 platform) [[default=yes]]]) + if test x$enable_print != xyes; then + AC_DEFINE(FL_NO_PRINT_SUPPORT) + fi + dnl Check for Xinerama support unless disabled... AC_ARG_ENABLE(xinerama, [ --enable-xinerama turn on Xinerama support [[default=yes]]]) 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$" |