# # # patch "ChangeLog" # from [47b5d7333b6ffe6da62f35f8d3379180cb84b3ba] # to [fc05b6d4a42bca4a1016b3ac37cbe0455c9ddd13] # # patch "Makefile.am" # from [972e73fe785c811d92a0694c1c980e9d60fa3259] # to [f8f60ee0c94da567d51a59fdadabf61979f3ea27] # ============================================================ --- ChangeLog 47b5d7333b6ffe6da62f35f8d3379180cb84b3ba +++ ChangeLog fc05b6d4a42bca4a1016b3ac37cbe0455c9ddd13 @@ -1,3 +1,7 @@ +2006-06-17 Graydon Hoare + + * Makefile.am: Permit building 'tester' with static boost. + 2006-06-17 Timothy Brownawell * cmd.hh, commands.cc: Modify how command parameters description ============================================================ --- Makefile.am 972e73fe785c811d92a0694c1c980e9d60fa3259 +++ Makefile.am f8f60ee0c94da567d51a59fdadabf61979f3ea27 @@ -319,7 +319,7 @@ mtn_LDADD = lib3rdparty.a $(BOOSTLIBS) unit_tests_LDADD = lib3rdparty.a $(BOOSTLIBS) \ @BOOST_LIBDIR@/libboost_unit_test_framework$(BOOST_SUFFIX).a - tester_LDADD = lib3rdparty.a + tester_LDADD = lib3rdparty.a $(BOOSTLIBS) else mtn_LDADD = lib3rdparty.a unit_tests_LDADD = lib3rdparty.a -lboost_unit_test_framework$(BOOST_SUFFIX)