From b52c0745ac059ecb5120aea10b4d97600df7adae Mon Sep 17 00:00:00 2001
From: Dave Abrahams <dave@boostpro.com>
Date: Wed, 2 Jan 2002 20:57:57 +0000
Subject: [PATCH] account for gRUN_LD_LIBRARY_PATH

[SVN r12203]
---
 python.jam    | 12 ++++++++++++
 v1/python.jam | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/python.jam b/python.jam
index f27262951..9602d711f 100644
--- a/python.jam
+++ b/python.jam
@@ -219,6 +219,10 @@ rule Link-PYD
     }
     
     gRUN_PATH($(<)) += $(gLOCATE($(<[1]))) ;
+    if $(UNIX) 
+    {
+        gRUN_LD_LIBRARY_PATH($(<)) += $(gLOCATE($(<[1]))) ;
+    }
     Link-action $(<) : $(>) : PYD ;
 }
 
@@ -287,6 +291,8 @@ actions python-test-target bind PYTHON
 {
     $(SHELL_SET)PATH=$(PATH)
     $(SHELL_EXPORT)PATH
+    $(SHELL_SET)LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
+    $(SHELL_EXPORT)LD_LIBRARY_PATH
     $(SHELL_SET)PYTHONPATH=$(PYTHONPATH)
     $(SHELL_EXPORT)PYTHONPATH
     $(PYTHON_LAUNCH) $(PYTHON) $(PYTHON_ARGS) "$(>)" $(ARGS) > "$(<)"
@@ -305,6 +311,8 @@ actions python-runtest-target bind PYTHON
 {
     $(SHELL_SET)PATH=$(PATH)
     $(SHELL_EXPORT)PATH
+    $(SHELL_SET)LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
+    $(SHELL_EXPORT)LD_LIBRARY_PATH
     $(SHELL_SET)PYTHONPATH=$(PYTHONPATH)
     $(SHELL_EXPORT)PYTHONPATH
     $(PYTHON_LAUNCH) $(PYTHON) $(PYTHON_ARGS) "$(>)" $(ARGS)
@@ -380,6 +388,10 @@ rule python-runtest-aux ( target : sources + )
         $(PATH)                                 # base PATH from environment
         : $(SPLITPATH) ] ;                      # platform path separator
 
+    LD_LIBRARY_PATH on $(target) = [ join
+        $(gRUN_LD_LIBRARY_PATH($(target)))      # location of module dependencies
+        : $(SPLITPATH) ] ;                      # platform path separator
+
     PYTHON on $(target) = $(python) ;
     DEPENDS $(target) : $(python) ;
 }
diff --git a/v1/python.jam b/v1/python.jam
index f27262951..9602d711f 100644
--- a/v1/python.jam
+++ b/v1/python.jam
@@ -219,6 +219,10 @@ rule Link-PYD
     }
     
     gRUN_PATH($(<)) += $(gLOCATE($(<[1]))) ;
+    if $(UNIX) 
+    {
+        gRUN_LD_LIBRARY_PATH($(<)) += $(gLOCATE($(<[1]))) ;
+    }
     Link-action $(<) : $(>) : PYD ;
 }
 
@@ -287,6 +291,8 @@ actions python-test-target bind PYTHON
 {
     $(SHELL_SET)PATH=$(PATH)
     $(SHELL_EXPORT)PATH
+    $(SHELL_SET)LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
+    $(SHELL_EXPORT)LD_LIBRARY_PATH
     $(SHELL_SET)PYTHONPATH=$(PYTHONPATH)
     $(SHELL_EXPORT)PYTHONPATH
     $(PYTHON_LAUNCH) $(PYTHON) $(PYTHON_ARGS) "$(>)" $(ARGS) > "$(<)"
@@ -305,6 +311,8 @@ actions python-runtest-target bind PYTHON
 {
     $(SHELL_SET)PATH=$(PATH)
     $(SHELL_EXPORT)PATH
+    $(SHELL_SET)LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)
+    $(SHELL_EXPORT)LD_LIBRARY_PATH
     $(SHELL_SET)PYTHONPATH=$(PYTHONPATH)
     $(SHELL_EXPORT)PYTHONPATH
     $(PYTHON_LAUNCH) $(PYTHON) $(PYTHON_ARGS) "$(>)" $(ARGS)
@@ -380,6 +388,10 @@ rule python-runtest-aux ( target : sources + )
         $(PATH)                                 # base PATH from environment
         : $(SPLITPATH) ] ;                      # platform path separator
 
+    LD_LIBRARY_PATH on $(target) = [ join
+        $(gRUN_LD_LIBRARY_PATH($(target)))      # location of module dependencies
+        : $(SPLITPATH) ] ;                      # platform path separator
+
     PYTHON on $(target) = $(python) ;
     DEPENDS $(target) : $(python) ;
 }