From 04ced730be238febc979995c98a5540ee40d8d16 Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 8 Jan 2003 19:38:27 +0000
Subject: [PATCH] bug fix

[SVN r16799]
---
 new/property.jam      | 12 +++++++++++-
 v2/build/property.jam | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/new/property.jam b/new/property.jam
index a9f8af3b3..39322f6ee 100644
--- a/new/property.jam
+++ b/new/property.jam
@@ -296,9 +296,14 @@ rule take ( attributes + : properties * : feature-space ? )
 rule select ( features * : properties * )
 {
     local result ;
+    
+    # add any missing angle brackets
+    local empty = "" ;
+    features = $(empty:G=$(features)) ;
+    
     for local p in $(properties)
     {
-        if $(p:G) = <$(features)> 
+        if $(p:G) in $(features)
         {
             result += $(p) ;
         }
@@ -461,6 +466,11 @@ local rule __test__ ( )
     assert.result <include>a 
         : select include : <include>a <toolset>gcc ;
 
+    assert.result <include>a 
+        : select include bar : <include>a <toolset>gcc ;
+
+    assert.result <include>a <toolset>gcc
+        : select include <bar> <toolset> : <include>a <toolset>gcc ;
 
     pm = [ new property-map ] ;
     $(pm).insert <toolset>gcc : o ;
diff --git a/v2/build/property.jam b/v2/build/property.jam
index a9f8af3b3..39322f6ee 100644
--- a/v2/build/property.jam
+++ b/v2/build/property.jam
@@ -296,9 +296,14 @@ rule take ( attributes + : properties * : feature-space ? )
 rule select ( features * : properties * )
 {
     local result ;
+    
+    # add any missing angle brackets
+    local empty = "" ;
+    features = $(empty:G=$(features)) ;
+    
     for local p in $(properties)
     {
-        if $(p:G) = <$(features)> 
+        if $(p:G) in $(features)
         {
             result += $(p) ;
         }
@@ -461,6 +466,11 @@ local rule __test__ ( )
     assert.result <include>a 
         : select include : <include>a <toolset>gcc ;
 
+    assert.result <include>a 
+        : select include bar : <include>a <toolset>gcc ;
+
+    assert.result <include>a <toolset>gcc
+        : select include <bar> <toolset> : <include>a <toolset>gcc ;
 
     pm = [ new property-map ] ;
     $(pm).insert <toolset>gcc : o ;