(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.

diff --git a/ChangeLog b/ChangeLog
index 89e660734756106692897b22313c34428516d47b..3aa65ef2fda42003a79c4f0524ee59fa831c2e02 100644 (file)
--- 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 66bd6fc5c5996e8a1b1d64fbeb930ae2656718f6..c70c0f2ca64e71f4009066fb17885510a5b40a57 100644 (file)
--- 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 e152906050aa4a7d35d43c3ef1c8b940282632b5..f4d84d902d331e0fb5e2ab87d71a54c0cb9c4179 100644 (file)
--- 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 ea8e4b1b4dda5c9a878dc2460f6bdb7542adb317..1a364528dc2b2a654e72c19479004fc5daa8a024 100644 (file)
--- 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