--- FindBoost_doug.cmake	2008-04-09 11:46:17.000000000 +0200
+++ FindBoost_win32_changes.cmake	2008-04-09 11:51:11.000000000 +0200
@@ -209,7 +209,7 @@
 
   SET(_boost_INCLUDE_SEARCH_DIRS
     C:/boost/include
-    "C:/Program Files/boost/boost_${Boost_MINIMUM_VERSION}"
+    "C:/Program Files/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}"
     # D: is very often the cdrom drive, IF you don't have a
     # cdrom inserted it will popup a very annoying dialog
     #D:/boost/include
@@ -218,7 +218,7 @@
 
   SET(_boost_LIBRARIES_SEARCH_DIRS
     C:/boost/lib
-    "C:/Program Files/boost/boost_${Boost_MINIMUM_VERSION}/lib"
+    "C:/Program Files/boost/boost_${Boost_FIND_VERSION_MAJOR}_${Boost_FIND_VERSION_MINOR}_${Boost_FIND_VERSION_PATCH}/lib"
     /sw/local/lib
   )
 
@@ -236,16 +236,20 @@
   ENDIF( NOT $ENV{BOOST_LIBRARYDIR} STREQUAL "" )
 
   IF( BOOST_ROOT )
-    SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT}/include ${_boost_INCLUDE_SEARCH_DIRS})
+    IF( WIN32 )
+      SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT} ${_boost_INCLUDE_SEARCH_DIRS})
+    ELSE( WIN32 )
+      SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_ROOT}/include ${_boost_INCLUDE_SEARCH_DIRS})
+    ENDIF( WIN32 )
     SET(_boost_LIBRARIES_SEARCH_DIRS ${BOOST_ROOT}/lib ${_boost_LIBRARIES_SEARCH_DIRS})
   ENDIF( BOOST_ROOT )
 
   IF( BOOST_INCLUDEDIR )
-    SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_INCLUDEDIR}/include ${_boost_INCLUDE_SEARCH_DIRS})
+    SET(_boost_INCLUDE_SEARCH_DIRS ${BOOST_INCLUDEDIR} ${_boost_INCLUDE_SEARCH_DIRS})
   ENDIF( BOOST_INCLUDEDIR )
 
   IF( BOOST_LIBRARYDIR )
-    SET(_boost_LIBRARIES_SEARCH_DIRS ${BOOST_LIBRARYDIR}/include ${_boost_LIBRARIES_SEARCH_DIRS})
+    SET(_boost_LIBRARIES_SEARCH_DIRS ${BOOST_LIBRARYDIR} ${_boost_LIBRARIES_SEARCH_DIRS})
   ENDIF( BOOST_LIBRARYDIR )
 
   #Try first in our own include search paths (e.g. BOOST_ROOT)
@@ -325,9 +329,9 @@
 
   #Setting some more suffixes for the library
   SET (Boost_LIB_PREFIX "")
-  IF ( WIN32 )
+  IF ( WIN32 AND Boost_USE_STATIC_LIBS )
     SET (Boost_LIB_PREFIX "lib")
-  ENDIF ( WIN32 )
+  ENDIF ( WIN32 AND Boost_USE_STATIC_LIBS )
   SET (_boost_COMPILER "-gcc")
   IF (MSVC71)
     SET (_boost_COMPILER "-vc71")
@@ -373,7 +377,9 @@
   SET( _boost_STATIC_TAG "")
   IF (WIN32)
     SET (_boost_ABI_TAG "g")
-    SET( _boost_STATIC_TAG "-s")
+    IF( Boost_USE_STATIC_LIBS )
+      SET( _boost_STATIC_TAG "-s")
+    ENDIF( Boost_USE_STATIC_LIBS )
   ENDIF(WIN32)
   SET (_boost_ABI_TAG "${_boost_ABI_TAG}d")