Only sanity check numbers if SCM_DEBUG_CELL_ACCESSES is unset.

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

diff --git a/pre-inst-guile.in b/pre-inst-guile.in
index 5c44a9d..d210fde 100644 (file)
--- a/pre-inst-guile.in
+++ b/pre-inst-guile.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-#      Copyright (C) 2002 Free Software Foundation
+#      Copyright (C) 2002, 2006, 2008 Free Software Foundation
 #
 #   This file is part of GUILE.
 #
@@ -16,8 +16,15 @@
 #
 #   You should have received a copy of the GNU General Public
 #   License along with GUILE; see the file COPYING.  If not, write
-#   to the Free Software Foundation, Inc., 59 Temple Place, Suite
-#   330, Boston, MA 02111-1307 USA
+#   to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+#   Floor, Boston, MA 02110-1301 USA
+
+# NOTE: at some point we might consider invoking this under
+# pre-inst-guile-env.  If this will work, then most of the code below
+# can be removed.
+
+# NOTE: If you update this file, please update pre-inst-guile-env.in
+# as well, if appropriate.
 
 # Commentary:
 
@@ -36,10 +43,10 @@
 # Code:
 
 # 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@"
+top_srcdir="@top_srcdir_absolute@"
 top_builddir="@top_builddir_absolute@"
 
 [ x"$top_srcdir"   = x -o ! -d "$top_srcdir" -o \
@@ -51,24 +58,33 @@ top_builddir="@top_builddir_absolute@"
 }
 
 # handle GUILE_LOAD_PATH (no clobber)
-if [ x"$GUILE_LOAD_PATH" = x ] ; then
-    GUILE_LOAD_PATH="${top_srcdir}"
+if [ x"$GUILE_LOAD_PATH" = x ]
+then
+    GUILE_LOAD_PATH="${top_srcdir}/guile-readline:${top_srcdir}"
 else
+  for d in "${top_srcdir}" "${top_srcdir}/guile-readline"
+  do
     # This hair prevents double inclusion.
     # The ":" prevents prefix aliasing.
-    case x"$GUILE_LOAD_PATH" in x*${top_srcdir}:*) ;;
-      *) GUILE_LOAD_PATH="${top_srcdir}:$GUILE_LOAD_PATH" ;;
+    case x"$GUILE_LOAD_PATH" in
+      x*${d}:*) ;;
+      *) GUILE_LOAD_PATH="${d}:$GUILE_LOAD_PATH" ;;
     esac
+  done
 fi
 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