From 24786762a8ea07df683a990905456f55aaef3881 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Tue, 11 Mar 2003 15:26:10 +0000
Subject: [PATCH] Bugfix.

* new/feature.jam
    (expand-subfeatures): Don't try expanding subfeatures in subfeatures.


[SVN r17815]
---
 new/feature.jam      | 10 +++++++++-
 v2/build/feature.jam | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/new/feature.jam b/new/feature.jam
index c6cf1b177..3f439a1af 100644
--- a/new/feature.jam
+++ b/new/feature.jam
@@ -300,7 +300,15 @@ rule expand-subfeatures (
     local result ;
     for local p in $(properties)
     {
-        result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
+        # Don't expand subfeatures in subfeatures
+        if ! [ MATCH "(:)" : $(p:G) ]
+        {            
+            result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
+        }
+        else
+        {
+            result += $(p) ;
+        }        
     }
     return $(result) ;
 }
diff --git a/v2/build/feature.jam b/v2/build/feature.jam
index c6cf1b177..3f439a1af 100644
--- a/v2/build/feature.jam
+++ b/v2/build/feature.jam
@@ -300,7 +300,15 @@ rule expand-subfeatures (
     local result ;
     for local p in $(properties)
     {
-        result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
+        # Don't expand subfeatures in subfeatures
+        if ! [ MATCH "(:)" : $(p:G) ]
+        {            
+            result += [ expand-subfeatures-aux $(p:G) : $(p:G=) ] ;
+        }
+        else
+        {
+            result += $(p) ;
+        }        
     }
     return $(result) ;
 }