From 2ca3db90bd0a2e9a8619d2ebec7c6ac723838aca Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Tue, 11 Sep 2012 14:49:58 +0100
Subject: Minor build fixes

---
 Jamroot          | 4 ++--
 klm/util/have.hh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jamroot b/Jamroot
index ef426146..738b83e3 100644
--- a/Jamroot
+++ b/Jamroot
@@ -26,7 +26,7 @@ if [ test_header boost/serialization/map.hpp ] && [ test_library boost_serializa
   requirements += <define>HAVE_BOOST_ARCHIVE_TEXT_OARCHIVE_HPP ;
 }
 
-project : requirements $(requirements) <toolset>darwin:<link>static ;
+project : requirements $(requirements) <toolset>darwin:<link>static <library>boost_system ;
 project : default-build <warnings>on <variant>release ;
 
 install-bin-libs dpmert//programs utils//programs mteval//programs klm/lm//programs training//liblbfgs decoder//cdec phrasinator//programs mira//kbest_mira ;
@@ -40,6 +40,6 @@ rule all_tests ( targets * : dependencies : properties * ) {
   targets ?= [ glob *_test.cc ] ;
   for t in $(targets) {
     local base = [ MATCH "^(.*).cc$" : $(t) ] ;
-    unit-test $(base) : $(t) $(dependencies) ..//boost_unit_test_framework : $(properties) ;
+    unit-test $(base) : $(t) $(dependencies) /top//boost_unit_test_framework : $(properties) ;
   }
 }
diff --git a/klm/util/have.hh b/klm/util/have.hh
index 1d76a7fc..b8181e99 100644
--- a/klm/util/have.hh
+++ b/klm/util/have.hh
@@ -13,7 +13,7 @@
 #endif
 
 #ifndef HAVE_BOOST
-//#define HAVE_BOOST
+#define HAVE_BOOST
 #endif
 
 #ifndef HAVE_THREADS
-- 
cgit v1.2.3