Library path for xmlrpc-c given via --with-xmlprc-c was not included in the compile requirements.

2 files changed, 13 insertions, 6 deletions

diff --git a/Jamroot b/Jamroot
index b0d67f8c9..8d56d5bf0 100644
--- a/Jamroot
+++ b/Jamroot
@@ -83,21 +83,28 @@ include $(TOP)/jam-files/server.jam ;
 
 if [ build_server ] != no 
 {
-  echo "XMLRPC-C: BUILDING MOSES WITH XMLRPC_C LIBRARY VERSION $(xmlrpc-c-version)" ;
+  xmlrpc-c-prefix = [ shell_or_die "$(xmlrpc-c-config-cmd) c++2 abyss-server --prefix" ] ;
+  echo "XMLRPC-C: BUILDING MOSES WITH XMLRPC_C LIBRARY VERSION $(xmlrpc-c-version) FROM $(xmlrpc-c-prefix)" ;
 
   xmlrpc-cxxflags = [ shell_or_die "$(xmlrpc-c-config-cmd) c++2 abyss-server --cflags" ] ;
   requirements += <define>HAVE_XMLRPC_C ;
   requirements += <cxxflags>$(xmlrpc-cxxflags) ;
+
   xmlrpc-linkflags = [ shell_or_die "$(xmlrpc-c-config-cmd) c++2 abyss-server --libs" ] ;
   for local i in [ SPLIT_BY_CHARACTERS $(xmlrpc-linkflags) : " " ] 
   { 
-    libname = [ MATCH "-l(xmlrpc.*)" : $(i) ] ; 
+    local libname = [ MATCH "-l(xmlrpc.*)" : $(i) ] ; 
     if $(libname) 
     {   
       external-lib $(libname) 
       : : <runtime-link>static:<link>static <runtime-link>shared:<link>shared ;
       requirements += <library>$(libname) ;
     }
+    local pathname = [ MATCH "-L(.*)" : $(i) ] ; 
+    if $(pathname)
+    {
+      requirements += <library-path>$(pathname) ; 
+    }
   } 
 }
 # echo $(requirements) ; 
diff --git a/moses/Jamfile b/moses/Jamfile
index 6d9e691db..822645505 100644
--- a/moses/Jamfile
+++ b/moses/Jamfile
@@ -58,8 +58,8 @@ obj FF_Factory.o : FF/Factory.cpp LM//macros headers ../lm//kenlm mmlib : <depen
 # if yes, include server capabilities in the moses executable
 # include $(TOP)/jam-files/server.jam ;
 
-xmlrpc-c-config-cmd = [ build_server ] ;
-if $(xmlrpc-c-config-cmd) = no  
+xmlrpc-c-config = [ build_server ] ;
+if $(xmlrpc-c-config) = no  
 {
   echo "NOT BUILDING MOSES SERVER!" ;
   alias mserver ;
@@ -67,8 +67,8 @@ if $(xmlrpc-c-config-cmd) = no
 }
 else 
 {
-  xmlprc-version  = [ shell_or_die "$(xmlrpc-c-config-cmd) --version" ] ;
-  xmlprc-linkflags = [ shell_or_die "$(xmlrpc-c-config-cmd) --version" ] ;
+  xmlprc-version  = [ shell_or_die "$(xmlrpc-c-config) --version" ] ;
+  # xmlprc-linkflags = [ shell_or_die "$(xmlrpc-c-config) --version" ] ;
   echo "building moses server with xmlrpc-c version $(xmlrpc-c-version)" ;
   alias mserver : [ glob server/*.cpp ] ;
 }