diff options
| author | vimboss <devnull@localhost> | 2007-06-28 11:07:21 +0000 |
|---|---|---|
| committer | vimboss <devnull@localhost> | 2007-06-28 11:07:21 +0000 |
| commit | f5907ef2d90c20bb398c52bc92cb7e6836d98067 (patch) | |
| tree | 54e9ddb0f4fa4f1686f5f5fa5d4e48ddce4f8bfc | |
| parent | 6508e21d5966bf06a14dfe92eac3925af9684943 (diff) | |
| download | vim-f5907ef2d90c20bb398c52bc92cb7e6836d98067.tar.gz | |
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.in | 4 | ||||
| -rw-r--r-- | src/if_mzsch.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 9 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index f976f51f..3d94de5f 100755 --- 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 254ca0da6..7514eb35 100644 --- 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 1f13e833..9efb6218 100644 --- 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 05d09caf..b68beb09 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 15, +/**/ 14, /**/ 13, |