# 
# patch "ChangeLog"
#  from [9073b34996c7e5c3f5ba190e8ed1f6dd61b01bd5]
#    to [48fc40b552cdc1e599fb6f82e8a7768cb9dfc907]
# 
# patch "configure.ac"
#  from [ffbe2607f289d15629f1b168438a3ee1b98d3771]
#    to [9b7ddc124121f791e31cc7ac8fa603a02b590547]
# 
========================================================================
--- ChangeLog	9073b34996c7e5c3f5ba190e8ed1f6dd61b01bd5
+++ ChangeLog	48fc40b552cdc1e599fb6f82e8a7768cb9dfc907
@@ -1,3 +1,9 @@
+2005-10-15  Matthew Gregan  <address@hidden>
+
+	* configure.ac: Use boost_filesystem as the library to test for
+	when trying to guess a suitable BOOST_SUFFIX.  Make a missing
+	boost_unit_test_framework library a non-fatal error.
+
 2005-10-14  Emile Snyder  <address@hidden>
 
 	* commands.cc: Fix breakage I introduced with the --unknown flag.
========================================================================
--- configure.ac	ffbe2607f289d15629f1b168438a3ee1b98d3771
+++ configure.ac	9b7ddc124121f791e31cc7ac8fa603a02b590547
@@ -149,39 +149,40 @@
 # Now check for Boost libraries proper.
 
 found=no
-suffixes=${BOOST_SUFFIX:-"none -gcc -mipspro -mt -sunpro -sw -mgw"}
+suffixes=${BOOST_SUFFIX:-"none -gcc -mipspro -mt -sunpro -sw -mgw -gcc-mt-s"}
 for BOOST_SUFFIX in ${suffixes}
 do
     test "x${BOOST_SUFFIX}" = "xnone" && BOOST_SUFFIX=
-    LIBS="-lboost_unit_test_framework${BOOST_SUFFIX} $OLD_LIBS"
-    AC_MSG_CHECKING(for the libboost_unit_test_framework${BOOST_SUFFIX} library)
-    AC_LINK_IFELSE([AC_LANG_SOURCE([[
-#include <boost/test/unit_test_suite.hpp>
-#include <boost/test/test_tools.hpp>
-using boost::unit_test_framework::test_suite;
-test_suite * init_unit_test_suite(int argc, char * argv[]) 
-{ return NULL; }
-]])],
+    LIBS="-lboost_filesystem${BOOST_SUFFIX} $OLD_LIBS"
+    AC_MSG_CHECKING(for the libboost_filesystem${BOOST_SUFFIX} library)
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+      #include <boost/filesystem/path.hpp>
+      #include <boost/filesystem/operations.hpp>
+      using namespace boost::filesystem;
+    ]],
+    [[exists(path("/boot"));]])],
      [AC_MSG_RESULT([yes])
       found=yes],
      [AC_MSG_RESULT([no])])
-    LIBS=$OLD_LIBS
     test "x${found}" = "xyes" && break
 done
 if test "x${found}" = "xno"; then
-    AC_MSG_FAILURE([libboost_unit_test_framework failure])
+    AC_MSG_FAILURE([libboost_filesystem failure])
 fi
 
-LIBS="-lboost_filesystem${BOOST_SUFFIX} $LIBS"
-AC_MSG_CHECKING(for the libboost_filesystem${BOOST_SUFFIX} library)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-  #include <boost/filesystem/path.hpp>
-  #include <boost/filesystem/operations.hpp>
-  using namespace boost::filesystem;
-]],
-[[exists(path("/boot"));]])],
+OLD_LIBS=$LIBS
+LIBS="-lboost_unit_test_framework${BOOST_SUFFIX} $LIBS"
+AC_MSG_CHECKING(for the libboost_unit_test_framework${BOOST_SUFFIX} library)
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
+#include <boost/test/unit_test_suite.hpp>
+#include <boost/test/test_tools.hpp>
+using boost::unit_test_framework::test_suite;
+test_suite * init_unit_test_suite(int argc, char * argv[]) 
+{ return NULL; }
+]])],
  [AC_MSG_RESULT([yes])],
- [AC_MSG_FAILURE([libboost_filesystem failure])])
+ [AC_MSG_RESULT([no])
+  LIBS=$OLD_LIBS])
 
 LIBS="-lboost_date_time${BOOST_SUFFIX} $LIBS"
 AC_MSG_CHECKING(for the libboost_date_time${BOOST_SUFFIX} library)