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

From: grafikrobot_at_[hidden]
Date: 2007-11-23 21:16:50

Author: grafik
Date: 2007-11-23 21:16:50 EST (Fri, 23 Nov 2007)
New Revision: 41324
URL: http://svn.boost.org/trac/boost/changeset/41324

Log:
Allow use of "conditional" to multiply a condition that already has the full condition in it.
Text files modified: 
   trunk/tools/build/v2/build/project.jam |    10 +++++++++-                              
   1 files changed, 9 insertions(+), 1 deletions(-)

Modified: trunk/tools/build/v2/build/project.jam
==============================================================================
--- trunk/tools/build/v2/build/project.jam	(original)
+++ trunk/tools/build/v2/build/project.jam	2007-11-23 21:16:50 EST (Fri, 23 Nov 2007)
@@ -1007,7 +1007,15 @@
     #
     rule conditional ( condition + : requirements * )
     {
-        return $(condition:J=,):$(requirements) ;
+        local condition = $(condition:J=,) ;
+        if [ MATCH (:) : $(condition) ]
+        {
+            return $(condition)$(requirements) ;
+        }
+        else
+        {
+            return $(condition):$(requirements) ;
+        }
     }
 }