diff -urN guile-1.6.7.orig/configure guile-1.6.7/configure
--- guile-1.6.7.orig/configure	2004-11-12 12:45:58.000000000 +0900
+++ guile-1.6.7/configure	2005-02-28 23:08:00.000000000 +0900
@@ -5302,6 +5302,7 @@
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 irix5* | irix6* | nonstopux*)
diff -urN guile-1.6.7.orig/guile-config/guile-config.in guile-1.6.7/guile-config/guile-config.in
--- guile-1.6.7.orig/guile-config/guile-config.in	2002-12-08 07:41:30.000000000 +0900
+++ guile-1.6.7/guile-config/guile-config.in	2005-02-28 23:08:00.000000000 +0900
@@ -1,4 +1,4 @@
-#!@-bindir-@/guile \
+#!@-bindir-@/guile-1.6 \
 -e main -s
 !#
 ;;;; guile-config --- utility for linking programs with Guile
diff -urN guile-1.6.7.orig/guile-config/guile.m4 guile-1.6.7/guile-config/guile.m4
--- guile-1.6.7.orig/guile-config/guile.m4	2002-12-08 07:41:30.000000000 +0900
+++ guile-1.6.7/guile-config/guile.m4	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/guile-readline/Makefile.in guile-1.6.7/guile-readline/Makefile.in
--- guile-1.6.7.orig/guile-readline/Makefile.in	2004-12-22 02:34:31.000000000 +0900
+++ guile-1.6.7/guile-readline/Makefile.in	2005-02-28 23:08:00.000000000 +0900
@@ -213,9 +213,9 @@
 GUILE_SNARF = ../libguile/guile-snarf
 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
 pkginclude_HEADERS = readline.h
diff -urN guile-1.6.7.orig/guile-readline/configure guile-1.6.7/guile-readline/configure
--- guile-1.6.7.orig/guile-readline/configure	2004-11-12 12:46:13.000000000 +0900
+++ guile-1.6.7/guile-readline/configure	2005-02-28 23:08:00.000000000 +0900
@@ -4324,6 +4324,7 @@
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
+  lt_cv_deplibs_check_method=pass_all
   ;;
 
 irix5* | irix6* | nonstopux*)
diff -urN guile-1.6.7.orig/guile16-build guile-1.6.7/guile16-build
--- guile-1.6.7.orig/guile16-build	1970-01-01 09:00:00.000000000 +0900
+++ guile-1.6.7/guile16-build	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/libguile/posix.c guile-1.6.7/libguile/posix.c
--- guile-1.6.7.orig/libguile/posix.c	2004-12-14 14:21:39.000000000 +0900
+++ guile-1.6.7/libguile/posix.c	2005-02-28 23:08:00.000000000 +0900
@@ -117,7 +117,12 @@
 
 #include <signal.h>
 
+#if defined(__APPLE__) && defined(__DYNAMIC__)
+#include <crt_externs.h>
+char ** environ = NULL;
+#else
 extern char ** environ;
+#endif
 
 #ifdef HAVE_GRP_H
 #include <grp.h>
@@ -1068,6 +1073,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
@@ -1257,6 +1265,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 -urN guile-1.6.7.orig/libguile-ltdl/raw-ltdl.c guile-1.6.7/libguile-ltdl/raw-ltdl.c
--- guile-1.6.7.orig/libguile-ltdl/raw-ltdl.c	2003-10-13 03:13:32.000000000 +0900
+++ guile-1.6.7/libguile-ltdl/raw-ltdl.c	2005-02-28 23:08:00.000000000 +0900
@@ -3106,6 +3106,7 @@
       char *	deplibs	 = 0;
       char *    line	 = 0;
       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
