diff -Naur guile-1.6.4.orig/configure guile-1.6.4/configure --- guile-1.6.4.orig/configure Tue Apr 22 02:02:39 2003 +++ guile-1.6.4/configure Sat May 3 22:31:00 2003 @@ -4361,6 +4361,7 @@ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' ;; esac + lt_cv_deplibs_check_method=pass_all ;; freebsd*) @@ -6274,7 +6275,8 @@ archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes + hardcode_direct=no + hardcode_libdir_flag_spec=' ' hardcode_shlibpath_var=no whole_archive_flag_spec='-all_load $convenience' ;; diff -Naur guile-1.6.4.orig/guile-config/guile-config.in guile-1.6.4/guile-config/guile-config.in --- guile-1.6.4.orig/guile-config/guile-config.in Sun Dec 8 07:41:30 2002 +++ guile-1.6.4/guile-config/guile-config.in Sat May 3 22:31:00 2003 @@ -1,4 +1,4 @@ -#!@-bindir-@/guile \ +#!@-bindir-@/guile-1.6 \ -e main -s !# ;;;; guile-config --- utility for linking programs with Guile diff -Naur guile-1.6.4.orig/guile-config/guile.m4 guile-1.6.4/guile-config/guile.m4 --- guile-1.6.4.orig/guile-config/guile.m4 Sun Dec 8 07:41:30 2002 +++ guile-1.6.4/guile-config/guile.m4 Sat May 3 22:31:00 2003 @@ -72,17 +72,17 @@ # The variables are marked for substitution, as by @code{AC_SUBST}. # AC_DEFUN([GUILE_PROGS], - [AC_PATH_PROG(GUILE,guile) + [AC_PATH_PROG(GUILE,guile-1.6) if test "$GUILE" = "" ; then AC_MSG_ERROR([guile required but not found]) fi AC_SUBST(GUILE) - AC_PATH_PROG(GUILE_CONFIG,guile-config) + AC_PATH_PROG(GUILE_CONFIG,guile-1.6-config) if test "$GUILE_CONFIG" = "" ; then AC_MSG_ERROR([guile-config required but not found]) fi AC_SUBST(GUILE_CONFIG) - AC_PATH_PROG(GUILE_TOOLS,guile-tools) + AC_PATH_PROG(GUILE_TOOLS,guile-1.6-tools) AC_SUBST(GUILE_TOOLS) ]) diff -Naur guile-1.6.4.orig/guile-readline/Makefile.in guile-1.6.4/guile-readline/Makefile.in --- guile-1.6.4.orig/guile-readline/Makefile.in Tue Apr 22 03:23:33 2003 +++ guile-1.6.4/guile-readline/Makefile.in Sat May 3 22:31:00 2003 @@ -133,9 +133,9 @@ lib_LTLIBRARIES = libguilereadline-v-@LIBGUILEREADLINE_MAJOR@.la libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_SOURCES = readline.c -libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la +libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LIBADD = ../libguile/libguile.la ../libguile-ltdl/libguile-ltdl.la libguilereadline_v_@LIBGUILEREADLINE_MAJOR@_la_LDFLAGS = -version-info @LIBGUILEREADLINE_INTERFACE@ \ - -export-dynamic -no-undefined + -module -no-undefined BUILT_SOURCES = readline.x diff -Naur guile-1.6.4.orig/guile-readline/configure guile-1.6.4/guile-readline/configure --- guile-1.6.4.orig/guile-readline/configure Tue Apr 22 02:02:57 2003 +++ guile-1.6.4/guile-readline/configure Sat May 3 22:31:00 2003 @@ -3379,6 +3379,7 @@ lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib' ;; esac + lt_cv_deplibs_check_method=pass_all ;; freebsd*) @@ -5765,7 +5766,8 @@ archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes + hardcode_direct=no + hardcode_libdir_flag_spec=' ' hardcode_shlibpath_var=no whole_archive_flag_spec='-all_load $convenience' ;; diff -Naur guile-1.6.4.orig/guile16-build guile-1.6.4/guile16-build --- guile-1.6.4.orig/guile16-build Thu Jan 1 09:00:00 1970 +++ guile-1.6.4/guile16-build Sat May 3 22:31:00 2003 @@ -0,0 +1,10 @@ +#! /bin/sh +GUILE=guile-1.6 +GUILE_CONFIG=guile-1.6-config +GUILE_TOOLS=guile-1.6-tools +PATH="@FINKPREFIX@/share/guile/1.6/scripts/binoverride:$PATH" +export GUILE +export GUILE_CONFIG +export GUILE_TOOLS +export PATH +eval "$@" diff -Naur guile-1.6.4.orig/libguile/posix.c guile-1.6.4/libguile/posix.c --- guile-1.6.4.orig/libguile/posix.c Sun Dec 8 07:41:32 2002 +++ guile-1.6.4/libguile/posix.c Sat May 3 22:31:00 2003 @@ -117,7 +117,12 @@ #include +#if defined(__APPLE__) && defined(__DYNAMIC__) +#include +char ** environ = NULL; +#else extern char ** environ; +#endif #ifdef HAVE_GRP_H #include @@ -1036,6 +1041,9 @@ "then the return value is unspecified.") #define FUNC_NAME s_scm_environ { +#if defined(__APPLE__) && defined(__DYNAMIC__) + environ = *_NSGetEnviron(); +#endif if (SCM_UNBNDP (env)) return scm_makfromstrs (-1, environ); else @@ -1213,6 +1221,13 @@ SCM_MEMORY_ERROR; strncpy (ptr, SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str)); ptr[SCM_STRING_LENGTH (str)] = 0; +#if defined(macosx) + if (!strchr(ptr, '=')) { + unsetenv(ptr); + rv = 0; + } + else +#endif rv = putenv (ptr); if (rv < 0) SCM_SYSERROR; diff -Naur guile-1.6.4.orig/libguile-ltdl/raw-ltdl.c guile-1.6.4/libguile-ltdl/raw-ltdl.c --- guile-1.6.4.orig/libguile-ltdl/raw-ltdl.c Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/libguile-ltdl/raw-ltdl.c Sat May 3 22:31:00 2003 @@ -2631,6 +2631,7 @@ char * deplibs = NULL; char * line = NULL; size_t line_len; + char * finksearchpath = "@FINKPREFIX@/lib"; /* if we can't find the installed flag, it is probably an installed libtool archive, produced with an old version @@ -2689,6 +2690,12 @@ search_path = getenv (LTDL_SHLIBPATH_VAR); if (search_path) file = find_file (search_path, base_name, &dir); + } +#endif +#if 1 + if (!file && finksearchpath) + { + file = find_file (finksearchpath, base_name, &dir); } #endif #ifdef LTDL_SYSSEARCHPATH diff -Naur guile-1.6.4.orig/ltmain.sh guile-1.6.4/ltmain.sh --- guile-1.6.4.orig/ltmain.sh Tue Apr 22 02:02:29 2003 +++ guile-1.6.4/ltmain.sh Sat May 3 22:31:00 2003 @@ -1769,7 +1769,7 @@ if test "$installed" = no; then notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes + need_relink=no fi if test -n "$old_archive_from_expsyms_cmds"; then diff -Naur guile-1.6.4.orig/pre-inst-guile.in guile-1.6.4/pre-inst-guile.in --- guile-1.6.4.orig/pre-inst-guile.in Sun Dec 8 07:41:28 2002 +++ guile-1.6.4/pre-inst-guile.in Sat May 3 22:31:00 2003 @@ -50,6 +50,23 @@ exit 1 } +# the load library path is needed during the install phase (when guile looks +# for libraries in $prefix/lib, but they have not been installed yet) + +guile_libdir="${top_srcdir}/libguile/.libs:${top_srcdir}/libguile-ltdl/.libs" + +# handle DYLD_LIBRARY_PATH (no clobber) +if [ x"$DYLD_LIBRARY_PATH" = x ] ; then + DYLD_LIBRARY_PATH="${guile_libdir}" +else + # This hair prevents double inclusion. + # The ":" prevents prefix aliasing. + case x"$DYLD_LIBRARY_PATH" in x*${guile_libdir}:*) ;; + *) DYLD_LIBRARY_PATH="${guile_libdir}:$DYLD_LIBRARY_PATH" ;; + esac +fi +export DYLD_LIBRARY_PATH + # handle GUILE_LOAD_PATH (no clobber) if [ x"$GUILE_LOAD_PATH" = x ] ; then GUILE_LOAD_PATH="${top_srcdir}" diff -Naur guile-1.6.4.orig/scripts/PROGRAM guile-1.6.4/scripts/PROGRAM --- guile-1.6.4.orig/scripts/PROGRAM Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/PROGRAM Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; PROGRAM --- Does something diff -Naur guile-1.6.4.orig/scripts/README guile-1.6.4/scripts/README --- guile-1.6.4.orig/scripts/README Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/README Sat May 3 22:31:00 2003 @@ -65,7 +65,7 @@ #!/bin/sh main='(module-ref (resolve-module '\''(scripts PROGRAM)) '\'main')' - exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" + exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# Following these conventions allows the program file to be used as module diff -Naur guile-1.6.4.orig/scripts/autofrisk guile-1.6.4/scripts/autofrisk --- guile-1.6.4.orig/scripts/autofrisk Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/autofrisk Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts autofrisk)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; autofrisk --- Generate module checks for use with auto* tools diff -Naur guile-1.6.4.orig/scripts/display-commentary guile-1.6.4/scripts/display-commentary --- guile-1.6.4.orig/scripts/display-commentary Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/display-commentary Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts display-commentary)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; display-commentary --- As advertized diff -Naur guile-1.6.4.orig/scripts/doc-snarf guile-1.6.4/scripts/doc-snarf --- guile-1.6.4.orig/scripts/doc-snarf Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/doc-snarf Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts doc-snarf)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; doc-snarf --- Extract documentation from source files diff -Naur guile-1.6.4.orig/scripts/frisk guile-1.6.4/scripts/frisk --- guile-1.6.4.orig/scripts/frisk Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/frisk Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts frisk)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; frisk --- Grok the module interfaces of a body of files diff -Naur guile-1.6.4.orig/scripts/generate-autoload guile-1.6.4/scripts/generate-autoload --- guile-1.6.4.orig/scripts/generate-autoload Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/generate-autoload Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts generate-autoload)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; generate-autoload --- Display define-module form with autoload info diff -Naur guile-1.6.4.orig/scripts/lint guile-1.6.4/scripts/lint --- guile-1.6.4.orig/scripts/lint Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/lint Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts lint)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; lint --- Preemptive checks for coding errors in Guile Scheme code diff -Naur guile-1.6.4.orig/scripts/punify guile-1.6.4/scripts/punify --- guile-1.6.4.orig/scripts/punify Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/punify Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts punify)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; punify --- Display Scheme code w/o unnecessary comments / whitespace diff -Naur guile-1.6.4.orig/scripts/read-scheme-source guile-1.6.4/scripts/read-scheme-source --- guile-1.6.4.orig/scripts/read-scheme-source Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/read-scheme-source Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts read-scheme-source)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; read-scheme-source --- Read a file, recognizing scheme forms and comments diff -Naur guile-1.6.4.orig/scripts/snarf-check-and-output-texi guile-1.6.4/scripts/snarf-check-and-output-texi --- guile-1.6.4.orig/scripts/snarf-check-and-output-texi Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/snarf-check-and-output-texi Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main="(module-ref (resolve-module '(scripts snarf-check-and-output-texi)) 'main)" -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; snarf-check-and-output-texi --- called by the doc snarfer. diff -Naur guile-1.6.4.orig/scripts/snarf-guile-m4-docs guile-1.6.4/scripts/snarf-guile-m4-docs --- guile-1.6.4.orig/scripts/snarf-guile-m4-docs Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/snarf-guile-m4-docs Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts snarf-guile-m4-docs)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; snarf-guile-m4-docs --- Parse guile.m4 comments for texi documentation diff -Naur guile-1.6.4.orig/scripts/use2dot guile-1.6.4/scripts/use2dot --- guile-1.6.4.orig/scripts/use2dot Sun Dec 8 07:41:33 2002 +++ guile-1.6.4/scripts/use2dot Sat May 3 22:31:00 2003 @@ -1,7 +1,7 @@ #!/bin/sh # aside from this initial boilerplate, this is actually -*- scheme -*- code main='(module-ref (resolve-module '\''(scripts use2dot)) '\'main')' -exec ${GUILE-guile} -l $0 -c "(apply $main (cdr (command-line)))" "$@" +exec ${GUILE-guile-1.6} -l $0 -c "(apply $main (cdr (command-line)))" "$@" !# ;;; use2dot --- Display module dependencies as a DOT specification diff -Naur guile-1.6.4.orig/srfi/Makefile.in guile-1.6.4/srfi/Makefile.in --- guile-1.6.4.orig/srfi/Makefile.in Tue Apr 22 02:02:53 2003 +++ guile-1.6.4/srfi/Makefile.in Sat May 3 22:31:00 2003 @@ -191,15 +191,15 @@ libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.c nodist_libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_SOURCES = srfi-4.x -libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la -libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -export-dynamic \ +libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LIBADD = ../libguile/libguile.la ../libguile-ltdl/libguile-ltdl.la +libguile_srfi_srfi_4_v_@LIBGUILE_SRFI_SRFI_4_MAJOR@_la_LDFLAGS = -module \ -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@ libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.c srfi-14.c nodist_libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_SOURCES = srfi-13.x srfi-14.x -libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la -libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -export-dynamic \ +libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LIBADD = ../libguile/libguile.la ../libguile-ltdl/libguile-ltdl.la +libguile_srfi_srfi_13_14_v_@LIBGUILE_SRFI_SRFI_13_14_MAJOR@_la_LDFLAGS = -module \ -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@