add `compile-time-environment'

[bpt/guile.git] / pre-inst-guile-env.in

diff --git a/pre-inst-guile-env.in b/pre-inst-guile-env.in
index 2300268..f9dd601 100644 (file)
--- a/pre-inst-guile-env.in
+++ b/pre-inst-guile-env.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2003 Free Software Foundation
+#      Copyright (C) 2003, 2006, 2008 Free Software Foundation
 #
 #   This file is part of GUILE.
 #
@@ -16,7 +16,7 @@
 #
 # You should have received a copy of the GNU Lesser General Public
 # License along with this library; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 # NOTE: If you update this file, please update pre-inst-guile.in as
 # well, if appropriate.
@@ -31,7 +31,7 @@
 # Example: ../../pre-inst-guile-env ./guile-test-foo
 
 # config
-subdirs_with_ltlibs="srfi guile-readline"       # maintain me
+subdirs_with_ltlibs="srfi guile-readline libguile"       # maintain me
 
 # env (set by configure)
 top_srcdir="@top_srcdir_absolute@"
@@ -47,9 +47,14 @@ top_builddir="@top_builddir_absolute@"
 
 if [ x"$GUILE_LOAD_PATH" = x ]
 then
-    GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}"
+    if test "${top_srcdir}" != "${top_builddir}"; then
+        GUILE_LOAD_PATH="${top_builddir}/guile-readline:${top_srcdir}/guile-readline:${top_builddir}:${top_srcdir}:${top_builddir}/module:${top_srcdir}/module"
+    else
+        GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}:${top_builddir}/module:${top_srcdir}/module"
+    fi
 else
-  for d in "${top_srcdir}" "${top_srcdir}/guile-readline"
+  for d in "${top_srcdir}" "${top_srcdir}/guile-readline" \
+           "${top_srcdir}/module" "${top_builddir}/module"
   do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
@@ -61,13 +66,22 @@ else
 fi
 export GUILE_LOAD_PATH
 
+# Don't look in installed dirs for guile modules
+if ( env | grep -v -q -E '^GUILE_SYSTEM_PATH=' ); then
+  export GUILE_SYSTEM_PATH=
+fi
+
 # 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}"