]>
Commit | Line | Data |
---|---|---|
5a088057 KK |
1 | To: vim_dev@googlegroups.com |
2 | Subject: Patch 7.3.728 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=UTF-8 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.3.728 | |
11 | Problem: Cannot compile with MzScheme interface on Ubuntu 12.10. | |
12 | Solution: Find the collects directory under /usr/share. | |
13 | Files: src/configure.in, src/auto/configure | |
14 | ||
15 | ||
16 | *** ../vim-7.3.727/src/configure.in 2012-10-03 21:09:33.000000000 +0200 | |
17 | --- src/configure.in 2012-11-23 21:51:39.000000000 +0100 | |
18 | *************** | |
19 | *** 650,666 **** | |
20 | MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib" | |
21 | fi | |
22 | fi | |
23 | if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then | |
24 | ! SCHEME_COLLECTS=lib/plt/ | |
25 | else | |
26 | if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then | |
27 | ! SCHEME_COLLECTS=lib/racket/ | |
28 | fi | |
29 | fi | |
30 | ! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then | |
31 | MZSCHEME_EXTRA="mzscheme_base.c" | |
32 | else | |
33 | ! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then | |
34 | MZSCHEME_EXTRA="mzscheme_base.c" | |
35 | fi | |
36 | fi | |
37 | --- 650,679 ---- | |
38 | MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib" | |
39 | fi | |
40 | fi | |
41 | + | |
42 | + AC_MSG_CHECKING(for racket collects directory) | |
43 | if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then | |
44 | ! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ | |
45 | else | |
46 | if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then | |
47 | ! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ | |
48 | ! else | |
49 | ! if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then | |
50 | ! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ | |
51 | ! fi | |
52 | fi | |
53 | fi | |
54 | ! if test "X$SCHEME_COLLECTS" != "X" ; then | |
55 | ! AC_MSG_RESULT(${SCHEME_COLLECTS}) | |
56 | ! else | |
57 | ! AC_MSG_RESULT(not found) | |
58 | ! fi | |
59 | ! | |
60 | ! AC_MSG_CHECKING(for mzscheme_base.c) | |
61 | ! if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then | |
62 | MZSCHEME_EXTRA="mzscheme_base.c" | |
63 | else | |
64 | ! if test -f "${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then | |
65 | MZSCHEME_EXTRA="mzscheme_base.c" | |
66 | fi | |
67 | fi | |
68 | *************** | |
69 | *** 668,676 **** | |
70 | dnl need to generate bytecode for MzScheme base | |
71 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" | |
72 | MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" | |
73 | fi | |
74 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ | |
75 | ! -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'" | |
76 | MZSCHEME_SRC="if_mzsch.c" | |
77 | MZSCHEME_OBJ="objects/if_mzsch.o" | |
78 | MZSCHEME_PRO="if_mzsch.pro" | |
79 | --- 681,693 ---- | |
80 | dnl need to generate bytecode for MzScheme base | |
81 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" | |
82 | MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" | |
83 | + AC_MSG_RESULT(needed) | |
84 | + else | |
85 | + AC_MSG_RESULT(not needed) | |
86 | fi | |
87 | + | |
88 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ | |
89 | ! -DMZSCHEME_COLLECTS='\"${SCHEME_COLLECTS}collects\"'" | |
90 | MZSCHEME_SRC="if_mzsch.c" | |
91 | MZSCHEME_OBJ="objects/if_mzsch.o" | |
92 | MZSCHEME_PRO="if_mzsch.pro" | |
93 | *** ../vim-7.3.727/src/auto/configure 2012-10-03 21:09:33.000000000 +0200 | |
94 | --- src/auto/configure 2012-11-23 21:51:42.000000000 +0100 | |
95 | *************** | |
96 | *** 4957,4982 **** | |
97 | MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib" | |
98 | fi | |
99 | fi | |
100 | if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then | |
101 | ! SCHEME_COLLECTS=lib/plt/ | |
102 | else | |
103 | if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then | |
104 | ! SCHEME_COLLECTS=lib/racket/ | |
105 | fi | |
106 | fi | |
107 | ! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then | |
108 | MZSCHEME_EXTRA="mzscheme_base.c" | |
109 | else | |
110 | ! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then | |
111 | MZSCHEME_EXTRA="mzscheme_base.c" | |
112 | fi | |
113 | fi | |
114 | if test "X$MZSCHEME_EXTRA" != "X" ; then | |
115 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" | |
116 | MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" | |
117 | fi | |
118 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ | |
119 | ! -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'" | |
120 | MZSCHEME_SRC="if_mzsch.c" | |
121 | MZSCHEME_OBJ="objects/if_mzsch.o" | |
122 | MZSCHEME_PRO="if_mzsch.pro" | |
123 | --- 4957,5005 ---- | |
124 | MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib" | |
125 | fi | |
126 | fi | |
127 | + | |
128 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 | |
129 | + $as_echo_n "checking for racket collects directory... " >&6; } | |
130 | if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then | |
131 | ! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ | |
132 | else | |
133 | if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then | |
134 | ! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ | |
135 | ! else | |
136 | ! if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then | |
137 | ! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ | |
138 | ! fi | |
139 | fi | |
140 | fi | |
141 | ! if test "X$SCHEME_COLLECTS" != "X" ; then | |
142 | ! { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_COLLECTS}" >&5 | |
143 | ! $as_echo "${SCHEME_COLLECTS}" >&6; } | |
144 | ! else | |
145 | ! { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 | |
146 | ! $as_echo "not found" >&6; } | |
147 | ! fi | |
148 | ! | |
149 | ! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mzscheme_base.c" >&5 | |
150 | ! $as_echo_n "checking for mzscheme_base.c... " >&6; } | |
151 | ! if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then | |
152 | MZSCHEME_EXTRA="mzscheme_base.c" | |
153 | else | |
154 | ! if test -f "${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then | |
155 | MZSCHEME_EXTRA="mzscheme_base.c" | |
156 | fi | |
157 | fi | |
158 | if test "X$MZSCHEME_EXTRA" != "X" ; then | |
159 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" | |
160 | MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" | |
161 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: needed" >&5 | |
162 | + $as_echo "needed" >&6; } | |
163 | + else | |
164 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not needed" >&5 | |
165 | + $as_echo "not needed" >&6; } | |
166 | fi | |
167 | + | |
168 | MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ | |
169 | ! -DMZSCHEME_COLLECTS='\"${SCHEME_COLLECTS}collects\"'" | |
170 | MZSCHEME_SRC="if_mzsch.c" | |
171 | MZSCHEME_OBJ="objects/if_mzsch.o" | |
172 | MZSCHEME_PRO="if_mzsch.pro" | |
173 | *** ../vim-7.3.727/src/version.c 2012-11-23 21:47:18.000000000 +0100 | |
174 | --- src/version.c 2012-11-23 21:54:13.000000000 +0100 | |
175 | *************** | |
176 | *** 727,728 **** | |
177 | --- 727,730 ---- | |
178 | { /* Add new patch number below this line */ | |
179 | + /**/ | |
180 | + 728, | |
181 | /**/ | |
182 | ||
183 | -- | |
184 | hundred-and-one symptoms of being an internet addict: | |
185 | 60. As your car crashes through the guardrail on a mountain road, your first | |
186 | instinct is to search for the "back" button. | |
187 | ||
188 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
189 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
190 | \\\ an exciting new programming language -- http://www.Zimbu.org /// | |
191 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |