From 73d4d13936e241f0fa7e743ecf032cbf5f1d6779 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Fri, 16 May 2003 11:05:42 +0000
Subject: [PATCH] More changes to accomodate more strict import semantics and
 changes to feature.action.

[SVN r18416]
---
 new/builtin.jam      | 2 ++
 new/qt.jam           | 5 +++--
 v2/qt.jam            | 5 +++--
 v2/tools/builtin.jam | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/new/builtin.jam b/new/builtin.jam
index 388e09baa..ee8adffba 100644
--- a/new/builtin.jam
+++ b/new/builtin.jam
@@ -512,6 +512,8 @@ rule link-action ( targets + : sources * : action-name : properties * )
 {
     action.__init__ $(targets) : $(sources) : $(action-name) : $(properties) ;
     import path ;
+    import sequence ;
+
     
     # Find all libraries in sources, and <library> properties
     # For each source/property-value, which is instance of searched-lib-target,
diff --git a/new/qt.jam b/new/qt.jam
index 557564e7d..bf1310784 100644
--- a/new/qt.jam
+++ b/new/qt.jam
@@ -8,6 +8,7 @@ import feature ;
 import errors ;
 import type ;
 import class : class new ;
+import generators ;
 
 # Initialized the QT support module. The 'prefix' parameter 
 # tells where QT is installed. When not given, environmental
@@ -38,7 +39,7 @@ rule init ( prefix ? )
         .prefix = $(prefix) ;
         
         feature.extend uses : qt ;
-        feature.action <uses>qt : qt.add-properties ;            
+        feature.action <uses>qt : add-properties ;            
         
         generators.register-standard qt.moc : H : CPP(moc_%) : <uses>qt ;    
         
@@ -77,7 +78,7 @@ rule init ( prefix ? )
     }
 }
 
-rule qt.add-properties ( property : properties * )
+rule add-properties ( property : properties * )
 {
     local lib-name ;
     if <threading>multi in $(properties)
diff --git a/v2/qt.jam b/v2/qt.jam
index 557564e7d..bf1310784 100644
--- a/v2/qt.jam
+++ b/v2/qt.jam
@@ -8,6 +8,7 @@ import feature ;
 import errors ;
 import type ;
 import class : class new ;
+import generators ;
 
 # Initialized the QT support module. The 'prefix' parameter 
 # tells where QT is installed. When not given, environmental
@@ -38,7 +39,7 @@ rule init ( prefix ? )
         .prefix = $(prefix) ;
         
         feature.extend uses : qt ;
-        feature.action <uses>qt : qt.add-properties ;            
+        feature.action <uses>qt : add-properties ;            
         
         generators.register-standard qt.moc : H : CPP(moc_%) : <uses>qt ;    
         
@@ -77,7 +78,7 @@ rule init ( prefix ? )
     }
 }
 
-rule qt.add-properties ( property : properties * )
+rule add-properties ( property : properties * )
 {
     local lib-name ;
     if <threading>multi in $(properties)
diff --git a/v2/tools/builtin.jam b/v2/tools/builtin.jam
index 388e09baa..ee8adffba 100644
--- a/v2/tools/builtin.jam
+++ b/v2/tools/builtin.jam
@@ -512,6 +512,8 @@ rule link-action ( targets + : sources * : action-name : properties * )
 {
     action.__init__ $(targets) : $(sources) : $(action-name) : $(properties) ;
     import path ;
+    import sequence ;
+
     
     # Find all libraries in sources, and <library> properties
     # For each source/property-value, which is instance of searched-lib-target,