From 0116c1941b514c3d0537a13af526bd8319c57ede Mon Sep 17 00:00:00 2001
From: Neil Jerram <neil@ossau.uklinux.net>
Date: Wed, 30 Jan 2008 22:55:28 +0000
Subject: [PATCH] (dyld_prefix), pre-inst-guile-env.in (dyld_prefix): Construct
 and export dyld_prefix in a similar way to ltdl_prefix, to allow pre-install
 dynamic linking to work on MacOS.  Thanks to Roger Mc Murtrie for reporting
 this problem.

---
 ChangeLog             | 7 +++++++
 THANKS                | 1 +
 pre-inst-guile-env.in | 4 ++++
 pre-inst-guile.in     | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 89e660734..3aa65ef2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-30  Neil Jerram  <neil@ossau.uklinux.net>
+
+	* pre-inst-guile.in (dyld_prefix), pre-inst-guile-env.in
+	(dyld_prefix): Construct and export dyld_prefix in a similar way
+	to ltdl_prefix, to allow pre-install dynamic linking to work on
+	MacOS.  Thanks to Roger Mc Murtrie for reporting this problem.
+
 2008-01-22  Neil Jerram  <neil@ossau.uklinux.net>
 
 	* README: Should say version 1.8.3, not 1.8.2.
diff --git a/THANKS b/THANKS
index 66bd6fc5c..c70c0f2ca 100644
--- a/THANKS
+++ b/THANKS
@@ -55,6 +55,7 @@ For fixes or providing information which led to a fix:
 	  Marco Maggi
         Gregory Marton
             Dan McMahill
+          Roger Mc Murtrie
         Han-Wen Nienhuys
             Jan Nieuwenhuizen
          Hrvoje Nikšić
diff --git a/pre-inst-guile-env.in b/pre-inst-guile-env.in
index e15290605..f4d84d902 100644
--- a/pre-inst-guile-env.in
+++ b/pre-inst-guile-env.in
@@ -63,11 +63,15 @@ export GUILE_LOAD_PATH
 
 # handle LTDL_LIBRARY_PATH (no clobber)
 ltdl_prefix=""
+dyld_prefix=""
 for dir in $subdirs_with_ltlibs ; do
     ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}"
+    dyld_prefix="${top_builddir}/${dir}/.libs:${dyld_prefix}"
 done
 LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
 export LTDL_LIBRARY_PATH
+DYLD_LIBRARY_PATH="${dyld_prefix}${top_builddir}/libguile/.libs:$DYLD_LIBRARY_PATH"
+export DYLD_LIBRARY_PATH
 
 # handle PATH (no clobber)
 PATH="${top_builddir}/guile-config:${PATH}"
diff --git a/pre-inst-guile.in b/pre-inst-guile.in
index ea8e4b1b4..1a364528d 100644
--- a/pre-inst-guile.in
+++ b/pre-inst-guile.in
@@ -76,11 +76,15 @@ export GUILE_LOAD_PATH
 
 # handle LTDL_LIBRARY_PATH (no clobber)
 ltdl_prefix=""
+dyld_prefix=""
 for dir in $subdirs_with_ltlibs ; do
     ltdl_prefix="${top_builddir}/${dir}:${ltdl_prefix}"
+    dyld_prefix="${top_builddir}/${dir}/.libs:${dyld_prefix}"
 done
 LTDL_LIBRARY_PATH="${ltdl_prefix}$LTDL_LIBRARY_PATH"
 export LTDL_LIBRARY_PATH
+DYLD_LIBRARY_PATH="${dyld_prefix}${top_builddir}/libguile/.libs:$DYLD_LIBRARY_PATH"
+export DYLD_LIBRARY_PATH
 
 # set GUILE (clobber)
 GUILE=${top_builddir}/libguile/guile