]>
Commit | Line | Data |
---|---|---|
ad28a8ff AG |
1 | To: vim-dev@vim.org |
2 | Subject: patch 7.1.015 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.015 | |
11 | Problem: MzScheme interface: current-library-collection-paths produces no | |
12 | list. Interface doesn't build on a Mac. | |
13 | Solution: Use a list instead of a pair. (Bernhard Fisseni) Use "-framework" | |
14 | argument for MZSCHEME_LIBS in configure. | |
15 | Files: src/configure.in, src/if_mzsch.c, src/auto/configure | |
16 | ||
17 | ||
18 | *** ../vim-7.1.014/src/configure.in Sat May 12 16:30:49 2007 | |
19 | --- src/configure.in Sun Jun 10 16:47:43 2007 | |
20 | *************** | |
21 | *** 423,429 **** | |
22 | fi | |
23 | ||
24 | if test "X$vi_cv_path_mzscheme_pfx" != "X"; then | |
25 | ! if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
26 | MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" | |
27 | else | |
28 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" | |
29 | --- 423,431 ---- | |
30 | fi | |
31 | ||
32 | if test "X$vi_cv_path_mzscheme_pfx" != "X"; then | |
33 | ! if test "x$MACOSX" = "xyes"; then | |
34 | ! MZSCHEME_LIBS="-framework PLT_MzScheme" | |
35 | ! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
36 | MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" | |
37 | else | |
38 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" | |
39 | *** ../vim-7.1.014/src/if_mzsch.c Sat May 12 17:29:20 2007 | |
40 | --- src/if_mzsch.c Sun Jun 10 16:39:51 2007 | |
41 | *************** | |
42 | *** 773,780 **** | |
43 | #ifdef MZSCHEME_COLLECTS | |
44 | /* setup 'current-library-collection-paths' parameter */ | |
45 | scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS, | |
46 | ! scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS), | |
47 | ! scheme_null)); | |
48 | #endif | |
49 | #ifdef HAVE_SANDBOX | |
50 | /* setup sandbox guards */ | |
51 | --- 773,779 ---- | |
52 | #ifdef MZSCHEME_COLLECTS | |
53 | /* setup 'current-library-collection-paths' parameter */ | |
54 | scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS, | |
55 | ! scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS))); | |
56 | #endif | |
57 | #ifdef HAVE_SANDBOX | |
58 | /* setup sandbox guards */ | |
59 | *** ../vim-7.1.014/src/auto/configure Sat May 12 16:23:27 2007 | |
60 | --- src/auto/configure Sun Jun 10 16:49:58 2007 | |
61 | *************** | |
62 | *** 3843,3849 **** | |
63 | fi | |
64 | ||
65 | if test "X$vi_cv_path_mzscheme_pfx" != "X"; then | |
66 | ! if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
67 | MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" | |
68 | else | |
69 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" | |
70 | --- 3843,3851 ---- | |
71 | fi | |
72 | ||
73 | if test "X$vi_cv_path_mzscheme_pfx" != "X"; then | |
74 | ! if test "x$MACOSX" = "xyes"; then | |
75 | ! MZSCHEME_LIBS="-framework PLT_MzScheme" | |
76 | ! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then | |
77 | MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a" | |
78 | else | |
79 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc" | |
80 | *** ../vim-7.1.014/src/version.c Thu Jun 28 12:44:56 2007 | |
81 | --- src/version.c Thu Jun 28 13:00:52 2007 | |
82 | *************** | |
83 | *** 668,669 **** | |
84 | --- 668,671 ---- | |
85 | { /* Add new patch number below this line */ | |
86 | + /**/ | |
87 | + 15, | |
88 | /**/ | |
89 | ||
90 | -- | |
91 | You know you use Vim too much when you have this alias in your | |
92 | ~/.bashrc file: alias :e=/bin/vim (Eljay Love-Jensen) | |
93 | ||
94 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
95 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
96 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
97 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |