--- hugin-2011.0.0+dfsg~beta2.orig/CMakeLists.txt
+++ hugin-2011.0.0+dfsg~beta2/CMakeLists.txt
@@ -269,6 +269,14 @@ IF(WIN32)
   ENDIF()
 ENDIF(WIN32)
 
+FIND_PACKAGE(Tclap)
+if(TCLAP_FOUND)
+  MESSAGE(STATUS "Using external tclap (${TCLAP_VERSION}).")
+else(TCLAP_FOUND)
+  MESSAGE(STATUS "Using included copy of tclap.")
+  set(TCLAP_INCLUDEDIR ${CMAKE_SOURCE_DIR}/src/foreign/tclap)
+endif(TCLAP_FOUND)
+
 ##
 ## LAPACK (optional, enable by -DENABLE_LAPACK=ON)
 ##
--- hugin-2011.0.0+dfsg~beta2.orig/src/hugin_cpfind/CMakeLists.txt
+++ hugin-2011.0.0+dfsg~beta2/src/hugin_cpfind/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/tclap )
+include_directories( ${TCLAP_INCLUDEDIR} )
 include_directories( ${CMAKE_SOURCE_DIR}/src/foreign/zthread/include )
 include_directories(.)
 
--- /dev/null
+++ hugin-2011.0.0+dfsg~beta2/CMakeModules/FindTclap.cmake
@@ -0,0 +1,6 @@
+# search for tclap Templatized C++ Command Line Parser
+# We will use the included copy otherwise.
+
+if (NOT WIN32)
+  pkg_check_modules(TCLAP tclap>=1.1)
+endif (NOT WIN32)