]>
Commit | Line | Data |
---|---|---|
5f6937f1 AM |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 6.2.118 (extra) | |
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 6.2.118 (extra) | |
11 | Problem: Mac: Compiling is done in a non-standard way. | |
12 | Solution: Use the Unix method for Mac OS X, with autoconf. Add "CARBONGUI" | |
13 | to Makefile and configure. (Eric Kow) | |
14 | Move a few prototypes from os_mac.pro to gui_mac.pro. | |
15 | Files: src/Makefile, src/auto/configure, src/configure.in, | |
16 | src/config.mk.in, src/gui_mac.c, src/os_mac.h, src/os_macosx.c, | |
17 | src/proto/gui_mac.pro, src/proto/os_mac.pro, | |
18 | src/infplist.xml, src/vim.h | |
19 | ||
20 | ||
21 | *** ../vim-6.2.117/src/Makefile Sun Oct 12 17:06:26 2003 | |
22 | --- src/Makefile Mon Sep 22 19:22:52 2003 | |
23 | *************** | |
24 | *** 1010,1019 **** | |
25 | --- 1010,1023 ---- | |
26 | #GUI_LIBS_DIR = $(NONE_LIBS_DIR) | |
27 | #GUI_LIBS1 = $(NONE_LIBS1) | |
28 | #GUI_LIBS2 = $(NONE_LIBS2) | |
29 | + #GUI_INSTALL = $(NONE_INSTALL) | |
30 | #GUI_TARGETS = $(NONE_TARGETS) | |
31 | #GUI_MAN_TARGETS= $(NONE_MAN_TARGETS) | |
32 | #GUI_TESTTARGET = $(NONE_TESTTARGET) | |
33 | ||
34 | + # Without a GUI install the normal way. | |
35 | + NONE_INSTALL = install_normal | |
36 | + | |
37 | ### GTK GUI | |
38 | GTK_SRC = gui.c gui_gtk.c gui_gtk_x11.c pty.c gui_gtk_f.c \ | |
39 | gui_beval.c | |
40 | *************** | |
41 | *** 1025,1030 **** | |
42 | --- 1029,1035 ---- | |
43 | GTK_LIBS_DIR = $(GUI_LIB_LOC) | |
44 | GTK_LIBS1 = | |
45 | GTK_LIBS2 = $(GTK_LIBNAME) | |
46 | + GTK_INSTALL = install_normal | |
47 | GTK_TARGETS = installglinks | |
48 | GTK_MAN_TARGETS = installghelplinks | |
49 | GTK_TESTTARGET = gui | |
50 | *************** | |
51 | *** 1038,1043 **** | |
52 | --- 1043,1049 ---- | |
53 | MOTIF_LIBS_DIR = $(GUI_LIB_LOC) | |
54 | MOTIF_LIBS1 = | |
55 | MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt | |
56 | + MOTIF_INSTALL = install_normal | |
57 | MOTIF_TARGETS = installglinks | |
58 | MOTIF_MAN_TARGETS = installghelplinks | |
59 | MOTIF_TESTTARGET = gui | |
60 | *************** | |
61 | *** 1066,1072 **** | |
62 | ATHENA_LIBS_DIR = $(GUI_LIB_LOC) | |
63 | ATHENA_LIBS1 = $(XAW_LIB) | |
64 | ATHENA_LIBS2 = -lXt | |
65 | ! ATHENA_TARGETS = installglinks | |
66 | ATHENA_MAN_TARGETS = installghelplinks | |
67 | ATHENA_TESTTARGET = gui | |
68 | ||
69 | --- 1072,1079 ---- | |
70 | ATHENA_LIBS_DIR = $(GUI_LIB_LOC) | |
71 | ATHENA_LIBS1 = $(XAW_LIB) | |
72 | ATHENA_LIBS2 = -lXt | |
73 | ! ATHENA_INSTALL = install_normal | |
74 | ! ATHENA_TARGETS = installglinks | |
75 | ATHENA_MAN_TARGETS = installghelplinks | |
76 | ATHENA_TESTTARGET = gui | |
77 | ||
78 | *************** | |
79 | *** 1082,1087 **** | |
80 | --- 1089,1095 ---- | |
81 | NEXTAW_LIBS_DIR = $(GUI_LIB_LOC) | |
82 | NEXTAW_LIBS1 = $(NEXTAW_LIB) | |
83 | NEXTAW_LIBS2 = -lXt | |
84 | + NEXTAW_INSTALL = install_normal | |
85 | NEXTAW_TARGETS = installglinks | |
86 | NEXTAW_MAN_TARGETS = installghelplinks | |
87 | NEXTAW_TESTTARGET = gui | |
88 | *************** | |
89 | *** 1105,1110 **** | |
90 | --- 1113,1119 ---- | |
91 | BEOSGUI_LIBS_DIR = | |
92 | BEOSGUI_LIBS1 = -lbe -lroot | |
93 | BEOSGUI_LIBS2 = | |
94 | + BEOSGUI_INSTALL = install_normal | |
95 | BEOSGUI_TARGETS = installglinks | |
96 | BEOSGUI_MAN_TARGETS = installghelplinks | |
97 | BEOSGUI_TESTTARGET = gui | |
98 | *************** | |
99 | *** 1117,1126 **** | |
100 | --- 1126,1151 ---- | |
101 | PHOTONGUI_LIBS_DIR = | |
102 | PHOTONGUI_LIBS1 = -lph -lphexlib | |
103 | PHOTONGUI_LIBS2 = | |
104 | + PHOTONGUI_INSTALL = install_normal | |
105 | PHOTONGUI_TARGETS = installglinks | |
106 | PHOTONGUI_MAN_TARGETS = installghelplinks | |
107 | PHOTONGUI_TESTTARGET = gui | |
108 | ||
109 | + # CARBON GUI | |
110 | + CARBONGUI_SRC = gui.c gui_mac.c | |
111 | + CARBONGUI_OBJ = objects/gui.o objects/gui_mac.o objects/pty.o | |
112 | + CARBONGUI_DEFS = -arch ppc -fno-common -fpascal-strings \ | |
113 | + -Wall -Wno-unknown-pragmas \ | |
114 | + -mdynamic-no-pic -pipe | |
115 | + CARBONGUI_IPATH = -I. -Iproto -I/Developer/Headers/FlatCarbon | |
116 | + CARBONGUI_LIBS_DIR = | |
117 | + CARBONGUI_LIBS1 = -framework Carbon | |
118 | + CARBONGUI_LIBS2 = -ltermcap | |
119 | + CARBONGUI_INSTALL = gui_mac.rsrc install_macosx | |
120 | + CARBONGUI_TARGETS = | |
121 | + CARBONGUI_MAN_TARGETS = | |
122 | + CARBONGUI_TESTTARGET = | |
123 | + | |
124 | # All GUI files | |
125 | ALL_GUI_SRC = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_athena.c gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c | |
126 | ALL_GUI_PRO = gui.pro gui_gtk.pro gui_motif.pro gui_athena.pro gui_gtk_x11.pro gui_x11.pro gui_w16.pro gui_w32.pro gui_amiga.pro gui_photon.pro | |
127 | *************** | |
128 | *** 1573,1579 **** | |
129 | # If you want to keep an older version, rename it before running "make | |
130 | # install". | |
131 | # | |
132 | ! install: installvim installtools install-languages install-icons | |
133 | ||
134 | installvim: installvimbin installruntime installlinks installhelplinks installmacros installtutor | |
135 | ||
136 | --- 1598,1606 ---- | |
137 | # If you want to keep an older version, rename it before running "make | |
138 | # install". | |
139 | # | |
140 | ! install: $(GUI_INSTALL) | |
141 | ! | |
142 | ! install_normal: installvim installtools install-languages install-icons | |
143 | ||
144 | installvim: installvimbin installruntime installlinks installhelplinks installmacros installtutor | |
145 | ||
146 | *************** | |
147 | *** 2135,2140 **** | |
148 | --- 2162,2170 ---- | |
149 | objects/gui_photon.o: gui_photon.c | |
150 | $(CCC) -o $@ gui_photon.c | |
151 | ||
152 | + objects/gui_mac.o: gui_mac.c | |
153 | + $(CCC) -o $@ gui_mac.c | |
154 | + | |
155 | objects/hangulin.o: hangulin.c | |
156 | $(CCC) -o $@ hangulin.c | |
157 | ||
158 | *************** | |
159 | *** 2210,2215 **** | |
160 | --- 2240,2248 ---- | |
161 | objects/os_qnx.o: os_qnx.c | |
162 | $(CCC) -o $@ os_qnx.c | |
163 | ||
164 | + objects/os_macosx.o: os_macosx.c | |
165 | + $(CCC) -o $@ os_macosx.c | |
166 | + | |
167 | objects/os_unix.o: os_unix.c | |
168 | $(CCC) -o $@ os_unix.c | |
169 | ||
170 | *************** | |
171 | *** 2269,2274 **** | |
172 | --- 2302,2393 ---- | |
173 | ||
174 | Makefile: | |
175 | @echo The name of the makefile MUST be "Makefile" (with capital M)!!!! | |
176 | + | |
177 | + ############################################################################### | |
178 | + ### MacOS X installation | |
179 | + ### | |
180 | + ### This creates a runnable Vim.app in the src directory | |
181 | + ### | |
182 | + ### TODO: install the runtime files in Vim.app instead of | |
183 | + ### requiring that they be in a seperate directory. | |
184 | + | |
185 | + REZ = /Developer/Tools/Rez | |
186 | + RESMRG = /Developer/Tools/ResMerger | |
187 | + APPDIR = $(VIMNAME).app | |
188 | + RESDIR = $(APPDIR)/Contents/Resources | |
189 | + # FIXME: i'm sure someone else can do something clever with grep | |
190 | + # sed and version.h here | |
191 | + VERSION = 6.2 | |
192 | + | |
193 | + ### Common flags | |
194 | + M4FLAGS += -DAPP_EXE=$(VIMNAME) -DAPP_NAME=$(VIMNAME) -DAPP_VER=$(VERSION) \ | |
195 | + -DICON_APP=$(ICON_APP) | |
196 | + | |
197 | + ### Icons | |
198 | + # You can download Douglas Stebila's icons: | |
199 | + # http://homepage.mac.com/dstebila/code/vim/ | |
200 | + # TODO: Honestly, why don't we just go ahead and do this? OS 9? | |
201 | + # If you place those *.icns at src directory, it will be detected by this | |
202 | + # Makefile automatically, and used for Vim. | |
203 | + ICON_APP = $(shell if [ -e app.icns ] ; then echo app.icns ; else echo gui_mac.icns ; fi) | |
204 | + ICON_DOC = $(shell if [ -e doc.icns ] ; then echo doc.icns ; else echo ; fi) | |
205 | + ICON_DOCTXT = $(shell if [ -e doc-txt.icns ] ; then echo doc-txt.icns ; else echo ; fi) | |
206 | + ICONS = $(addprefix $(RESDIR)/, $(ICON_APP) $(ICON_DOC) $(ICON_DOCTXT)) | |
207 | + | |
208 | + install_macosx: bundle-dir bundle-executable bundle-info bundle-resource \ | |
209 | + bundle-language | |
210 | + | |
211 | + bundle-dir: $(APPDIR)/Contents | |
212 | + cp -R ../runtime $(APPDIR) | |
213 | + | |
214 | + bundle-executable: $(VIMTARGET) | |
215 | + cp $(VIMTARGET) $(APPDIR)/Contents/MacOS/$(VIMTARGET) | |
216 | + | |
217 | + bundle-info: bundle-dir | |
218 | + @echo "Creating PkgInfo" | |
219 | + @echo -n "APPLVIM!" > $(APPDIR)/Contents/PkgInfo | |
220 | + @echo "Creating Info.plist" | |
221 | + m4 $(M4FLAGS) infplist.xml > $(APPDIR)/Contents/Info.plist | |
222 | + | |
223 | + bundle-resource: bundle-dir bundle-icons bundle-rsrc | |
224 | + | |
225 | + bundle-icons: $(ICONS) | |
226 | + | |
227 | + ### Classic resources | |
228 | + # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9) | |
229 | + # This file is also required for OS X Vim. | |
230 | + bundle-rsrc: gui_mac.rsrc | |
231 | + @echo "Creating resource fork" | |
232 | + $(RESMRG) gui_mac.rsrc -dstIs DF -o $(RESDIR)/$(VIMNAME).rsrc | |
233 | + | |
234 | + gui_mac.rsrc: | |
235 | + open os_mac.rsr.hqx | |
236 | + sleep 1 | |
237 | + @echo | |
238 | + @echo "--------------------" | |
239 | + @echo "If this fails, run make install again after StuffIt Expander quits." | |
240 | + @echo "--------------------" | |
241 | + @echo | |
242 | + | |
243 | + # po/Make_osx.pl says something about generating a Mac message file | |
244 | + # for Ukrananian. Would somebody using Mac OS X in Ukranian | |
245 | + # *really* be upset that Carbon Vim was not localised in | |
246 | + # Ukranian? | |
247 | + # | |
248 | + #bundle-language: bundle-dir po/Make_osx.pl | |
249 | + # cd po && perl Make_osx.pl --outdir ../$(RESDIR) $(MULTILANG) | |
250 | + bundle-language: bundle-dir | |
251 | + | |
252 | + $(APPDIR)/Contents: | |
253 | + mkdir $(APPDIR) | |
254 | + mkdir $(APPDIR)/Contents | |
255 | + mkdir $(APPDIR)/Contents/MacOS | |
256 | + mkdir $(RESDIR) | |
257 | + mkdir $(RESDIR)/English.lproj | |
258 | + | |
259 | + $(RESDIR)/%.icns: %.icns | |
260 | + cp $< $@ | |
261 | + | |
262 | ||
263 | ############################################################################### | |
264 | ### (automatically generated by 'make depend') | |
265 | *** ../vim-6.2.117/src/auto/configure Sat Sep 27 19:20:53 2003 | |
266 | --- src/auto/configure Sat Sep 13 21:22:56 2003 | |
267 | *************** | |
268 | *** 60,66 **** | |
269 | ac_help="$ac_help | |
270 | --with-x use the X Window System" | |
271 | ac_help="$ac_help | |
272 | ! --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]" | |
273 | ac_help="$ac_help | |
274 | --enable-gtk-check If auto-select GUI, check for GTK [default=yes]" | |
275 | ac_help="$ac_help | |
276 | --- 60,66 ---- | |
277 | ac_help="$ac_help | |
278 | --with-x use the X Window System" | |
279 | ac_help="$ac_help | |
280 | ! --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon/carbon]" | |
281 | ac_help="$ac_help | |
282 | --enable-gtk-check If auto-select GUI, check for GTK [default=yes]" | |
283 | ac_help="$ac_help | |
284 | *************** | |
285 | *** 74,79 **** | |
286 | --- 74,81 ---- | |
287 | ac_help="$ac_help | |
288 | --enable-nextaw-check If auto-select GUI, check for neXtaw [default=yes]" | |
289 | ac_help="$ac_help | |
290 | + --enable-carbon-check If auto-select GUI, check for Carbon [default=yes]" | |
291 | + ac_help="$ac_help | |
292 | --with-gtk-prefix=PFX Prefix where GTK is installed (optional)" | |
293 | ac_help="$ac_help | |
294 | --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)" | |
295 | *************** | |
296 | *** 1169,1174 **** | |
297 | --- 1171,1229 ---- | |
298 | *) QNX=no; echo "$ac_t""no" 1>&6;; | |
299 | esac | |
300 | ||
301 | + DEFAULT_VIMNAME=vim | |
302 | + echo $ac_n "checking for Darwin (Mac OS X)""... $ac_c" 1>&6 | |
303 | + echo "configure:1177: checking for Darwin (Mac OS X)" >&5 | |
304 | + if test "`(uname) 2>/dev/null`" = Darwin; then | |
305 | + echo "$ac_t""yes" 1>&6 | |
306 | + MACOSX=yes | |
307 | + OS_EXTRA_SCR="os_macosx.c"; | |
308 | + OS_EXTRA_OBJ="objects/os_macosx.o" | |
309 | + CFLAGS="$CFLAGS -DMACOS_X_UNIX" | |
310 | + | |
311 | + ac_safe=`echo "Carbon/Carbon.h" | sed 'y%./+-%__p_%'` | |
312 | + echo $ac_n "checking for Carbon/Carbon.h""... $ac_c" 1>&6 | |
313 | + echo "configure:1187: checking for Carbon/Carbon.h" >&5 | |
314 | + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
315 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
316 | + else | |
317 | + cat > conftest.$ac_ext <<EOF | |
318 | + #line 1192 "configure" | |
319 | + #include "confdefs.h" | |
320 | + #include <Carbon/Carbon.h> | |
321 | + EOF | |
322 | + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
323 | + { (eval echo configure:1197: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
324 | + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
325 | + if test -z "$ac_err"; then | |
326 | + rm -rf conftest* | |
327 | + eval "ac_cv_header_$ac_safe=yes" | |
328 | + else | |
329 | + echo "$ac_err" >&5 | |
330 | + echo "configure: failed program was:" >&5 | |
331 | + cat conftest.$ac_ext >&5 | |
332 | + rm -rf conftest* | |
333 | + eval "ac_cv_header_$ac_safe=no" | |
334 | + fi | |
335 | + rm -f conftest* | |
336 | + fi | |
337 | + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
338 | + echo "$ac_t""yes" 1>&6 | |
339 | + CARBON=yes | |
340 | + else | |
341 | + echo "$ac_t""no" 1>&6 | |
342 | + fi | |
343 | + | |
344 | + if test "x$CARBON" = "xyes"; then | |
345 | + if test -z "$with_x"; then | |
346 | + with_x=no | |
347 | + DEFAULT_VIMNAME=Vim | |
348 | + fi | |
349 | + fi | |
350 | + else | |
351 | + echo "$ac_t""no" 1>&6 | |
352 | + fi | |
353 | + | |
354 | ||
355 | ||
356 | ||
357 | *************** | |
358 | *** 1194,1211 **** | |
359 | fi | |
360 | ||
361 | echo $ac_n "checking --with-vim-name argument""... $ac_c" 1>&6 | |
362 | ! echo "configure:1198: checking --with-vim-name argument" >&5 | |
363 | # Check whether --with-vim-name or --without-vim-name was given. | |
364 | if test "${with_vim_name+set}" = set; then | |
365 | withval="$with_vim_name" | |
366 | VIMNAME="$withval"; echo "$ac_t""$VIMNAME" 1>&6 | |
367 | else | |
368 | ! VIMNAME="vim"; echo "$ac_t""Defaulting to vim" 1>&6 | |
369 | fi | |
370 | ||
371 | ||
372 | echo $ac_n "checking --with-ex-name argument""... $ac_c" 1>&6 | |
373 | ! echo "configure:1209: checking --with-ex-name argument" >&5 | |
374 | # Check whether --with-ex-name or --without-ex-name was given. | |
375 | if test "${with_ex_name+set}" = set; then | |
376 | withval="$with_ex_name" | |
377 | --- 1249,1266 ---- | |
378 | fi | |
379 | ||
380 | echo $ac_n "checking --with-vim-name argument""... $ac_c" 1>&6 | |
381 | ! echo "configure:1253: checking --with-vim-name argument" >&5 | |
382 | # Check whether --with-vim-name or --without-vim-name was given. | |
383 | if test "${with_vim_name+set}" = set; then | |
384 | withval="$with_vim_name" | |
385 | VIMNAME="$withval"; echo "$ac_t""$VIMNAME" 1>&6 | |
386 | else | |
387 | ! VIMNAME="$DEFAULT_VIMNAME"; echo "$ac_t""Defaulting to $VIMNAME" 1>&6 | |
388 | fi | |
389 | ||
390 | ||
391 | echo $ac_n "checking --with-ex-name argument""... $ac_c" 1>&6 | |
392 | ! echo "configure:1264: checking --with-ex-name argument" >&5 | |
393 | # Check whether --with-ex-name or --without-ex-name was given. | |
394 | if test "${with_ex_name+set}" = set; then | |
395 | withval="$with_ex_name" | |
396 | *************** | |
397 | *** 1515,1520 **** | |
398 | --- 1570,1595 ---- | |
399 | echo "$ac_t"">>> too old; need Perl version 5.003_01 or later <<<" 1>&6 | |
400 | fi | |
401 | fi | |
402 | + | |
403 | + if test "x$MACOSX" == "xyes"; then | |
404 | + dir=/System/Library/Perl | |
405 | + darwindir=$dir/darwin | |
406 | + if test -d $darwindir; then | |
407 | + PERL=/usr/bin/perl | |
408 | + else | |
409 | + dir=/System/Library/Perl/5.8.1 | |
410 | + darwindir=$dir/darwin-thread-multi-2level | |
411 | + if test -d $darwindir; then | |
412 | + PERL=/usr/bin/perl | |
413 | + fi | |
414 | + fi | |
415 | + if test -n "$PERL"; then | |
416 | + PERL_DIR=$dir | |
417 | + PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE | |
418 | + PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a | |
419 | + PERL_LIBS=-lperl -L$darwindir/CORE | |
420 | + fi | |
421 | + fi | |
422 | fi | |
423 | ||
424 | ||
425 | *************** | |
426 | *** 2345,2351 **** | |
427 | echo "$ac_t""$enable_fontset" 1>&6 | |
428 | ||
429 | test -z "$with_x" && with_x=yes | |
430 | ! test "${enable_gui-yes}" != no -a "x$QNX" != "xyes" && with_x=yes | |
431 | if test "$with_x" = no; then | |
432 | echo "$ac_t""defaulting to: don't HAVE_X11" 1>&6 | |
433 | else | |
434 | --- 2420,2426 ---- | |
435 | echo "$ac_t""$enable_fontset" 1>&6 | |
436 | ||
437 | test -z "$with_x" && with_x=yes | |
438 | ! test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && with_x=yes | |
439 | if test "$with_x" = no; then | |
440 | echo "$ac_t""defaulting to: don't HAVE_X11" 1>&6 | |
441 | else | |
442 | *************** | |
443 | *** 3458,3467 **** | |
444 | fi | |
445 | fi | |
446 | ||
447 | ! test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no | |
448 | ||
449 | echo $ac_n "checking --enable-gui argument""... $ac_c" 1>&6 | |
450 | ! echo "configure:3465: checking --enable-gui argument" >&5 | |
451 | # Check whether --enable-gui or --disable-gui was given. | |
452 | if test "${enable_gui+set}" = set; then | |
453 | enableval="$enable_gui" | |
454 | --- 3533,3542 ---- | |
455 | fi | |
456 | fi | |
457 | ||
458 | ! test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no | |
459 | ||
460 | echo $ac_n "checking --enable-gui argument""... $ac_c" 1>&6 | |
461 | ! echo "configure:3540: checking --enable-gui argument" >&5 | |
462 | # Check whether --enable-gui or --disable-gui was given. | |
463 | if test "${enable_gui+set}" = set; then | |
464 | enableval="$enable_gui" | |
465 | *************** | |
466 | *** 3471,3553 **** | |
467 | fi | |
468 | ||
469 | ||
470 | - ## Canonicalize the --enable-gui= argument so that it can be easily compared. | |
471 | - ## Do not use character classes for portability with old tools. | |
472 | enable_gui_canon=`echo "_$enable_gui" | \ | |
473 | sed 's/[ _+-]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | |
474 | ||
475 | ! if test "x$BEOS" = "xyes"; then | |
476 | ||
477 | ! SKIP_GTK=YES | |
478 | ! SKIP_GTK2=YES | |
479 | ! SKIP_GNOME=YES | |
480 | ! SKIP_MOTIF=YES | |
481 | ! SKIP_ATHENA=YES | |
482 | ! SKIP_NEXTAW=YES | |
483 | ! SKIP_PHOTON=YES | |
484 | SKIP_BEOS= | |
485 | - GUITYPE=NONE | |
486 | - | |
487 | case "$enable_gui_canon" in | |
488 | no) echo "$ac_t""no GUI support" 1>&6 | |
489 | SKIP_BEOS=YES ;; | |
490 | yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
491 | auto) echo "$ac_t""auto - automatic GUI support" 1>&6 ;; | |
492 | beos) echo "$ac_t""BeOS GUI support" 1>&6 ;; | |
493 | ! *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 ;; | |
494 | esac | |
495 | ||
496 | elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then | |
497 | - SKIP_GTK=YES | |
498 | - SKIP_GTK2=YES | |
499 | - SKIP_GNOME=YES | |
500 | - SKIP_MOTIF=YES | |
501 | - SKIP_ATHENA=YES | |
502 | - SKIP_NEXTAW=YES | |
503 | - SKIP_BEOS=YES | |
504 | SKIP_PHOTON= | |
505 | - GUITYPE=NONE | |
506 | - | |
507 | case "$enable_gui_canon" in | |
508 | no) echo "$ac_t""no GUI support" 1>&6 | |
509 | SKIP_PHOTON=YES ;; | |
510 | yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
511 | auto) echo "$ac_t""auto - automatic GUI support" 1>&6 ;; | |
512 | photon) echo "$ac_t""Photon GUI support" 1>&6 ;; | |
513 | ! *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 ;; | |
514 | esac | |
515 | ||
516 | else | |
517 | ||
518 | - SKIP_GTK= | |
519 | - SKIP_GTK2= | |
520 | - SKIP_GNOME= | |
521 | - SKIP_MOTIF= | |
522 | - SKIP_ATHENA= | |
523 | - SKIP_NEXTAW= | |
524 | - SKIP_BEOS=YES | |
525 | - SKIP_PHOTON=YES | |
526 | - GUITYPE=NONE | |
527 | ||
528 | case "$enable_gui_canon" in | |
529 | ! no|none) echo "$ac_t""no GUI support" 1>&6 | |
530 | ! SKIP_GTK=YES; SKIP_GTK2=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
531 | yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
532 | ! auto) echo "$ac_t""auto - automatic GUI support" 1>&6 ;; | |
533 | gtk) echo "$ac_t""GTK+ 1.x GUI support" 1>&6 | |
534 | ! SKIP_GTK2=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
535 | gtk2) echo "$ac_t""GTK+ 2.x GUI support" 1>&6 | |
536 | ! SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
537 | gnome) echo "$ac_t""GNOME 1.x GUI support" 1>&6 | |
538 | ! SKIP_GTK2=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
539 | gnome2) echo "$ac_t""GNOME 2.x GUI support" 1>&6 | |
540 | ! SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
541 | motif) echo "$ac_t""Motif GUI support" 1>&6 | |
542 | ! SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
543 | athena) echo "$ac_t""Athena GUI support" 1>&6 | |
544 | ! SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_NEXTAW=YES ;; | |
545 | nextaw) echo "$ac_t""neXtaw GUI support" 1>&6 | |
546 | ! SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES ;; | |
547 | *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 ;; | |
548 | esac | |
549 | ||
550 | --- 3546,3633 ---- | |
551 | fi | |
552 | ||
553 | ||
554 | enable_gui_canon=`echo "_$enable_gui" | \ | |
555 | sed 's/[ _+-]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | |
556 | ||
557 | ! SKIP_GTK=YES | |
558 | ! SKIP_GTK2=YES | |
559 | ! SKIP_GNOME=YES | |
560 | ! SKIP_MOTIF=YES | |
561 | ! SKIP_ATHENA=YES | |
562 | ! SKIP_NEXTAW=YES | |
563 | ! SKIP_PHOTON=YES | |
564 | ! SKIP_BEOS=YES | |
565 | ! SKIP_CARBON=YES | |
566 | ! GUITYPE=NONE | |
567 | ||
568 | ! if test "x$BEOS" = "xyes"; then | |
569 | SKIP_BEOS= | |
570 | case "$enable_gui_canon" in | |
571 | no) echo "$ac_t""no GUI support" 1>&6 | |
572 | SKIP_BEOS=YES ;; | |
573 | yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
574 | auto) echo "$ac_t""auto - automatic GUI support" 1>&6 ;; | |
575 | beos) echo "$ac_t""BeOS GUI support" 1>&6 ;; | |
576 | ! *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 | |
577 | ! SKIP_BEOS=YES ;; | |
578 | esac | |
579 | ||
580 | elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then | |
581 | SKIP_PHOTON= | |
582 | case "$enable_gui_canon" in | |
583 | no) echo "$ac_t""no GUI support" 1>&6 | |
584 | SKIP_PHOTON=YES ;; | |
585 | yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
586 | auto) echo "$ac_t""auto - automatic GUI support" 1>&6 ;; | |
587 | photon) echo "$ac_t""Photon GUI support" 1>&6 ;; | |
588 | ! *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 | |
589 | ! SKIP_PHOTON=YES ;; | |
590 | ! esac | |
591 | ! | |
592 | ! elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then | |
593 | ! SKIP_CARBON= | |
594 | ! case "$enable_gui_canon" in | |
595 | ! no) echo "$ac_t""no GUI support" 1>&6 | |
596 | ! SKIP_CARBON=YES ;; | |
597 | ! yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
598 | ! auto) echo "$ac_t""auto - automatic GUI support" 1>&6 ;; | |
599 | ! carbon) echo "$ac_t""Carbon GUI support" 1>&6 ;; | |
600 | ! *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 | |
601 | ! SKIP_CARBON=YES ;; | |
602 | esac | |
603 | ||
604 | else | |
605 | ||
606 | ||
607 | case "$enable_gui_canon" in | |
608 | ! no|none) echo "$ac_t""no GUI support" 1>&6 ;; | |
609 | yes|"") echo "$ac_t""yes - automatic GUI support" 1>&6 ;; | |
610 | ! auto) echo "$ac_t""auto - automatic GUI support" 1>&6 | |
611 | ! SKIP_GTK= | |
612 | ! SKIP_GTK2= | |
613 | ! SKIP_GNOME= | |
614 | ! SKIP_MOTIF= | |
615 | ! SKIP_ATHENA= | |
616 | ! SKIP_NEXTAW= | |
617 | ! SKIP_CARBON=;; | |
618 | gtk) echo "$ac_t""GTK+ 1.x GUI support" 1>&6 | |
619 | ! SKIP_GTK=;; | |
620 | gtk2) echo "$ac_t""GTK+ 2.x GUI support" 1>&6 | |
621 | ! SKIP_GTK= | |
622 | ! SKIP_GTK2=;; | |
623 | gnome) echo "$ac_t""GNOME 1.x GUI support" 1>&6 | |
624 | ! SKIP_GNOME= | |
625 | ! SKIP_GTK=;; | |
626 | gnome2) echo "$ac_t""GNOME 2.x GUI support" 1>&6 | |
627 | ! SKIP_GNOME= | |
628 | ! SKIP_GTK= | |
629 | ! SKIP_GTK2=;; | |
630 | motif) echo "$ac_t""Motif GUI support" 1>&6 | |
631 | ! SKIP_MOTIF=;; | |
632 | athena) echo "$ac_t""Athena GUI support" 1>&6 | |
633 | ! SKIP_ATHENA=;; | |
634 | nextaw) echo "$ac_t""neXtaw GUI support" 1>&6 | |
635 | ! SKIP_NEXTAW=;; | |
636 | *) echo "$ac_t""Sorry, $enable_gui GUI is not supported" 1>&6 ;; | |
637 | esac | |
638 | ||
639 | *************** | |
640 | *** 3658,3663 **** | |
641 | --- 3738,3776 ---- | |
642 | fi | |
643 | fi | |
644 | ||
645 | + if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then | |
646 | + echo $ac_n "checking whether or not to look for Carbon""... $ac_c" 1>&6 | |
647 | + echo "configure:3744: checking whether or not to look for Carbon" >&5 | |
648 | + # Check whether --enable-carbon-check or --disable-carbon-check was given. | |
649 | + if test "${enable_carbon_check+set}" = set; then | |
650 | + enableval="$enable_carbon_check" | |
651 | + : | |
652 | + else | |
653 | + enable_carbon_check="yes" | |
654 | + fi | |
655 | + | |
656 | + echo "$ac_t""$enable_carbon_check" 1>&6; | |
657 | + if test "x$enable_carbon_check" = "xno"; then | |
658 | + SKIP_CARBON=YES | |
659 | + fi | |
660 | + fi | |
661 | + | |
662 | + if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then | |
663 | + echo $ac_n "checking for Carbon GUI""... $ac_c" 1>&6 | |
664 | + echo "configure:3761: checking for Carbon GUI" >&5 | |
665 | + echo "$ac_t""yes" 1>&6; | |
666 | + GUITYPE=CARBONGUI | |
667 | + SKIP_GTK=YES; | |
668 | + SKIP_GTK2=YES; | |
669 | + SKIP_GNOME=YES; | |
670 | + SKIP_MOTIF=YES; | |
671 | + SKIP_ATHENA=YES; | |
672 | + SKIP_NEXTAW=YES; | |
673 | + SKIP_PHOTON=YES; | |
674 | + SKIP_BEOS=YES; | |
675 | + SKIP_CARBON=YES | |
676 | + fi | |
677 | + | |
678 | ||
679 | ||
680 | ||
681 | *************** | |
682 | *** 5292,5298 **** | |
683 | ||
684 | for ac_hdr in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \ | |
685 | termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ | |
686 | ! iconv.h langinfo.h unistd.h stropts.h errno.h strings.h \ | |
687 | sys/resource.h sys/systeminfo.h locale.h \ | |
688 | sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ | |
689 | poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ | |
690 | --- 5408,5414 ---- | |
691 | ||
692 | for ac_hdr in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \ | |
693 | termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ | |
694 | ! iconv.h langinfo.h unistd.h stropts.h errno.h \ | |
695 | sys/resource.h sys/systeminfo.h locale.h \ | |
696 | sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ | |
697 | poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ | |
698 | *************** | |
699 | *** 5301,5317 **** | |
700 | do | |
701 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
702 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
703 | ! echo "configure:5305: checking for $ac_hdr" >&5 | |
704 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
705 | echo $ac_n "(cached) $ac_c" 1>&6 | |
706 | else | |
707 | cat > conftest.$ac_ext <<EOF | |
708 | ! #line 5310 "configure" | |
709 | #include "confdefs.h" | |
710 | #include <$ac_hdr> | |
711 | EOF | |
712 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
713 | ! { (eval echo configure:5315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
714 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
715 | if test -z "$ac_err"; then | |
716 | rm -rf conftest* | |
717 | --- 5417,5433 ---- | |
718 | do | |
719 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
720 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
721 | ! echo "configure:5421: checking for $ac_hdr" >&5 | |
722 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
723 | echo $ac_n "(cached) $ac_c" 1>&6 | |
724 | else | |
725 | cat > conftest.$ac_ext <<EOF | |
726 | ! #line 5426 "configure" | |
727 | #include "confdefs.h" | |
728 | #include <$ac_hdr> | |
729 | EOF | |
730 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
731 | ! { (eval echo configure:5431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
732 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
733 | if test -z "$ac_err"; then | |
734 | rm -rf conftest* | |
735 | *************** | |
736 | *** 5338,5349 **** | |
737 | done | |
738 | ||
739 | ||
740 | echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6 | |
741 | ! echo "configure:5343: checking if strings.h can be included after string.h" >&5 | |
742 | cppflags_save=$CPPFLAGS | |
743 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | |
744 | cat > conftest.$ac_ext <<EOF | |
745 | ! #line 5347 "configure" | |
746 | #include "confdefs.h" | |
747 | ||
748 | #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO) | |
749 | --- 5454,5508 ---- | |
750 | done | |
751 | ||
752 | ||
753 | + if test "x$MACOSX" != "xyes"; then | |
754 | + for ac_hdr in strings.h | |
755 | + do | |
756 | + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` | |
757 | + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 | |
758 | + echo "configure:5463: checking for $ac_hdr" >&5 | |
759 | + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then | |
760 | + echo $ac_n "(cached) $ac_c" 1>&6 | |
761 | + else | |
762 | + cat > conftest.$ac_ext <<EOF | |
763 | + #line 5468 "configure" | |
764 | + #include "confdefs.h" | |
765 | + #include <$ac_hdr> | |
766 | + EOF | |
767 | + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" | |
768 | + { (eval echo configure:5473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
769 | + ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` | |
770 | + if test -z "$ac_err"; then | |
771 | + rm -rf conftest* | |
772 | + eval "ac_cv_header_$ac_safe=yes" | |
773 | + else | |
774 | + echo "$ac_err" >&5 | |
775 | + echo "configure: failed program was:" >&5 | |
776 | + cat conftest.$ac_ext >&5 | |
777 | + rm -rf conftest* | |
778 | + eval "ac_cv_header_$ac_safe=no" | |
779 | + fi | |
780 | + rm -f conftest* | |
781 | + fi | |
782 | + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then | |
783 | + echo "$ac_t""yes" 1>&6 | |
784 | + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` | |
785 | + cat >> confdefs.h <<EOF | |
786 | + #define $ac_tr_hdr 1 | |
787 | + EOF | |
788 | + | |
789 | + else | |
790 | + echo "$ac_t""no" 1>&6 | |
791 | + fi | |
792 | + done | |
793 | + | |
794 | + fi | |
795 | + | |
796 | echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6 | |
797 | ! echo "configure:5502: checking if strings.h can be included after string.h" >&5 | |
798 | cppflags_save=$CPPFLAGS | |
799 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | |
800 | cat > conftest.$ac_ext <<EOF | |
801 | ! #line 5506 "configure" | |
802 | #include "confdefs.h" | |
803 | ||
804 | #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO) | |
805 | *** ../vim-6.2.117/src/configure.in Sat Sep 27 19:20:53 2003 | |
806 | --- src/configure.in Sun Oct 12 22:41:30 2003 | |
807 | *************** | |
808 | *** 75,80 **** | |
809 | --- 75,105 ---- | |
810 | *) QNX=no; AC_MSG_RESULT(no);; | |
811 | esac | |
812 | ||
813 | + dnl Check for Darwin and MacOS X | |
814 | + dnl We do a check for MacOS X in the very beginning because there | |
815 | + dnl are a lot of other things we need to change besides GUI stuff | |
816 | + DEFAULT_VIMNAME=vim | |
817 | + AC_MSG_CHECKING([for Darwin (Mac OS X)]) | |
818 | + if test "`(uname) 2>/dev/null`" = Darwin; then | |
819 | + AC_MSG_RESULT(yes) | |
820 | + MACOSX=yes | |
821 | + OS_EXTRA_SCR="os_macosx.c"; | |
822 | + OS_EXTRA_OBJ="objects/os_macosx.o" | |
823 | + CFLAGS="$CFLAGS -DMACOS_X_UNIX" | |
824 | + | |
825 | + dnl If Carbon is found, assume we don't want X11 | |
826 | + dnl unless it was specifically asked for (--with-x) | |
827 | + AC_CHECK_HEADER(Carbon/Carbon.h, CARBON=yes) | |
828 | + if test "x$CARBON" = "xyes"; then | |
829 | + if test -z "$with_x"; then | |
830 | + with_x=no | |
831 | + DEFAULT_VIMNAME=Vim | |
832 | + fi | |
833 | + fi | |
834 | + else | |
835 | + AC_MSG_RESULT(no) | |
836 | + fi | |
837 | + | |
838 | AC_SUBST(OS_EXTRA_SRC) | |
839 | AC_SUBST(OS_EXTRA_OBJ) | |
840 | ||
841 | *************** | |
842 | *** 106,112 **** | |
843 | AC_MSG_CHECKING(--with-vim-name argument) | |
844 | AC_ARG_WITH(vim-name, [ --with-vim-name=NAME what to call the Vim executable], | |
845 | VIMNAME="$withval"; AC_MSG_RESULT($VIMNAME), | |
846 | ! VIMNAME="vim"; AC_MSG_RESULT(Defaulting to vim)) | |
847 | AC_SUBST(VIMNAME) | |
848 | AC_MSG_CHECKING(--with-ex-name argument) | |
849 | AC_ARG_WITH(ex-name, [ --with-ex-name=NAME what to call the Ex executable], | |
850 | --- 131,137 ---- | |
851 | AC_MSG_CHECKING(--with-vim-name argument) | |
852 | AC_ARG_WITH(vim-name, [ --with-vim-name=NAME what to call the Vim executable], | |
853 | VIMNAME="$withval"; AC_MSG_RESULT($VIMNAME), | |
854 | ! VIMNAME="$DEFAULT_VIMNAME"; AC_MSG_RESULT(Defaulting to $VIMNAME)) | |
855 | AC_SUBST(VIMNAME) | |
856 | AC_MSG_CHECKING(--with-ex-name argument) | |
857 | AC_ARG_WITH(ex-name, [ --with-ex-name=NAME what to call the Ex executable], | |
858 | *************** | |
859 | *** 295,300 **** | |
860 | --- 320,347 ---- | |
861 | AC_MSG_RESULT(>>> too old; need Perl version 5.003_01 or later <<<) | |
862 | fi | |
863 | fi | |
864 | + | |
865 | + if test "x$MACOSX" == "xyes"; then | |
866 | + dnl Mac OS X 10.2 or 10.3 | |
867 | + dir=/System/Library/Perl | |
868 | + darwindir=$dir/darwin | |
869 | + if test -d $darwindir; then | |
870 | + PERL=/usr/bin/perl | |
871 | + else | |
872 | + dnl Mac OS X 10.3 | |
873 | + dir=/System/Library/Perl/5.8.1 | |
874 | + darwindir=$dir/darwin-thread-multi-2level | |
875 | + if test -d $darwindir; then | |
876 | + PERL=/usr/bin/perl | |
877 | + fi | |
878 | + fi | |
879 | + if test -n "$PERL"; then | |
880 | + PERL_DIR=$dir | |
881 | + PERL_CFLAGS=-DFEAT_PERL -I$darwindir/CORE | |
882 | + PERL_OBJ=if_perl.o if_perlsfio.o $darwindir/auto/DynaLoader/DynaLoader.a | |
883 | + PERL_LIBS=-lperl -L$darwindir/CORE | |
884 | + fi | |
885 | + fi | |
886 | fi | |
887 | AC_SUBST(shrpenv) | |
888 | AC_SUBST(PERL_SRC) | |
889 | *************** | |
890 | *** 715,721 **** | |
891 | dnl defining FEAT_XFONTSET is delayed, so that it can be disabled for no GUI | |
892 | ||
893 | test -z "$with_x" && with_x=yes | |
894 | ! test "${enable_gui-yes}" != no -a "x$QNX" != "xyes" && with_x=yes | |
895 | if test "$with_x" = no; then | |
896 | AC_MSG_RESULT(defaulting to: don't HAVE_X11) | |
897 | else | |
898 | --- 762,768 ---- | |
899 | dnl defining FEAT_XFONTSET is delayed, so that it can be disabled for no GUI | |
900 | ||
901 | test -z "$with_x" && with_x=yes | |
902 | ! test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && with_x=yes | |
903 | if test "$with_x" = no; then | |
904 | AC_MSG_RESULT(defaulting to: don't HAVE_X11) | |
905 | else | |
906 | *************** | |
907 | *** 815,903 **** | |
908 | fi | |
909 | fi | |
910 | ||
911 | ! test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no | |
912 | ||
913 | AC_MSG_CHECKING(--enable-gui argument) | |
914 | AC_ARG_ENABLE(gui, | |
915 | ! [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]], , enable_gui="auto") | |
916 | ||
917 | ! ## Canonicalize the --enable-gui= argument so that it can be easily compared. | |
918 | ! ## Do not use character classes for portability with old tools. | |
919 | enable_gui_canon=`echo "_$enable_gui" | \ | |
920 | sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | |
921 | ||
922 | ! if test "x$BEOS" = "xyes"; then | |
923 | ||
924 | ! SKIP_GTK=YES | |
925 | ! SKIP_GTK2=YES | |
926 | ! SKIP_GNOME=YES | |
927 | ! SKIP_MOTIF=YES | |
928 | ! SKIP_ATHENA=YES | |
929 | ! SKIP_NEXTAW=YES | |
930 | ! SKIP_PHOTON=YES | |
931 | SKIP_BEOS= | |
932 | - GUITYPE=NONE | |
933 | - | |
934 | case "$enable_gui_canon" in | |
935 | no) AC_MSG_RESULT(no GUI support) | |
936 | SKIP_BEOS=YES ;; | |
937 | yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; | |
938 | auto) AC_MSG_RESULT(auto - automatic GUI support) ;; | |
939 | beos) AC_MSG_RESULT(BeOS GUI support) ;; | |
940 | ! *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;; | |
941 | esac | |
942 | ||
943 | elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then | |
944 | - SKIP_GTK=YES | |
945 | - SKIP_GTK2=YES | |
946 | - SKIP_GNOME=YES | |
947 | - SKIP_MOTIF=YES | |
948 | - SKIP_ATHENA=YES | |
949 | - SKIP_NEXTAW=YES | |
950 | - SKIP_BEOS=YES | |
951 | SKIP_PHOTON= | |
952 | - GUITYPE=NONE | |
953 | - | |
954 | case "$enable_gui_canon" in | |
955 | no) AC_MSG_RESULT(no GUI support) | |
956 | SKIP_PHOTON=YES ;; | |
957 | yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; | |
958 | auto) AC_MSG_RESULT(auto - automatic GUI support) ;; | |
959 | photon) AC_MSG_RESULT(Photon GUI support) ;; | |
960 | ! *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;; | |
961 | esac | |
962 | ||
963 | else | |
964 | ||
965 | - SKIP_GTK= | |
966 | - SKIP_GTK2= | |
967 | - SKIP_GNOME= | |
968 | - SKIP_MOTIF= | |
969 | - SKIP_ATHENA= | |
970 | - SKIP_NEXTAW= | |
971 | - SKIP_BEOS=YES | |
972 | - SKIP_PHOTON=YES | |
973 | - GUITYPE=NONE | |
974 | ||
975 | case "$enable_gui_canon" in | |
976 | ! no|none) AC_MSG_RESULT(no GUI support) | |
977 | ! SKIP_GTK=YES; SKIP_GTK2=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
978 | ! yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; | |
979 | ! auto) AC_MSG_RESULT(auto - automatic GUI support) ;; | |
980 | gtk) AC_MSG_RESULT(GTK+ 1.x GUI support) | |
981 | ! SKIP_GTK2=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
982 | gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support) | |
983 | ! SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
984 | gnome) AC_MSG_RESULT(GNOME 1.x GUI support) | |
985 | ! SKIP_GTK2=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
986 | gnome2) AC_MSG_RESULT(GNOME 2.x GUI support) | |
987 | ! SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
988 | motif) AC_MSG_RESULT(Motif GUI support) | |
989 | ! SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;; | |
990 | athena) AC_MSG_RESULT(Athena GUI support) | |
991 | ! SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_NEXTAW=YES ;; | |
992 | nextaw) AC_MSG_RESULT(neXtaw GUI support) | |
993 | ! SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES ;; | |
994 | *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;; | |
995 | esac | |
996 | ||
997 | --- 862,957 ---- | |
998 | fi | |
999 | fi | |
1000 | ||
1001 | ! test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no | |
1002 | ||
1003 | AC_MSG_CHECKING(--enable-gui argument) | |
1004 | AC_ARG_ENABLE(gui, | |
1005 | ! [ --enable-gui[=OPTS] X11 GUI [default=auto] [OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon/carbon]], , enable_gui="auto") | |
1006 | ||
1007 | ! dnl Canonicalize the --enable-gui= argument so that it can be easily compared. | |
1008 | ! dnl Do not use character classes for portability with old tools. | |
1009 | enable_gui_canon=`echo "_$enable_gui" | \ | |
1010 | sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` | |
1011 | ||
1012 | ! dnl Skip everything by default. | |
1013 | ! SKIP_GTK=YES | |
1014 | ! SKIP_GTK2=YES | |
1015 | ! SKIP_GNOME=YES | |
1016 | ! SKIP_MOTIF=YES | |
1017 | ! SKIP_ATHENA=YES | |
1018 | ! SKIP_NEXTAW=YES | |
1019 | ! SKIP_PHOTON=YES | |
1020 | ! SKIP_BEOS=YES | |
1021 | ! SKIP_CARBON=YES | |
1022 | ! GUITYPE=NONE | |
1023 | ||
1024 | ! if test "x$BEOS" = "xyes"; then | |
1025 | SKIP_BEOS= | |
1026 | case "$enable_gui_canon" in | |
1027 | no) AC_MSG_RESULT(no GUI support) | |
1028 | SKIP_BEOS=YES ;; | |
1029 | yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; | |
1030 | auto) AC_MSG_RESULT(auto - automatic GUI support) ;; | |
1031 | beos) AC_MSG_RESULT(BeOS GUI support) ;; | |
1032 | ! *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) | |
1033 | ! SKIP_BEOS=YES ;; | |
1034 | esac | |
1035 | ||
1036 | elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then | |
1037 | SKIP_PHOTON= | |
1038 | case "$enable_gui_canon" in | |
1039 | no) AC_MSG_RESULT(no GUI support) | |
1040 | SKIP_PHOTON=YES ;; | |
1041 | yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; | |
1042 | auto) AC_MSG_RESULT(auto - automatic GUI support) ;; | |
1043 | photon) AC_MSG_RESULT(Photon GUI support) ;; | |
1044 | ! *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) | |
1045 | ! SKIP_PHOTON=YES ;; | |
1046 | ! esac | |
1047 | ! | |
1048 | ! elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then | |
1049 | ! SKIP_CARBON= | |
1050 | ! case "$enable_gui_canon" in | |
1051 | ! no) AC_MSG_RESULT(no GUI support) | |
1052 | ! SKIP_CARBON=YES ;; | |
1053 | ! yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;; | |
1054 | ! auto) AC_MSG_RESULT(auto - automatic GUI support) ;; | |
1055 | ! carbon) AC_MSG_RESULT(Carbon GUI support) ;; | |
1056 | ! *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) | |
1057 | ! SKIP_CARBON=YES ;; | |
1058 | esac | |
1059 | ||
1060 | else | |
1061 | ||
1062 | ||
1063 | case "$enable_gui_canon" in | |
1064 | ! no|none) AC_MSG_RESULT(no GUI support) ;; | |
1065 | ! yes|""|auto) AC_MSG_RESULT(yes/auto - automatic GUI support) | |
1066 | ! SKIP_GTK= | |
1067 | ! SKIP_GTK2= | |
1068 | ! SKIP_GNOME= | |
1069 | ! SKIP_MOTIF= | |
1070 | ! SKIP_ATHENA= | |
1071 | ! SKIP_NEXTAW= | |
1072 | ! SKIP_CARBON=;; | |
1073 | gtk) AC_MSG_RESULT(GTK+ 1.x GUI support) | |
1074 | ! SKIP_GTK=;; | |
1075 | gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support) | |
1076 | ! SKIP_GTK= | |
1077 | ! SKIP_GTK2=;; | |
1078 | gnome) AC_MSG_RESULT(GNOME 1.x GUI support) | |
1079 | ! SKIP_GNOME= | |
1080 | ! SKIP_GTK=;; | |
1081 | gnome2) AC_MSG_RESULT(GNOME 2.x GUI support) | |
1082 | ! SKIP_GNOME= | |
1083 | ! SKIP_GTK= | |
1084 | ! SKIP_GTK2=;; | |
1085 | motif) AC_MSG_RESULT(Motif GUI support) | |
1086 | ! SKIP_MOTIF=;; | |
1087 | athena) AC_MSG_RESULT(Athena GUI support) | |
1088 | ! SKIP_ATHENA=;; | |
1089 | nextaw) AC_MSG_RESULT(neXtaw GUI support) | |
1090 | ! SKIP_NEXTAW=;; | |
1091 | *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;; | |
1092 | esac | |
1093 | ||
1094 | *************** | |
1095 | *** 972,977 **** | |
1096 | --- 1026,1059 ---- | |
1097 | fi | |
1098 | fi | |
1099 | ||
1100 | + if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then | |
1101 | + AC_MSG_CHECKING(whether or not to look for Carbon) | |
1102 | + AC_ARG_ENABLE(carbon-check, | |
1103 | + [ --enable-carbon-check If auto-select GUI, check for Carbon [default=yes]], | |
1104 | + , enable_carbon_check="yes") | |
1105 | + AC_MSG_RESULT($enable_carbon_check); | |
1106 | + if test "x$enable_carbon_check" = "xno"; then | |
1107 | + SKIP_CARBON=YES | |
1108 | + fi | |
1109 | + fi | |
1110 | + | |
1111 | + if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then | |
1112 | + AC_MSG_CHECKING(for Carbon GUI) | |
1113 | + dnl already did this | |
1114 | + AC_MSG_RESULT(yes); | |
1115 | + GUITYPE=CARBONGUI | |
1116 | + dnl skip everything else | |
1117 | + SKIP_GTK=YES; | |
1118 | + SKIP_GTK2=YES; | |
1119 | + SKIP_GNOME=YES; | |
1120 | + SKIP_MOTIF=YES; | |
1121 | + SKIP_ATHENA=YES; | |
1122 | + SKIP_NEXTAW=YES; | |
1123 | + SKIP_PHOTON=YES; | |
1124 | + SKIP_BEOS=YES; | |
1125 | + SKIP_CARBON=YES | |
1126 | + fi | |
1127 | + | |
1128 | ||
1129 | dnl | |
1130 | dnl Get the cflags and libraries from the gtk-config script | |
1131 | *************** | |
1132 | *** 1567,1572 **** | |
1133 | --- 1649,1660 ---- | |
1134 | AC_DEFINE(FEAT_XFONTSET) | |
1135 | fi | |
1136 | ||
1137 | + | |
1138 | + dnl --------------------------------------------------------------------------- | |
1139 | + dnl end of GUI-checking | |
1140 | + dnl --------------------------------------------------------------------------- | |
1141 | + | |
1142 | + | |
1143 | dnl Only really enable hangul input when GUI and XFONTSET are available | |
1144 | if test "$enable_hangulinput" = "yes"; then | |
1145 | if test "x$GUITYPE" = "xNONE"; then | |
1146 | *************** | |
1147 | *** 1622,1633 **** | |
1148 | ||
1149 | AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \ | |
1150 | termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ | |
1151 | ! iconv.h langinfo.h unistd.h stropts.h errno.h strings.h \ | |
1152 | sys/resource.h sys/systeminfo.h locale.h \ | |
1153 | sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ | |
1154 | poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ | |
1155 | libgen.h util/debug.h util/msg18n.h frame.h \ | |
1156 | sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h) | |
1157 | ||
1158 | dnl Check if strings.h and string.h can both be included when defined. | |
1159 | AC_MSG_CHECKING([if strings.h can be included after string.h]) | |
1160 | --- 1710,1726 ---- | |
1161 | ||
1162 | AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \ | |
1163 | termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \ | |
1164 | ! iconv.h langinfo.h unistd.h stropts.h errno.h \ | |
1165 | sys/resource.h sys/systeminfo.h locale.h \ | |
1166 | sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \ | |
1167 | poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ | |
1168 | libgen.h util/debug.h util/msg18n.h frame.h \ | |
1169 | sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h) | |
1170 | + | |
1171 | + dnl On Mac OS X strings.h exists but produces a warning message :-( | |
1172 | + if test "x$MACOSX" != "xyes"; then | |
1173 | + AC_CHECK_HEADERS(strings.h) | |
1174 | + fi | |
1175 | ||
1176 | dnl Check if strings.h and string.h can both be included when defined. | |
1177 | AC_MSG_CHECKING([if strings.h can be included after string.h]) | |
1178 | *** ../vim-6.2.117/src/config.mk.in Sun Apr 20 16:10:18 2003 | |
1179 | --- src/config.mk.in Sun Sep 7 20:25:02 2003 | |
1180 | *************** | |
1181 | *** 116,121 **** | |
1182 | --- 116,122 ---- | |
1183 | GUI_LIBS_DIR = $(@GUITYPE@_LIBS_DIR) | |
1184 | GUI_LIBS1 = $(@GUITYPE@_LIBS1) | |
1185 | GUI_LIBS2 = $(@GUITYPE@_LIBS2) | |
1186 | + GUI_INSTALL = $(@GUITYPE@_INSTALL) | |
1187 | GUI_TARGETS = $(@GUITYPE@_TARGETS) | |
1188 | GUI_MAN_TARGETS = $(@GUITYPE@_MAN_TARGETS) | |
1189 | GUI_TESTTARGET = $(@GUITYPE@_TESTTARGET) | |
1190 | *** ../vim-6.2.117/src/gui_mac.c Sat Jul 26 21:25:27 2003 | |
1191 | --- src/gui_mac.c Sun Oct 12 21:59:11 2003 | |
1192 | *************** | |
1193 | *** 206,212 **** | |
1194 | #endif | |
1195 | ||
1196 | /* Colors Macros */ | |
1197 | ! #define RGB(r,g,b) (r << 16) + (g << 8) + b | |
1198 | #define Red(c) ((c & 0x00FF0000) >> 16) | |
1199 | #define Green(c) ((c & 0x0000FF00) >> 8) | |
1200 | #define Blue(c) ((c & 0x000000FF) >> 0) | |
1201 | --- 206,212 ---- | |
1202 | #endif | |
1203 | ||
1204 | /* Colors Macros */ | |
1205 | ! #define RGB(r,g,b) ((r) << 16) + ((g) << 8) + (b) | |
1206 | #define Red(c) ((c & 0x00FF0000) >> 16) | |
1207 | #define Green(c) ((c & 0x0000FF00) >> 8) | |
1208 | #define Blue(c) ((c & 0x000000FF) >> 0) | |
1209 | *************** | |
1210 | *** 613,622 **** | |
1211 | } | |
1212 | ||
1213 | for (buf = firstbuf; buf != NULL; buf = buf->b_next) | |
1214 | ! if (buf->b_ml.ml_mfp != NULL) | |
1215 | ! if (SearchData.theFile.parID == buf->b_FSSpec.parID) | |
1216 | ! if (SearchData.theFile.name[0] = buf->b_FSSpec.name[0]) | |
1217 | ! if (STRNCMP(SearchData.theFile.name, buf->b_FSSpec.name, buf->b_FSSpec.name[0]+1)) | |
1218 | { | |
1219 | foundFile = true; | |
1220 | break; | |
1221 | --- 613,622 ---- | |
1222 | } | |
1223 | ||
1224 | for (buf = firstbuf; buf != NULL; buf = buf->b_next) | |
1225 | ! if (buf->b_ml.ml_mfp != NULL | |
1226 | ! && SearchData.theFile.parID == buf->b_FSSpec.parID | |
1227 | ! && SearchData.theFile.name[0] == buf->b_FSSpec.name[0] | |
1228 | ! && STRNCMP(SearchData.theFile.name, buf->b_FSSpec.name, buf->b_FSSpec.name[0] + 1) == 0) | |
1229 | { | |
1230 | foundFile = true; | |
1231 | break; | |
1232 | *************** | |
1233 | *** 822,828 **** | |
1234 | CW_GetText GetTextData; | |
1235 | Size actualSize; | |
1236 | char_u *line; | |
1237 | ! char_u *fullbuffer; | |
1238 | long linesize; | |
1239 | long lineStart; | |
1240 | long BufferSize; | |
1241 | --- 822,828 ---- | |
1242 | CW_GetText GetTextData; | |
1243 | Size actualSize; | |
1244 | char_u *line; | |
1245 | ! char_u *fullbuffer = NULL; | |
1246 | long linesize; | |
1247 | long lineStart; | |
1248 | long BufferSize; | |
1249 | *************** | |
1250 | *** 875,883 **** | |
1251 | HUnlock (GetTextData.theText); | |
1252 | } | |
1253 | } | |
1254 | ! HLock (GetTextData.theText); | |
1255 | ! fullbuffer[BufferSize-1] = 0; | |
1256 | ! HUnlock (GetTextData.theText); | |
1257 | if (foundFile == false) | |
1258 | *GetTextData.theDate = fnfErr; | |
1259 | else | |
1260 | --- 875,886 ---- | |
1261 | HUnlock (GetTextData.theText); | |
1262 | } | |
1263 | } | |
1264 | ! if (fullbuffer != NULL) | |
1265 | ! { | |
1266 | ! HLock (GetTextData.theText); | |
1267 | ! fullbuffer[BufferSize-1] = 0; | |
1268 | ! HUnlock (GetTextData.theText); | |
1269 | ! } | |
1270 | if (foundFile == false) | |
1271 | *GetTextData.theDate = fnfErr; | |
1272 | else | |
1273 | *************** | |
1274 | *** 3160,3166 **** | |
1275 | if (STRICMP (name, "hilite") == 0) | |
1276 | { | |
1277 | LMGetHiliteRGB (&MacColor); | |
1278 | ! return (RGB (MacColor.red >> 8, MacColor.green >> 8, MacColor.blue >>8)); | |
1279 | } | |
1280 | /* Check if the name is one of the colors we know */ | |
1281 | for (i = 0; i < sizeof(table) / sizeof(table[0]); i++) | |
1282 | --- 3163,3169 ---- | |
1283 | if (STRICMP (name, "hilite") == 0) | |
1284 | { | |
1285 | LMGetHiliteRGB (&MacColor); | |
1286 | ! return (RGB (MacColor.red >> 8, MacColor.green >> 8, MacColor.blue >> 8)); | |
1287 | } | |
1288 | /* Check if the name is one of the colors we know */ | |
1289 | for (i = 0; i < sizeof(table) / sizeof(table[0]); i++) | |
1290 | *************** | |
1291 | *** 3214,3220 **** | |
1292 | if (STRICMP(color, name) == 0) | |
1293 | { | |
1294 | fclose(fd); | |
1295 | ! return (guicolor_T) RGB(r,g,b); | |
1296 | } | |
1297 | } | |
1298 | fclose(fd); | |
1299 | --- 3217,3223 ---- | |
1300 | if (STRICMP(color, name) == 0) | |
1301 | { | |
1302 | fclose(fd); | |
1303 | ! return (guicolor_T) RGB(r, g, b); | |
1304 | } | |
1305 | } | |
1306 | fclose(fd); | |
1307 | *************** | |
1308 | *** 5086,5091 **** | |
1309 | --- 5089,5095 ---- | |
1310 | status = ContextualMenuSelect(CntxMenu, where, false, kCMHelpItemNoHelp, HelpName, NULL, &CntxType, &CntxMenuID, &CntxMenuItem); | |
1311 | ||
1312 | if (status == noErr) | |
1313 | + { | |
1314 | if (CntxType == kCMMenuItemSelected) | |
1315 | { | |
1316 | /* Handle the menu CntxMenuID, CntxMenuItem */ | |
1317 | *************** | |
1318 | *** 5097,5102 **** | |
1319 | --- 5101,5107 ---- | |
1320 | { | |
1321 | /* Should come up with the help */ | |
1322 | } | |
1323 | + } | |
1324 | ||
1325 | /* Restore original Port */ | |
1326 | SetPort (savePort); /*OSX*/ | |
1327 | *** ../vim-6.2.117/src/os_mac.h Mon Jul 28 14:38:38 2003 | |
1328 | --- src/os_mac.h Sun Oct 12 21:14:34 2003 | |
1329 | *************** | |
1330 | *** 147,165 **** | |
1331 | #endif | |
1332 | #define HAVE_AVAIL_MEM | |
1333 | ||
1334 | /* #define SYNC_DUP_CLOSE sync() a file with dup() and close() */ | |
1335 | ! #define HAVE_STRING_H | |
1336 | ! #define HAVE_STRCSPN | |
1337 | ! #define HAVE_MEMSET | |
1338 | ! #define USE_TMPNAM /* use tmpnam() instead of mktemp() */ | |
1339 | ! #define HAVE_FCNTL_H | |
1340 | ! #define HAVE_QSORT | |
1341 | ! #define HAVE_ST_MODE /* have stat.st_mode */ | |
1342 | ||
1343 | ! #if defined(__DATE__) && defined(__TIME__) | |
1344 | ! # define HAVE_DATE_TIME | |
1345 | #endif | |
1346 | - #define HAVE_STRFTIME | |
1347 | ||
1348 | ||
1349 | /* | |
1350 | --- 147,167 ---- | |
1351 | #endif | |
1352 | #define HAVE_AVAIL_MEM | |
1353 | ||
1354 | + #ifndef HAVE_CONFIG_H | |
1355 | /* #define SYNC_DUP_CLOSE sync() a file with dup() and close() */ | |
1356 | ! # define HAVE_STRING_H | |
1357 | ! # define HAVE_STRCSPN | |
1358 | ! # define HAVE_MEMSET | |
1359 | ! # define USE_TMPNAM /* use tmpnam() instead of mktemp() */ | |
1360 | ! # define HAVE_FCNTL_H | |
1361 | ! # define HAVE_QSORT | |
1362 | ! # define HAVE_ST_MODE /* have stat.st_mode */ | |
1363 | ||
1364 | ! # if defined(__DATE__) && defined(__TIME__) | |
1365 | ! # define HAVE_DATE_TIME | |
1366 | ! # endif | |
1367 | ! # define HAVE_STRFTIME | |
1368 | #endif | |
1369 | ||
1370 | ||
1371 | /* | |
1372 | *************** | |
1373 | *** 333,358 **** | |
1374 | /**************/ | |
1375 | #define mch_rename(src, dst) rename(src, dst) | |
1376 | #define mch_remove(x) unlink((char *)(x)) | |
1377 | ! #if defined(__MRC__) || defined(__SC__) | |
1378 | ! # define mch_getenv(name) ((char_u *)getenv((char *)(name))) | |
1379 | ! # define mch_setenv(name, val, x) setenv((name), (val)) | |
1380 | ! #elif defined(__APPLE_CC__) | |
1381 | ! # define mch_getenv(name) ((char_u *)getenv((char *)(name))) | |
1382 | /*# define mch_setenv(name, val, x) setenv((name), (val)) */ /* Obsoleted by Dany on Oct 30, 2001 */ | |
1383 | ! # define mch_setenv(name, val, x) setenv(name, val, x) | |
1384 | ! #else | |
1385 | ! /* vim_getenv() is in pty.c */ | |
1386 | ! # define USE_VIMPTY_GETENV | |
1387 | ! # define mch_getenv(x) vimpty_getenv(x) | |
1388 | ! # define mch_setenv(name, val, x) setenv(name, val, x) | |
1389 | #endif | |
1390 | ||
1391 | ! #ifdef __APPLE_CC__ | |
1392 | /* Assuming compiling for MacOS X */ | |
1393 | /* Trying to take advantage of the prebinding */ | |
1394 | ! # define HAVE_TGETENT | |
1395 | ! # define OSPEED_EXTERN | |
1396 | ! # define UP_BC_PC_EXTERN | |
1397 | #endif | |
1398 | ||
1399 | /* Some "prep work" definition to be able to compile the MacOS X | |
1400 | --- 335,364 ---- | |
1401 | /**************/ | |
1402 | #define mch_rename(src, dst) rename(src, dst) | |
1403 | #define mch_remove(x) unlink((char *)(x)) | |
1404 | ! #ifndef mch_getenv | |
1405 | ! # if defined(__MRC__) || defined(__SC__) | |
1406 | ! # define mch_getenv(name) ((char_u *)getenv((char *)(name))) | |
1407 | ! # define mch_setenv(name, val, x) setenv((name), (val)) | |
1408 | ! # elif defined(__APPLE_CC__) | |
1409 | ! # define mch_getenv(name) ((char_u *)getenv((char *)(name))) | |
1410 | /*# define mch_setenv(name, val, x) setenv((name), (val)) */ /* Obsoleted by Dany on Oct 30, 2001 */ | |
1411 | ! # define mch_setenv(name, val, x) setenv(name, val, x) | |
1412 | ! # else | |
1413 | ! /* vim_getenv() is in pty.c */ | |
1414 | ! # define USE_VIMPTY_GETENV | |
1415 | ! # define mch_getenv(x) vimpty_getenv(x) | |
1416 | ! # define mch_setenv(name, val, x) setenv(name, val, x) | |
1417 | ! # endif | |
1418 | #endif | |
1419 | ||
1420 | ! #ifndef HAVE_CONFIG_H | |
1421 | ! # ifdef __APPLE_CC__ | |
1422 | /* Assuming compiling for MacOS X */ | |
1423 | /* Trying to take advantage of the prebinding */ | |
1424 | ! # define HAVE_TGETENT | |
1425 | ! # define OSPEED_EXTERN | |
1426 | ! # define UP_BC_PC_EXTERN | |
1427 | ! # endif | |
1428 | #endif | |
1429 | ||
1430 | /* Some "prep work" definition to be able to compile the MacOS X | |
1431 | *************** | |
1432 | *** 361,385 **** | |
1433 | */ | |
1434 | ||
1435 | #ifdef MACOS_X_UNIX | |
1436 | - # define RETSIGTYPE void | |
1437 | - # define SIGRETURN return | |
1438 | # define SIGPROTOARG (int) | |
1439 | # define SIGDEFARG(s) (s) int s; | |
1440 | # define SIGDUMMYARG 0 | |
1441 | - /*# define USE_SYSTEM */ /* Output ship do debugger :(, but ot compile */ | |
1442 | - # define HAVE_SYS_WAIT_H 1 /* Attempt */ | |
1443 | - # define HAVE_TERMIOS_H 1 | |
1444 | - # define SYS_SELECT_WITH_SYS_TIME 1 | |
1445 | - # define HAVE_SELECT 1 | |
1446 | - # define HAVE_SYS_SELECT_H 1 | |
1447 | # undef HAVE_AVAIL_MEM | |
1448 | ! # define HAVE_PUTENV | |
1449 | ! # define HAVE_SETENV | |
1450 | ! # define HAVE_RENAME | |
1451 | # define mch_chdir(s) chdir(s) | |
1452 | #endif | |
1453 | ||
1454 | ! #ifdef MACOS_X | |
1455 | # define HAVE_PUTENV | |
1456 | #endif | |
1457 | ||
1458 | --- 367,393 ---- | |
1459 | */ | |
1460 | ||
1461 | #ifdef MACOS_X_UNIX | |
1462 | # define SIGPROTOARG (int) | |
1463 | # define SIGDEFARG(s) (s) int s; | |
1464 | # define SIGDUMMYARG 0 | |
1465 | # undef HAVE_AVAIL_MEM | |
1466 | ! # ifndef HAVE_CONFIG_H | |
1467 | ! # define RETSIGTYPE void | |
1468 | ! # define SIGRETURN return | |
1469 | ! /*# define USE_SYSTEM */ /* Output ship do debugger :(, but ot compile */ | |
1470 | ! # define HAVE_SYS_WAIT_H 1 /* Attempt */ | |
1471 | ! # define HAVE_TERMIOS_H 1 | |
1472 | ! # define SYS_SELECT_WITH_SYS_TIME 1 | |
1473 | ! # define HAVE_SELECT 1 | |
1474 | ! # define HAVE_SYS_SELECT_H 1 | |
1475 | ! # define HAVE_PUTENV | |
1476 | ! # define HAVE_SETENV | |
1477 | ! # define HAVE_RENAME | |
1478 | ! # endif | |
1479 | # define mch_chdir(s) chdir(s) | |
1480 | #endif | |
1481 | ||
1482 | ! #if defined(MACOS_X) && !defined(HAVE_CONFIG_H) | |
1483 | # define HAVE_PUTENV | |
1484 | #endif | |
1485 | ||
1486 | *** ../vim-6.2.117/src/os_macosx.c Sun May 11 17:26:37 2003 | |
1487 | --- src/os_macosx.c Sun Sep 7 21:45:56 2003 | |
1488 | *************** | |
1489 | *** 13,19 **** | |
1490 | */ | |
1491 | ||
1492 | #ifdef MACOS_X_UNIX | |
1493 | ! # include "os_unix.c" | |
1494 | #else | |
1495 | # include "os_mac.c" | |
1496 | # include <TextEncodingConverter.h> | |
1497 | --- 13,19 ---- | |
1498 | */ | |
1499 | ||
1500 | #ifdef MACOS_X_UNIX | |
1501 | ! # include "vim.h" | |
1502 | #else | |
1503 | # include "os_mac.c" | |
1504 | # include <TextEncodingConverter.h> | |
1505 | *** ../vim-6.2.117/src/proto/gui_mac.pro Sat Jul 26 21:25:27 2003 | |
1506 | --- src/proto/gui_mac.pro Sun Sep 7 23:42:13 2003 | |
1507 | *************** | |
1508 | *** 135,138 **** | |
1509 | --- 135,142 ---- | |
1510 | void gui_mac_doMouseMovedEvent __ARGS((EventRecord *event)); | |
1511 | void gui_mac_doMouseUpEvent __ARGS((EventRecord *theEvent)); | |
1512 | ||
1513 | + int C2PascalString (char_u *CString, Str255 *PascalString); | |
1514 | + int GetFSSpecFromPath ( char_u *file, FSSpec *fileFSSpec); | |
1515 | + char_u *FullPathFromFSSpec_save (FSSpec file); | |
1516 | + | |
1517 | /* vim: set ft=c : */ | |
1518 | *** ../vim-6.2.117/src/proto/os_mac.pro Sun Sep 16 20:33:15 2001 | |
1519 | --- src/proto/os_mac.pro Sun Sep 7 23:42:47 2003 | |
1520 | *************** | |
1521 | *** 45,55 **** | |
1522 | int mch_has_exp_wildcard __ARGS((char_u *p)); | |
1523 | ||
1524 | void slash_n_colon_adjust __ARGS((char_u *buf)); | |
1525 | - char_u *FullPathFromFSSpec_save (FSSpec file); | |
1526 | int mch_copy_file(char_u *from, char_u *to); | |
1527 | ||
1528 | - int C2PascalString (char_u *CString, Str255 *PascalString); | |
1529 | - int GetFSSpecFromPath ( char_u *file, FSSpec *fileFSSpec); | |
1530 | int mch_has_resource_fork (char_u *file); | |
1531 | int mch_copy_file_attribute(char_u *from, char_u *to); | |
1532 | ||
1533 | --- 45,52 ---- | |
1534 | *** ../vim-6.2.117/src/infplist.xml Mon Oct 13 22:09:37 2003 | |
1535 | --- src/infplist.xml Thu Aug 14 13:36:03 2003 | |
1536 | *************** | |
1537 | *** 0 **** | |
1538 | --- 1,51 ---- | |
1539 | + <?xml version="1.0" encoding="UTF-8"?> | |
1540 | + <!-- vim:set ts=2 sts=2 sw=2 tw=0: --> | |
1541 | + <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> | |
1542 | + <plist version="0.9"> | |
1543 | + <dict> | |
1544 | + | |
1545 | + <key>CFBundleInfoDictionaryVersion</key> | |
1546 | + <string>6.0</string> | |
1547 | + | |
1548 | + <key>CFBundleExecutable</key> | |
1549 | + <string>APP_EXE</string> | |
1550 | + <key>CFBundleName</key> | |
1551 | + <string>APP_NAME</string> | |
1552 | + <key>CFBundlePackageType</key> | |
1553 | + <string>APPL</string> | |
1554 | + <key>CFBundleVersion</key> | |
1555 | + <string>APP_VER</string> | |
1556 | + <key>CFBundleShortVersionString</key> | |
1557 | + <string>APP_VER</string> | |
1558 | + <key>CFBundleSignature</key> | |
1559 | + <string>VIM!</string> | |
1560 | + | |
1561 | + <key>CFBundleDevelopmentRegion</key> | |
1562 | + <string>English</string> | |
1563 | + <key>CSResourcesFileMapped</key> | |
1564 | + <true/> | |
1565 | + <key>CFBundleIconFile</key> | |
1566 | + <string>ICON_APP</string> | |
1567 | + | |
1568 | + <key>CFBundleDocumentTypes</key> | |
1569 | + <array> | |
1570 | + <dict> | |
1571 | + <key>CFBundleTypeExtensions</key> | |
1572 | + <array> | |
1573 | + <string>*</string> | |
1574 | + </array> | |
1575 | + <key>CFBundleTypeIconFile</key> | |
1576 | + <string>doc-txt.icns</string> | |
1577 | + <key>CFBundleTypeName</key> | |
1578 | + <string>NSStringPboardType</string> | |
1579 | + <key>CFBundleTypeOSTypes</key> | |
1580 | + <array> | |
1581 | + <string>****</string> | |
1582 | + </array> | |
1583 | + <key>CFBundleTypeRole</key> | |
1584 | + <string>Editor</string> | |
1585 | + </dict> | |
1586 | + </array> | |
1587 | + | |
1588 | + </dict> | |
1589 | + </plist> | |
1590 | *** ../vim-6.2.117/src/vim.h Sun Oct 12 17:25:14 2003 | |
1591 | --- src/vim.h Sun Oct 12 21:10:15 2003 | |
1592 | *************** | |
1593 | *** 63,70 **** | |
1594 | # define MACOS_CLASSIC | |
1595 | #endif | |
1596 | #if defined(MACOS_X_UNIX) | |
1597 | ! # define MACOS_X | |
1598 | # define UNIX | |
1599 | #endif | |
1600 | #if defined(MACOS_X) || defined(MACOS_CLASSIC) | |
1601 | # define MACOS | |
1602 | --- 63,72 ---- | |
1603 | # define MACOS_CLASSIC | |
1604 | #endif | |
1605 | #if defined(MACOS_X_UNIX) | |
1606 | ! # define MACOS_X | |
1607 | ! # ifndef HAVE_CONFIG_H | |
1608 | # define UNIX | |
1609 | + # endif | |
1610 | #endif | |
1611 | #if defined(MACOS_X) || defined(MACOS_CLASSIC) | |
1612 | # define MACOS | |
1613 | *************** | |
1614 | *** 187,193 **** | |
1615 | # define __ARGS(x) x | |
1616 | #endif | |
1617 | ||
1618 | ! #if (defined(UNIX) || defined(__EMX__) || defined(VMS)) && !defined(MACOS_X) | |
1619 | # include "os_unix.h" /* bring lots of system header files */ | |
1620 | #endif | |
1621 | ||
1622 | --- 189,196 ---- | |
1623 | # define __ARGS(x) x | |
1624 | #endif | |
1625 | ||
1626 | ! #if (defined(UNIX) || defined(__EMX__) || defined(VMS)) \ | |
1627 | ! && (!defined(MACOS_X) || defined(HAVE_CONFIG_H)) | |
1628 | # include "os_unix.h" /* bring lots of system header files */ | |
1629 | #endif | |
1630 | ||
1631 | *** ../vim-6.2.117/src/version.c Sun Oct 12 20:20:38 2003 | |
1632 | --- src/version.c Mon Oct 13 22:08:37 2003 | |
1633 | *************** | |
1634 | *** 639,640 **** | |
1635 | --- 639,642 ---- | |
1636 | { /* Add new patch number below this line */ | |
1637 | + /**/ | |
1638 | + 118, | |
1639 | /**/ | |
1640 | ||
1641 | -- | |
1642 | hundred-and-one symptoms of being an internet addict: | |
1643 | 197. Your desk collapses under the weight of your computer peripherals. | |
1644 | ||
1645 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
1646 | /// Creator of Vim - Vi IMproved -- http://www.Vim.org \\\ | |
1647 | \\\ Project leader for A-A-P -- http://www.A-A-P.org /// | |
1648 | \\\ Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html /// |