[Boost-commit] svn:boost r43991 - trunk/tools/build/v2

From: ghost_at_[hidden]
Date: 2008-04-01 14:39:55

Author: vladimir_prus
Date: 2008-04-01 14:39:55 EDT (Tue, 01 Apr 2008)
New Revision: 43991
URL: http://svn.boost.org/trac/boost/changeset/43991

Log:
Ubreak loading of build-system.jam.

Text files modified: 
   trunk/tools/build/v2/build-system.jam |    10 ++++++++--                              
   1 files changed, 8 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/build-system.jam
==============================================================================
--- trunk/tools/build/v2/build-system.jam	(original)
+++ trunk/tools/build/v2/build-system.jam	2008-04-01 14:39:55 EDT (Tue, 01 Apr 2008)
@@ -222,6 +222,7 @@
 #
 local rule load-config ( module-name : filename : path + : must-find ? )
 {
+    .debug-config = 1 ;
     if $(.debug-config)
     {
         ECHO "notice: Searching" "$(path)" "for" "$(module-name)"
@@ -242,7 +243,7 @@
     }
     else
     {
-        if ( must-find )
+        if $(must-find)
         {
             errors.user-error "Configuration file" "$(filename)" "not found in"
                 "$(path)" "." ;
@@ -253,7 +254,7 @@
                 "$(path)" "." ;
         }
     }
-    return where ;
+    return $(where) ;
 }
 
 
@@ -301,6 +302,11 @@
 
     initialize-config-module test-config ;
     local test-config = [ MATCH ^--test-config=(.*)$ : $(.argv) ] ;
+    local uq = [ MATCH \"(.*)\" : $(test-config) ] ;
+    if $(uq)
+    {
+        test-config = $(uq) ;
+    }    
     if $(test-config)
     {
         local where =