@@ -3166,6 +3167,12 @@
 		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
 	  if (!file && sys_search_path)
 	    {
diff -urN guile-1.6.7.orig/ltmain.sh guile-1.6.7/ltmain.sh
--- guile-1.6.7.orig/ltmain.sh	2004-12-22 02:25:54.000000000 +0900
+++ guile-1.6.7/ltmain.sh	2005-02-28 23:08:00.000000000 +0900
@@ -2272,7 +2272,7 @@
 	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
 	  if test "$installed" = no; then
 	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
+	    need_relink=no
 	  fi
 	  # This is a shared library
 
diff -urN guile-1.6.7.orig/pre-inst-guile.in guile-1.6.7/pre-inst-guile.in
--- guile-1.6.7.orig/pre-inst-guile.in	2004-12-14 13:55:40.000000000 +0900
+++ guile-1.6.7/pre-inst-guile.in	2005-02-28 23:08:00.000000000 +0900
@@ -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
diff -urN guile-1.6.7.orig/scripts/PROGRAM guile-1.6.7/scripts/PROGRAM
--- guile-1.6.7.orig/scripts/PROGRAM	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/PROGRAM	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/README guile-1.6.7/scripts/README
--- guile-1.6.7.orig/scripts/README	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/README	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/autofrisk guile-1.6.7/scripts/autofrisk
--- guile-1.6.7.orig/scripts/autofrisk	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/autofrisk	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/display-commentary guile-1.6.7/scripts/display-commentary
--- guile-1.6.7.orig/scripts/display-commentary	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/display-commentary	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/doc-snarf guile-1.6.7/scripts/doc-snarf
--- guile-1.6.7.orig/scripts/doc-snarf	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/doc-snarf	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/frisk guile-1.6.7/scripts/frisk
--- guile-1.6.7.orig/scripts/frisk	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/frisk	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/generate-autoload guile-1.6.7/scripts/generate-autoload
--- guile-1.6.7.orig/scripts/generate-autoload	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/generate-autoload	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/lint guile-1.6.7/scripts/lint
--- guile-1.6.7.orig/scripts/lint	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/lint	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/punify guile-1.6.7/scripts/punify
--- guile-1.6.7.orig/scripts/punify	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/punify	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/read-scheme-source guile-1.6.7/scripts/read-scheme-source
--- guile-1.6.7.orig/scripts/read-scheme-source	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/read-scheme-source	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/snarf-check-and-output-texi guile-1.6.7/scripts/snarf-check-and-output-texi
--- guile-1.6.7.orig/scripts/snarf-check-and-output-texi	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/snarf-check-and-output-texi	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/snarf-guile-m4-docs guile-1.6.7/scripts/snarf-guile-m4-docs
--- guile-1.6.7.orig/scripts/snarf-guile-m4-docs	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/snarf-guile-m4-docs	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/scripts/use2dot guile-1.6.7/scripts/use2dot
--- guile-1.6.7.orig/scripts/use2dot	2002-12-08 07:41:33.000000000 +0900
+++ guile-1.6.7/scripts/use2dot	2005-02-28 23:08:00.000000000 +0900
@@ -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 -urN guile-1.6.7.orig/srfi/Makefile.in guile-1.6.7/srfi/Makefile.in
--- guile-1.6.7.orig/srfi/Makefile.in	2004-12-22 02:26:03.000000000 +0900
+++ guile-1.6.7/srfi/Makefile.in	2005-03-01 00:08:11.000000000 +0900
@@ -262,13 +262,13 @@
 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 \
-  -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
+  -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@ -module
 
 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 \
-  -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
+  -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@ -module
 
 srfidir = $(datadir)/guile/$(GUILE_EFFECTIVE_VERSION)/srfi
 srfi_DATA = \
--- guile-1.6.7/libguile/guile.c~	2002-12-08 07:41:32.000000000 +0900
+++ guile-1.6.7/libguile/guile.c	2005-06-09 21:54:01.000000000 +0900
@@ -88,7 +88,7 @@
 {
 #ifdef DYNAMIC_LINKING
   /* libtool automagically inserts this variable into your executable... */
-  extern const scm_lt_dlsymlist lt_preloaded_symbols[];
+  extern const scm_lt_dlsymlist *lt_preloaded_symbols;
   scm_lt_dlpreload_default (lt_preloaded_symbols);
 #endif
   scm_boot_guile (argc, argv, inner_main, 0);