--- /home/wollny/Desktop/5057-FindBoost.cmake	2007-06-06 16:29:44.000000000 +0200
+++ BoostXConfig.cmake	2007-06-06 16:51:27.000000000 +0200
@@ -182,6 +182,7 @@
   signals
   test
   thread
+  unit_test_framework    
   wave
 )
 
@@ -191,12 +192,15 @@
   # User can specify a particular build variant via the variables:
   #   Boost_LIB_PREFIX, Boost_LIB_SUFFIX, Boost_LIB_SUFFIX_DEBUG
   # otherwise we'll search the BOOST_SUFFIX_SEARCH list
-  SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX})
-  IF(NOT Boost_LIB_SUFFIX)
+
+  IF (Boost_LIB_SUFFIX)
+    SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name}-${Boost_LIB_SUFFIX})
+  ELSE (Boost_LIB_SUFFIX)
+    SET(BOOST_LIB_NAMES ${Boost_LIB_PREFIX}boost_${name})
     FOREACH(suffix ${BOOST_SUFFIX_SEARCH})
       SET(BOOST_LIB_NAMES ${BOOST_LIB_NAMES} ${Boost_LIB_PREFIX}boost_${name}-${suffix})
     ENDFOREACH(suffix)
-  ENDIF(NOT Boost_LIB_SUFFIX)
+  ENDIF(Boost_LIB_SUFFIX)
 
   # Find the library in the Boost_LIBRARY_DIRS
   FIND_LIBRARY(Boost_${name}_LIBRARY