--- FindBoost.cmake.original	2007-01-10 19:02:56.296875000 +0100
+++ FindBoost.cmake	2007-04-16 12:45:52.085136500 +0200
@@ -72,7 +72,7 @@ SET(BOOST_DIR_MESSAGE "Set the Boost_INC
 SET(BOOST_DIR_SEARCH $ENV{BOOST_ROOT})
 IF(BOOST_DIR_SEARCH)
   FILE(TO_CMAKE_PATH ${BOOST_DIR_SEARCH} BOOST_DIR_SEARCH)
-  SET(BOOST_DIR_SEARCH ${BOOST_DIR_SEARCH}/include)
+  SET(BOOST_DIR_SEARCH ${BOOST_DIR_SEARCH}/include ${BOOST_DIR_SEARCH})
 ENDIF(BOOST_DIR_SEARCH)
 
 IF(WIN32)
@@ -94,7 +94,7 @@ SET(SUFFIX_FOR_PATH
 #
 # Look for an installation.
 #
-FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} PATHS
+FIND_PATH(Boost_INCLUDE_DIR NAMES boost/config.hpp PATH_SUFFIXES ${SUFFIX_FOR_PATH} "" PATHS
 
   # Look in other places.
   ${BOOST_DIR_SEARCH}
@@ -124,7 +124,7 @@ IF(Boost_INCLUDE_DIR)
   ENDIF("${Boost_LIBRARY_DIR}" MATCHES "/include$")
 
   IF(EXISTS "${Boost_LIBRARY_DIR}/lib")
-    SET (Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/lib)
+    SET(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/lib)
   ELSE(EXISTS "${Boost_LIBRARY_DIR}/lib")
     IF(EXISTS "${Boost_LIBRARY_DIR}/stage/lib")
       SET(Boost_LIBRARY_DIR ${Boost_LIBRARY_DIR}/stage/lib)