updated for version 7.1-015

diff --git a/src/auto/configure b/src/auto/configure
index f976f51fc8515e47945473226ae9d2c67dcf7e64..3d94de5fb896b8ad6160e71dc6d908d6314a584a 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -3843,7 +3843,9 @@ echo "${ECHO_T}\"no\"" >&6
   fi
 
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
-    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+    if test "x$MACOSX" = "xyes"; then
+      MZSCHEME_LIBS="-framework PLT_MzScheme"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
     else
       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"

diff --git a/src/configure.in b/src/configure.in
index 254ca0da6c6e4a3fbceb44363ce050aa039e61e2..7514eb3574ec4b3a656acc2ef7cb999f28d0cb37 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -423,7 +423,9 @@ if test "$enable_mzschemeinterp" = "yes"; then
   fi
 
   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
-    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+    if test "x$MACOSX" = "xyes"; then
+      MZSCHEME_LIBS="-framework PLT_MzScheme"
+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
     else
       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 1f13e833f4ee49bdeb6af531c068a6d6ab641c7f..9efb621843f50aa3769eac56bfea524daee7a402 100644 (file)
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -773,8 +773,7 @@ startup_mzscheme(void)
 #ifdef MZSCHEME_COLLECTS
     /* setup 'current-library-collection-paths' parameter */
     scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
-           scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS),
-               scheme_null));
+           scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
 #endif
 #ifdef HAVE_SANDBOX
     /* setup sandbox guards */

diff --git a/src/version.c b/src/version.c
index 05d09caf9feb7f2dc7c422184135c11396740fdc..b68beb09b7a98faf14eda0ab54ddd7872e5d271b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    15,
 /**/
     14,
 /**/