# 
# patch "ChangeLog"
#  from [48fc40b552cdc1e599fb6f82e8a7768cb9dfc907]
#    to [97b5cc1cd32b26ecc253fc7545ae707c7e166668]
# 
# patch "Makefile.am"
#  from [980eb46334683e331a2900489ac734720f9d76b4]
#    to [3dbc9762de07d32c70441ccfb482d0206231fcf9]
# 
# patch "configure.ac"
#  from [9b7ddc124121f791e31cc7ac8fa603a02b590547]
#    to [1d0b3138e1d0675690d6985d7efc105a1079bbd3]
# 
========================================================================
--- ChangeLog	48fc40b552cdc1e599fb6f82e8a7768cb9dfc907
+++ ChangeLog	97b5cc1cd32b26ecc253fc7545ae707c7e166668
@@ -1,3 +1,10 @@
+2005-10-16  Matthew Gregan  <address@hidden>
+
+	* configure.ac: Don't add boost_unit_test_framework to global
+	LIBS, we will link against it directly when needed.
+	* Makefile.am: Only allow unit_tests to be built if
+	boost_unit_test_framework was available at configure time.
+
 2005-10-15  Matthew Gregan  <address@hidden>
 
 	* configure.ac: Use boost_filesystem as the library to test for
========================================================================
--- Makefile.am	980eb46334683e331a2900489ac734720f9d76b4
+++ Makefile.am	3dbc9762de07d32c70441ccfb482d0206231fcf9
@@ -389,7 +389,11 @@
 
 # testsuite stuff (could this possibly be more ugly?)
 
+if BUILD_UNIT_TESTS
 TESTS = unit_tests $(srcdir)/testsuite
+else
+TESTS = $(srcdir)/testsuite
+endif
 
 TESTS_ENVIRONMENT=AUTOTEST_PATH="."
 
========================================================================
--- configure.ac	9b7ddc124121f791e31cc7ac8fa603a02b590547
+++ configure.ac	1d0b3138e1d0675690d6985d7efc105a1079bbd3
@@ -180,9 +180,11 @@
 test_suite * init_unit_test_suite(int argc, char * argv[]) 
 { return NULL; }
 ]])],
- [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([yes])
+  AM_CONDITIONAL(BUILD_UNIT_TESTS, true)],
  [AC_MSG_RESULT([no])
-  LIBS=$OLD_LIBS])
+  AM_CONDITIONAL(BUILD_UNIT_TESTS, false)])
+LIBS=$OLD_LIBS
 
 LIBS="-lboost_date_time${BOOST_SUFFIX} $LIBS"
 AC_MSG_CHECKING(for the libboost_date_time${BOOST_SUFFIX} library)