From b86e22f9423a3ee90e1be91b9a840f395da4e455 Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sun, 4 Jun 2006 06:56:19 +0000
Subject: [PATCH] Merge from trunk

[SVN r34160]
---
 src/tools/python.jam | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/tools/python.jam b/src/tools/python.jam
index e6d016a8d..3fcd6b446 100644
--- a/src/tools/python.jam
+++ b/src/tools/python.jam
@@ -527,6 +527,12 @@ generators.register-standard testing.expect-success
 
 rule capture-output ( target : sources * : properties * )
 {
+    # Setup up proper DLL search path.
+    # Here, $(sources[1]) is python module and $(sources[2]) is
+    # DLL. Only $(sources[1]) is passed to testing.capture-output,
+    # so RUN_PATH variable on $(sources[2]) is not consulted. Move it
+    # over explicitly.
+    RUN_PATH on $(sources[1]) = [ on $(sources[2]) return $(RUN_PATH) ] ;
     PYTHONPATH = [ on $(sources[2]) return $(LOCATE) ] ;
     testing.capture-output $(target) : $(sources[1]) : $(properties) ;
     local c = [ common.prepend-path-variable-command PYTHONPATH : $(PYTHONPATH) ] ;