--- CMakeLists.txt.old	2009-04-14 22:52:13.000000000 +0200
+++ CMakeLists.txt	2009-04-21 19:26:46.773449600 +0200
@@ -328,15 +328,18 @@
 ENDIF(NOT RENDER_LIB OR OLDRENDERLIBLOST)
 
 
-# START CUPS
-SET(CUPS_DIR ${CMAKE_MODULE_PATH})
-FIND_PACKAGE(CUPS REQUIRED)
-IF(CUPS_FOUND)
-  SET(HAVE_CUPS 1)
-  MESSAGE("CUPS Library Found OK")
-ENDIF(CUPS_FOUND)
+# START CUPS (TDX : CUPS is now optionnal)
+IF (WANT_CUPS)
+  SET(CUPS_DIR ${CMAKE_MODULE_PATH})
+  FIND_PACKAGE(CUPS REQUIRED)
+  IF(CUPS_FOUND)
+    SET(HAVE_CUPS 1)
+    MESSAGE("CUPS Library Found OK")
+    ENDIF(CUPS_FOUND)
+ENDIF (WANT_CUPS)
 # END CUPS
 
+
 # START LIBXML2
 SET(LIBXML2_DIR ${CMAKE_MODULE_PATH})
 FIND_PACKAGE(LIBXML2 REQUIRED)
@@ -414,7 +417,6 @@
 ${CMAKE_BINARY_DIR}/scribus
 ${QT_INCLUDE_DIR}
 ${QT_INCLUDE_PATH}
-${CUPS_INCLUDE_DIR}
 ${FREETYPE_INCLUDE_DIR}
 ${FONTCONFIG_INCLUDE_DIR}
 ${LCMS_INCLUDE_DIR}
@@ -429,6 +431,12 @@
 
 #Set up libraries to link with all found packages
 
+#TDX : CUPS is now optionnal
+IF(WANT_CUPS)
+  INCLUDE_DIRECTORIES(${CUPS_INCLUDE_DIR})
+  LINK_LIBRARIES(${CUPS_LIBRARIES})
+ENDIF(WANT_CUPS)
+
 #Select Libart_LGPL or Cairo
 IF(RENDER_LIB STREQUAL "LIBART")
   INCLUDE_DIRECTORIES(${LIBART_LGPL_INCLUDE_DIR})
@@ -445,7 +453,6 @@
 
 LINK_LIBRARIES (
 ${QT_QT_LIBRARY}
-${CUPS_LIBRARIES}
 ${FREETYPE_LIBRARIES}
 ${FONTCONFIG_LIBRARIES}
 ${LCMS_LIBRARIES}