From ac3011136c455db79fcc06707908ce729195d510 Mon Sep 17 00:00:00 2001
From: Kenneth Heafield <github@kheafield.com>
Date: Thu, 13 Sep 2012 06:36:28 -0700
Subject: Fix compilation with static

---
 dpmert/Jamfile       | 4 ++--
 jam-files/sanity.jam | 2 +-
 mira/Jamfile         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dpmert/Jamfile b/dpmert/Jamfile
index 647caac8..6f6a3d40 100644
--- a/dpmert/Jamfile
+++ b/dpmert/Jamfile
@@ -9,14 +9,14 @@ lib dpmert :
   mert_geometry.cc
   ..//utils
   ..//mteval
-  ..//decoder
+  ../decoder//decoder
   ../klm/lm//kenlm
   ..//boost_program_options
   : <include>.
   : :
   <library>..//utils
   <library>..//mteval
-  <library>..//decoder
+  <library>../decoder//decoder
   <library>../klm/lm//kenlm
   <library>..//boost_program_options
   <include>.
diff --git a/jam-files/sanity.jam b/jam-files/sanity.jam
index 086f20ae..738316f8 100644
--- a/jam-files/sanity.jam
+++ b/jam-files/sanity.jam
@@ -63,7 +63,7 @@ requirements = ;
 
 FORCE-STATIC = [ option.get "static" : : "yes" ] ;
 if $(FORCE-STATIC) {
-  requirements += <runtime-link>static ;
+  requirements += <link>static <runtime-link>static ;
 }
 
 #Determine if a library can be compiled statically.  
diff --git a/mira/Jamfile b/mira/Jamfile
index 8825b887..a483e57d 100644
--- a/mira/Jamfile
+++ b/mira/Jamfile
@@ -1 +1 @@
-exe kbest_mira : kbest_mira.cc ..//decoder ;
+exe kbest_mira : kbest_mira.cc ../decoder//decoder ;
-- 
cgit v1.2.3