Revert "Merge branch 'print-module'"

This reverts commit c1ee6c9, reversing
changes made to 570dbcb.

Conflicts:
	CMakeLists.txt
	src/imageio/storage/disk.c

CMakeLists.txt

@@ -28,7 +28,6 @@ option(USE_OPENJPEG "Enable JPEG 2000 support" ON)
 option(USE_WEBP "Enable WebP export support" ON)
 option(BUILD_CMSTEST "Build a test program to check your system's color management setup" ON)
 option(USE_OPENEXR "Enable OpenEXR support" ON)
-option(BUILD_PRINT "Build the print module" OFF)
 if(APPLE)
 	option(USE_MAC_INTEGRATION "Enable OS X integration" ON)
 else(APPLE)
@@ -306,3 +305,4 @@ configure_file(
 
 add_custom_target(uninstall
     COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+

doc/README

@@ -8,7 +8,6 @@ to build it, you need:
 
 optionally, you might need for special features:
 
- - libcups2 (for the print module)
  - gphoto2 (for camera support, recommended)
  - librsvg2 (for watermark plugin)
  - flickcurl (for Flickr support)

src/CMakeLists.txt

@@ -560,30 +560,6 @@ if(USE_LUA)
   list(APPEND STATIC_LIBS lautoc_static)
 endif(USE_LUA)
 
-if(BUILD_PRINT)
-  find_package(CUPS)
-  if(CUPS_FOUND)
-    include_directories(SYSTEM ${CUPS_INCLUDE_DIRS})
-    add_definitions(${CUPS_DEFINITIONS})
-    FILE(GLOB SOURCE_FILES_PRINT
-      "common/cups_print.h"
-      "common/cups_print.c"
-      "common/printprof.c"
-      "libs/print_settings.c"
-      )
-    set(SOURCES ${SOURCES} ${SOURCE_FILES_PRINT})
-    add_library(cups_static STATIC IMPORTED)
-    list(APPEND LIBS ${CUPS_LIBRARIES})
-    add_definitions("-DHAVE_PRINT")
-    message(STATUS "Print mode: enabled")
-  else(CUPS_FOUND)
-    set(BUILD_PRINT OFF)
-    message(STATUS "Print mode: disabled, please install CUPS dev package")
-  endif(CUPS_FOUND)
-else(BUILD_PRINT)
-  message(STATUS "Print mode: disabled")
-endif(BUILD_PRINT)
-
 #
 # We need C++11
 #