diff -urN vigra-1.7.1.old/CMakeLists.txt vigra-1.7.1/CMakeLists.txt
--- vigra-1.7.1.old/CMakeLists.txt	2011-03-31 19:32:42.000000000 +0200
+++ vigra-1.7.1/CMakeLists.txt	2011-03-31 19:39:51.000000000 +0200
@@ -38,16 +38,32 @@
 ##################################################
 
 INCLUDE(VigraFindPackage)
-VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
-VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
-VIGRA_FIND_PACKAGE(PNG)
-VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3)
+
+option(WITH_TIFF "Enable tiff support" ON)
+option(WITH_JPEG "Enable jpeg support" ON)
+option(WITH_PNG "Enable png support" ON)
+option(WITH_FFTW3 "Enable fftw support" ON)
+option(ENABLE_DOC "Build documentation" ON)
+if(WITH_TIFF)
+	VIGRA_FIND_PACKAGE(TIFF NAMES libtiff)
+endif()
+if(WITH_JPEG)
+	VIGRA_FIND_PACKAGE(JPEG NAMES libjpeg)
+endif()
+if(WITH_PNG)
+	VIGRA_FIND_PACKAGE(PNG)
+endif()
+if(WITH_FFTW3)
+	VIGRA_FIND_PACKAGE(FFTW3 NAMES libfftw3-3)
+endif()
 IF(WITH_HDF5)
     VIGRA_FIND_PACKAGE(HDF5)
 ENDIF()
 
-FIND_PACKAGE(Doxygen)
-FIND_PACKAGE(PythonInterp)
+IF(ENABLE_DOC)
+	FIND_PACKAGE(Doxygen)
+	FIND_PACKAGE(PythonInterp)
+ENDIF()
 
 IF(WITH_VIGRANUMPY)
     FIND_PACKAGE( VIGRANUMPY_DEPENDENCIES )
@@ -267,10 +283,4 @@
   MESSAGE( STATUS "  vigranumpy will NOT be installed" )
 ENDIF()
 
-IF(NOT TIFF_FOUND OR NOT JPEG_FOUND OR NOT PNG_FOUND OR NOT FFTW3_FOUND OR
-   NOT HDF5_FOUND OR NOT VIGRANUMPY_DEPENDENCIES_FOUND)
-  MESSAGE( STATUS "" )
-  MESSAGE( STATUS "Consider setting DEPENDENCY_SEARCH_PREFIX to find missing libraries" )
-ENDIF()
-
 MESSAGE( STATUS "---------------------------------------------------------" )