Mirror of the Vim source from https://github.com/vim/vim
Revision | 9be87deaeb527ef18daf09d6c75b21d1d7a65d78 (tree) |
---|---|
Zeit | 2004-07-17 05:18:37 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.0009
@@ -1,4 +1,4 @@ | ||
1 | -*cmdline.txt* For Vim version 7.0aa. Last change: 2004 Jul 01 | |
1 | +*cmdline.txt* For Vim version 7.0aa. Last change: 2004 Jul 14 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -164,6 +164,8 @@ | ||
164 | 164 | 'path' as in |gf| |
165 | 165 | CTRL-W the Word under the cursor |
166 | 166 | CTRL-A the WORD under the cursor; see |WORD| |
167 | + When 'incsearch' is set the cursor position of the currently | |
168 | + displayed match is used. | |
167 | 169 | {not in Vi} |
168 | 170 | CTRL-F and CTRL-P: {only when +file_in_path feature is |
169 | 171 | included} |
@@ -1,4 +1,4 @@ | ||
1 | -*options.txt* For Vim version 7.0aa. Last change: 2004 Jul 05 | |
1 | +*options.txt* For Vim version 7.0aa. Last change: 2004 Jul 15 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -1104,6 +1104,9 @@ | ||
1104 | 1104 | nofile buffer which is not related to a file and will not be |
1105 | 1105 | written |
1106 | 1106 | nowrite buffer which will not be written |
1107 | + acwrite buffer which will always be written with BufWriteCmd | |
1108 | + autocommands. {not available when compiled without the | |
1109 | + |+autocmd| feature} | |
1107 | 1110 | quickfix quickfix buffer, contains list of errors |:cwindow| |
1108 | 1111 | help help buffer (you are not supposed to set this |
1109 | 1112 | manually) |
@@ -1128,6 +1131,12 @@ | ||
1128 | 1131 | nofile only: The buffer name is fixed, it is not handled like a |
1129 | 1132 | file name. It is not modified in response to a |:cd| |
1130 | 1133 | command. |
1134 | + *E676* | |
1135 | + "acwrite" implies that the buffer name is not related to a file, like | |
1136 | + "nofile", but it will be written. Thus, in contrast to "nofile" and | |
1137 | + "nowrite", ":w" does work and a modified buffer can't be abandoned | |
1138 | + without saving. For writing there must be matching |BufWriteCmd|, | |
1139 | + |FileWriteCmd| or |FileAppendCmd| autocommands. | |
1131 | 1140 | |
1132 | 1141 | *'casemap'* *'cmp'* |
1133 | 1142 | 'casemap' 'cmp' string (default: "internal,keepascii") |
@@ -3422,14 +3431,16 @@ | ||
3422 | 3431 | {not in Vi} |
3423 | 3432 | {not available when compiled without the |
3424 | 3433 | |+extra_search| feature} |
3425 | - While typing a search command, show immediately where the so far | |
3426 | - typed pattern matches. The matched string is highlighted. If the | |
3427 | - pattern is invalid or not found, nothing is shown. The screen will | |
3428 | - be updated often, this is only useful on fast terminals. Note that | |
3429 | - the match will be shown, but the cursor is not actually positioned | |
3430 | - there. You still need to finish the search command with <CR> to move | |
3431 | - the cursor. The highlighting can be set with the 'i' flag in | |
3432 | - 'highlight'. See also: 'hlsearch'. | |
3434 | + While typing a search command, show where the pattern, as it was typed | |
3435 | + so far, matches. The matched string is highlighted. If the pattern | |
3436 | + is invalid or not found, nothing is shown. The screen will be updated | |
3437 | + often, this is only useful on fast terminals. | |
3438 | + Note that the match will be shown, but the cursor will return to its | |
3439 | + original position when no match is found and when pressing <Esc>. You | |
3440 | + still need to finish the search command with <Enter> to move the | |
3441 | + cursor to the match. | |
3442 | + The highlighting can be set with the 'i' flag in 'highlight'. | |
3443 | + See also: 'hlsearch'. | |
3433 | 3444 | NOTE: This option is reset when 'compatible' is set. |
3434 | 3445 | |
3435 | 3446 | *'indentexpr'* *'inde'* |
@@ -1,4 +1,4 @@ | ||
1 | -*starting.txt* For Vim version 7.0aa. Last change: 2004 Jun 18 | |
1 | +*starting.txt* For Vim version 7.0aa. Last change: 2004 Jul 13 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -746,7 +746,7 @@ | ||
746 | 746 | "home:.vimrc" (for Amiga) (*) |
747 | 747 | "$VIM/.vimrc" (for OS/2 and Amiga) (*) |
748 | 748 | "$HOME/_vimrc" (for MS-DOS and Win32) (*) |
749 | - "$VIM\_vimrc" (for MS-DOS and Win32) (*) | |
749 | + "$VIM/_vimrc" (for MS-DOS and Win32) (*) | |
750 | 750 | Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist, |
751 | 751 | "_vimrc" is also tried, in case an MS-DOS compatible file |
752 | 752 | system is used. For MS-DOS and Win32 ".vimrc" is checked |
@@ -1,4 +1,4 @@ | ||
1 | -*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jul 06 | |
1 | +*syntax.txt* For Vim version 7.0aa. Last change: 2004 Jul 15 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -2089,6 +2089,14 @@ | ||
2089 | 2089 | "$global_var", "@instance_var", "| iterator |", and ":symbol". |
2090 | 2090 | |
2091 | 2091 | |
2092 | +SCHEME *scheme.vim* *scheme-syntax* | |
2093 | + | |
2094 | +By default only R5RS keywords are highlighted and properly indented. | |
2095 | + | |
2096 | +MzScheme-specific stuff will be used if b:is_mzscheme or g:is_mzscheme | |
2097 | +variables are defined. | |
2098 | + | |
2099 | + | |
2092 | 2100 | SDL *sdl.vim* *sdl-syntax* |
2093 | 2101 | |
2094 | 2102 | The SDL highlighting probably misses a few keywords, but SDL has so many |
@@ -1813,6 +1813,8 @@ | ||
1813 | 1813 | :di change.txt /*:di* |
1814 | 1814 | :diffg diff.txt /*:diffg* |
1815 | 1815 | :diffget diff.txt /*:diffget* |
1816 | +:diffo diff.txt /*:diffo* | |
1817 | +:diffoff diff.txt /*:diffoff* | |
1816 | 1818 | :diffp diff.txt /*:diffp* |
1817 | 1819 | :diffpatch diff.txt /*:diffpatch* |
1818 | 1820 | :diffpu diff.txt /*:diffpu* |
@@ -3527,6 +3529,7 @@ | ||
3527 | 3529 | E673 print.txt /*E673* |
3528 | 3530 | E674 print.txt /*E674* |
3529 | 3531 | E675 print.txt /*E675* |
3532 | +E676 options.txt /*E676* | |
3530 | 3533 | E68 pattern.txt /*E68* |
3531 | 3534 | E69 pattern.txt /*E69* |
3532 | 3535 | E70 pattern.txt /*E70* |
@@ -5424,8 +5427,12 @@ | ||
5424 | 5427 | netrw pi_netrw.txt /*netrw* |
5425 | 5428 | netrw-- pi_netrw.txt /*netrw--* |
5426 | 5429 | netrw-D pi_netrw.txt /*netrw-D* |
5430 | +netrw-H pi_netrw.txt /*netrw-H* | |
5431 | +netrw-M pi_netrw.txt /*netrw-M* | |
5432 | +netrw-R pi_netrw.txt /*netrw-R* | |
5427 | 5433 | netrw-activate pi_netrw.txt /*netrw-activate* |
5428 | 5434 | netrw-browse pi_netrw.txt /*netrw-browse* |
5435 | +netrw-browse-cmds pi_netrw.txt /*netrw-browse-cmds* | |
5429 | 5436 | netrw-browse-var pi_netrw.txt /*netrw-browse-var* |
5430 | 5437 | netrw-c-l pi_netrw.txt /*netrw-c-l* |
5431 | 5438 | netrw-cadaver pi_netrw.txt /*netrw-cadaver* |
@@ -5439,9 +5446,9 @@ | ||
5439 | 5446 | netrw-file pi_netrw.txt /*netrw-file* |
5440 | 5447 | netrw-fixup pi_netrw.txt /*netrw-fixup* |
5441 | 5448 | netrw-ftp pi_netrw.txt /*netrw-ftp* |
5442 | -netrw-h pi_netrw.txt /*netrw-h* | |
5443 | 5449 | netrw-help pi_netrw.txt /*netrw-help* |
5444 | 5450 | netrw-history pi_netrw.txt /*netrw-history* |
5451 | +netrw-i pi_netrw.txt /*netrw-i* | |
5445 | 5452 | netrw-list pi_netrw.txt /*netrw-list* |
5446 | 5453 | netrw-list-hack pi_netrw.txt /*netrw-list-hack* |
5447 | 5454 | netrw-move pi_netrw.txt /*netrw-move* |
@@ -1,4 +1,4 @@ | ||
1 | -*todo.txt* For Vim version 7.0aa. Last change: 2004 Jul 12 | |
1 | +*todo.txt* For Vim version 7.0aa. Last change: 2004 Jul 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -30,13 +30,15 @@ | ||
30 | 30 | *known-bugs* |
31 | 31 | -------------------- Known bugs and current work ----------------------- |
32 | 32 | |
33 | -Make aap build script work again. Also with mzscheme | |
33 | +When switching between Aap script and make Vim won't always run. | |
34 | 34 | |
35 | 35 | Mac: Compiling --enable-gui=athena doesn't work. Try to fix without disabling |
36 | -Carbon. Otherwise adjust configure to disable darwin. (raf) | |
36 | +Carbon. Otherwise adjust configure to disable Darwin. (raf) | |
37 | 37 | |
38 | -Mac: "make install" doesn't install. | |
38 | +Mac: "make install" doesn't install. Patch from RAF. | |
39 | 39 | |
40 | +UTF-8 in 'comments' causes wrong indent. Counting bytes instead of char | |
41 | +width? (Nikolai Weibull) | |
40 | 42 | |
41 | 43 | For version 7.0: |
42 | 44 | - Include many PATCHES: |
@@ -282,6 +284,9 @@ | ||
282 | 284 | line. |
283 | 285 | 7 Make ":startinsert" command work directly for functions and scripts? |
284 | 286 | Also make it possible to append (it's difficult at end of line). |
287 | +- When using 'incsearch" CTRL-R CTRL-W gets the word under the cursor, but | |
288 | + the part that already matched is doubled then. Remove the part of the | |
289 | + word that would be doubled. Make it work line CTRL-N in Insert mode. | |
285 | 290 | |
286 | 291 | Vi incompatibility: |
287 | 292 | 8 With undo/redo only marks in the changed lines should be changed. Other |
@@ -1995,6 +2000,8 @@ | ||
1995 | 2000 | CmdEnter - Entering Cmdline mode |
1996 | 2001 | VisualEnter - Entering Visual mode |
1997 | 2002 | *Leave - Leaving a mode (in pair with the above *Enter) |
2003 | + VimLeaveCheck - Before Vim decides to exit, so that it can be cancelled | |
2004 | + when exiting isn't a good idea. | |
1998 | 2005 | CmdUndefined - Like FuncUndefined but for user commands. |
1999 | 2006 | SearchPost - After doing a search command (e.g. to do "M") |
2000 | 2007 | PreDirChanged/PostDirChanged |
@@ -1,4 +1,4 @@ | ||
1 | -*version7.txt* For Vim version 7.0aa. Last change: 2004 Jul 11 | |
1 | +*version7.txt* For Vim version 7.0aa. Last change: 2004 Jul 16 | |
2 | 2 | |
3 | 3 | |
4 | 4 | VIM REFERENCE MANUAL by Bram Moolenaar |
@@ -170,6 +170,10 @@ | ||
170 | 170 | |
171 | 171 | Added "nbsp" in 'listchars'. (David Blanchet) |
172 | 172 | |
173 | +Added the "acwrite" value for the 'buftype' option. This is for a buffer that | |
174 | +doesn not have a name that refers to a file and is written with BufWriteCmd | |
175 | +autocommands. | |
176 | + | |
173 | 177 | For lisp indenting and matching parenthesis: (Sergey Khorev) |
174 | 178 | - square brackets are recognized properly |
175 | 179 | - #\(, #\), #\[ and #\] are recognized as character literals |
@@ -241,4 +245,14 @@ | ||
241 | 245 | Using "@:" to repeat a command line didn't work when it contains control |
242 | 246 | characters. |
243 | 247 | |
248 | +When using file completion for a user command, it would not expand environment | |
249 | +variables like for a regular command with a file argument. | |
250 | + | |
251 | +'cindent': When the argument of a #define looks like a C++ class the next line | |
252 | +is indented too much. | |
253 | + | |
254 | +When 'comments' includes multi-byte characters inserting the middle part and | |
255 | +alignment may go wrong. 'cindent' also suffers from this for right-aligned | |
256 | +items. | |
257 | + | |
244 | 258 | vim:tw=78:ts=8:ft=help:norl: |
@@ -1,10 +1,9 @@ | ||
1 | -" Vim syntax file for the D programming language (version 0.90). | |
1 | +" Vim syntax file for the D programming language (version 0.95). | |
2 | 2 | " |
3 | -" Language: D | |
4 | -" Maintainer: Jason Mills<jmills@cs.mun.ca> | |
5 | -" URL: | |
6 | -" Last Change: 2004 May 21 | |
7 | -" Version: 0.8 | |
3 | +" Language: D | |
4 | +" Maintainer: Jason Mills<jmills@cs.mun.ca> | |
5 | +" Last Change: 2004 Jul 15 | |
6 | +" Version: 0.10 | |
8 | 7 | " |
9 | 8 | " Options: |
10 | 9 | " d_comment_strings - set to highlight strings and numbers in comments |
@@ -30,39 +29,40 @@ | ||
30 | 29 | |
31 | 30 | " Keyword definitions |
32 | 31 | " |
33 | -syn keyword dExternal import module extern | |
34 | -syn keyword dConditional if else switch | |
35 | -syn keyword dBranch goto break continue | |
36 | -syn keyword dRepeat while for do foreach | |
37 | -syn keyword dBoolean true false | |
38 | -syn keyword dConstant null | |
39 | -syn keyword dTypedef alias typedef | |
40 | -syn keyword dStructure template interface class enum struct union | |
41 | -syn keyword dOperator new delete typeof cast align is | |
42 | -syn keyword dOperator this super | |
32 | +syn keyword dExternal import package module extern | |
33 | +syn keyword dConditional if else switch | |
34 | +syn keyword dBranch goto break continue | |
35 | +syn keyword dRepeat while for do foreach | |
36 | +syn keyword dBoolean true false | |
37 | +syn keyword dConstant null | |
38 | +syn keyword dTypedef alias typedef | |
39 | +syn keyword dStructure template interface class enum struct union | |
40 | +syn keyword dOperator new delete typeof typeid cast align is | |
41 | +syn keyword dOperator this super | |
43 | 42 | if exists("d_hl_operator_overload") |
44 | - syn keyword dOpOverload opNeg opCom opPostInc opPostDec opAdd opSub opSub_r | |
45 | - syn keyword dOpOverload opMul opDiv opDiv_r opMod opMod_r opAnd opOr opXor | |
46 | - syn keyword dOpOverload opShl opShl_r opShr opShr_r opUShr opUShr_r opCat | |
47 | - syn keyword dOpOverload opCat_r opEquals opEquals opCmp opCmp opCmp opCmp | |
48 | - syn keyword dOpOverload opAddAssign opSubAssign opMulAssign opDivAssign | |
49 | - syn keyword dOpOverload opModAssign opAndAssign opOrAssign opXorAssign | |
50 | - syn keyword dOpOverload opShlAssign opShrAssign opUShrAssign opCatAssign | |
51 | - syn keyword dOpOverload opIndex opCall opSlice | |
43 | + syn keyword dOpOverload opNeg opCom opPostInc opPostDec opAdd opSub opSub_r | |
44 | + syn keyword dOpOverload opMul opDiv opDiv_r opMod opMod_r opAnd opOr opXor | |
45 | + syn keyword dOpOverload opShl opShl_r opShr opShr_r opUShr opUShr_r opCat | |
46 | + syn keyword dOpOverload opCat_r opEquals opEquals opCmp opCmp opCmp opCmp | |
47 | + syn keyword dOpOverload opAddAssign opSubAssign opMulAssign opDivAssign | |
48 | + syn keyword dOpOverload opModAssign opAndAssign opOrAssign opXorAssign | |
49 | + syn keyword dOpOverload opShlAssign opShrAssign opUShrAssign opCatAssign | |
50 | + syn keyword dOpOverload opIndex opIndexAssign opCall opSlice | |
51 | + syn keyword dOpOverload opAdd_r opMul_r opAnd_r opOr_r opXor_r | |
52 | 52 | endif |
53 | -syn keyword dType ushort int uint long ulong float | |
54 | -syn keyword dType void byte ubyte double bit char wchar ucent cent | |
55 | -syn keyword dType short bool dchar | |
56 | -syn keyword dType real ireal ifloat idouble creal cfloat cdouble | |
57 | -syn keyword dDebug deprecated unittest | |
58 | -syn keyword dExceptions throw try catch finally | |
59 | -syn keyword dScopeDecl public protected private export | |
60 | -syn keyword dStatement version debug return with invariant body | |
61 | -syn keyword dStatement in out inout asm mixin | |
62 | -syn keyword dStatement function delegate | |
63 | -syn keyword dStorageClass auto static override final const abstract volatile | |
64 | -syn keyword dStorageClass synchronized | |
65 | -syn keyword dPragma pragma | |
53 | +syn keyword dType ushort int uint long ulong float | |
54 | +syn keyword dType void byte ubyte double bit char wchar ucent cent | |
55 | +syn keyword dType short bool dchar | |
56 | +syn keyword dType real ireal ifloat idouble creal cfloat cdouble | |
57 | +syn keyword dDebug deprecated unittest | |
58 | +syn keyword dExceptions throw try catch finally | |
59 | +syn keyword dScopeDecl public protected private export | |
60 | +syn keyword dStatement version debug return with invariant body | |
61 | +syn keyword dStatement in out inout asm mixin | |
62 | +syn keyword dStatement function delegate | |
63 | +syn keyword dStorageClass auto static override final const abstract volatile | |
64 | +syn keyword dStorageClass synchronized | |
65 | +syn keyword dPragma pragma | |
66 | 66 | |
67 | 67 | |
68 | 68 | " Assert is a statement and a module name. |
@@ -81,34 +81,34 @@ | ||
81 | 81 | " Labels |
82 | 82 | " |
83 | 83 | " We contain dScopeDecl so public: private: etc. are not highlighted like labels |
84 | -syn match dUserLabel "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=dLabel,dScopeDecl | |
85 | -syn keyword dLabel case default | |
84 | +syn match dUserLabel "^\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\s*:"he=e-1 contains=dLabel,dScopeDecl | |
85 | +syn keyword dLabel case default | |
86 | 86 | |
87 | 87 | " Comments |
88 | 88 | " |
89 | -syn keyword dTodo contained TODO FIXME TEMP XXX | |
90 | -syn match dCommentStar contained "^\s*\*[^/]"me=e-1 | |
91 | -syn match dCommentStar contained "^\s*\*$" | |
92 | -syn match dCommentPlus contained "^\s*+[^/]"me=e-1 | |
93 | -syn match dCommentPlus contained "^\s*+$" | |
89 | +syn keyword dTodo contained TODO FIXME TEMP XXX | |
90 | +syn match dCommentStar contained "^\s*\*[^/]"me=e-1 | |
91 | +syn match dCommentStar contained "^\s*\*$" | |
92 | +syn match dCommentPlus contained "^\s*+[^/]"me=e-1 | |
93 | +syn match dCommentPlus contained "^\s*+$" | |
94 | 94 | if exists("d_comment_strings") |
95 | - syn region dBlockCommentString contained start=+"+ end=+"+ end=+\*/+me=s-1,he=s-1 contains=dCommentStar,dUnicode,dEscSequence,@Spell | |
96 | - syn region dNestedCommentString contained start=+"+ end=+"+ end="+"me=s-1,he=s-1 contains=dCommentPlus,dUnicode,dEscSequence,@Spell | |
97 | - syn region dLineCommentString contained start=+"+ end=+$\|"+ contains=dUnicode,dEscSequence,@Spell | |
98 | - syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell | |
99 | - syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell | |
100 | - syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell | |
95 | + syn region dBlockCommentString contained start=+"+ end=+"+ end=+\*/+me=s-1,he=s-1 contains=dCommentStar,dUnicode,dEscSequence,@Spell | |
96 | + syn region dNestedCommentString contained start=+"+ end=+"+ end="+"me=s-1,he=s-1 contains=dCommentPlus,dUnicode,dEscSequence,@Spell | |
97 | + syn region dLineCommentString contained start=+"+ end=+$\|"+ contains=dUnicode,dEscSequence,@Spell | |
98 | + syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell | |
99 | + syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell | |
100 | + syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell | |
101 | 101 | else |
102 | - syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell | |
103 | - syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell | |
104 | - syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell | |
102 | + syn region dBlockComment start="/\*" end="\*/" contains=dBlockCommentString,dTodo,@Spell | |
103 | + syn region dNestedComment start="/+" end="+/" contains=dNestedComment,dNestedCommentString,dTodo,@Spell | |
104 | + syn match dLineComment "//.*" contains=dLineCommentString,dTodo,@Spell | |
105 | 105 | endif |
106 | 106 | |
107 | -hi link dLineCommentString dBlockCommentString | |
108 | -hi link dBlockCommentString dString | |
109 | -hi link dNestedCommentString dString | |
110 | -hi link dCommentStar dBlockComment | |
111 | -hi link dCommentPlus dNestedComment | |
107 | +hi link dLineCommentString dBlockCommentString | |
108 | +hi link dBlockCommentString dString | |
109 | +hi link dNestedCommentString dString | |
110 | +hi link dCommentStar dBlockComment | |
111 | +hi link dCommentPlus dNestedComment | |
112 | 112 | |
113 | 113 | syn sync minlines=25 |
114 | 114 |
@@ -118,54 +118,54 @@ | ||
118 | 118 | |
119 | 119 | " Escape sequences (oct,specal char,hex,wchar). These are not contained |
120 | 120 | " because they are considered string litterals |
121 | -syn match dEscSequence "\\\(\o\{1,3}\|[\"\\'\\?ntbrfva]\|u\x\{4}\|U\x\{8}\|x\x\x\)" | |
122 | -syn match dCharacter "'[^']*'" contains=dEscSequence,dSpecialCharError | |
123 | -syn match dCharacter "'\\''" contains=dEscSequence | |
124 | -syn match dCharacter "'[^\\]'" | |
121 | +syn match dEscSequence "\\\(\o\{1,3}\|[\"\\'\\?ntbrfva]\|u\x\{4}\|U\x\{8}\|x\x\x\)" | |
122 | +syn match dCharacter "'[^']*'" contains=dEscSequence,dSpecialCharError | |
123 | +syn match dCharacter "'\\''" contains=dEscSequence | |
124 | +syn match dCharacter "'[^\\]'" | |
125 | 125 | |
126 | 126 | " Unicode characters |
127 | 127 | " |
128 | -syn match dUnicode "\\u\d\{4\}" | |
128 | +syn match dUnicode "\\u\d\{4\}" | |
129 | 129 | |
130 | 130 | " String. |
131 | 131 | " |
132 | -syn region dString start=+"+ end=+"+ contains=dEscSequence,@Spell | |
133 | -syn region dRawString start=+`+ skip=+\\`+ end=+`+ contains=@Spell | |
134 | -syn region dRawString start=+r"+ skip=+\\"+ end=+"+ contains=@Spell | |
135 | -syn region dHexString start=+x"+ skip=+\\"+ end=+"+ | |
132 | +syn region dString start=+"+ end=+"+ contains=dEscSequence,@Spell | |
133 | +syn region dRawString start=+`+ skip=+\\`+ end=+`+ contains=@Spell | |
134 | +syn region dRawString start=+r"+ skip=+\\"+ end=+"+ contains=@Spell | |
135 | +syn region dHexString start=+x"+ skip=+\\"+ end=+"+ | |
136 | 136 | |
137 | 137 | " Numbers |
138 | 138 | " |
139 | 139 | syn case ignore |
140 | -syn match dInt display "\<\d[0-9_]*\(u\=l\=\|l\=u\=\)\>" | |
140 | +syn match dInt display "\<\d[0-9_]*\(u\=l\=\|l\=u\=\)\>" | |
141 | 141 | " Hex number |
142 | -syn match dHex display "\<0x[0-9a-f_]\+\(u\=l\=\|l\=u\=\)\>" | |
143 | -syn match dHex display "\<\x[0-9a-f_]*h\(u\=l\=\|l\=u\=\)\>" | |
142 | +syn match dHex display "\<0x[0-9a-f_]\+\(u\=l\=\|l\=u\=\)\>" | |
143 | +syn match dHex display "\<\x[0-9a-f_]*h\(u\=l\=\|l\=u\=\)\>" | |
144 | 144 | " Flag the first zero of an octal number as something special |
145 | -syn match dOctal display "\<0[0-7_]\+\(u\=l\=\|l\=u\=\)\>" contains=cOctalZero | |
146 | -syn match dOctalZero display contained "\<0" | |
145 | +syn match dOctal display "\<0[0-7_]\+\(u\=l\=\|l\=u\=\)\>" contains=cOctalZero | |
146 | +syn match dOctalZero display contained "\<0" | |
147 | 147 | |
148 | 148 | "floating point without the dot |
149 | -syn match dFloat display "\<\d[0-9_]*\(fi\=\|l\=i\)\>" | |
149 | +syn match dFloat display "\<\d[0-9_]*\(fi\=\|l\=i\)\>" | |
150 | 150 | "floating point number, with dot, optional exponent |
151 | -syn match dFloat display "\<\d[0-9_]*\.[0-9_]*\(e[-+]\=[0-9_]\+\)\=[fl]\=i\=" | |
151 | +syn match dFloat display "\<\d[0-9_]*\.[0-9_]*\(e[-+]\=[0-9_]\+\)\=[fl]\=i\=" | |
152 | 152 | "floating point number, starting with a dot, optional exponent |
153 | -syn match dFloat display "\(\.[0-9_]\+\)\(e[-+]\=[0-9_]\+\)\=[fl]\=i\=\>" | |
153 | +syn match dFloat display "\(\.[0-9_]\+\)\(e[-+]\=[0-9_]\+\)\=[fl]\=i\=\>" | |
154 | 154 | "floating point number, without dot, with exponent |
155 | -"syn match dFloat display "\<\d\+e[-+]\=\d\+[fl]\=\>" | |
156 | -syn match dFloat display "\<\d[0-9_]*e[-+]\=[0-9_]\+[fl]\=\>" | |
155 | +"syn match dFloat display "\<\d\+e[-+]\=\d\+[fl]\=\>" | |
156 | +syn match dFloat display "\<\d[0-9_]*e[-+]\=[0-9_]\+[fl]\=\>" | |
157 | 157 | |
158 | 158 | "floating point without the dot |
159 | -syn match dHexFloat display "\<0x\x\+\(fi\=\|l\=i\)\>" | |
159 | +syn match dHexFloat display "\<0x\x\+\(fi\=\|l\=i\)\>" | |
160 | 160 | "floating point number, with dot, optional exponent |
161 | -syn match dHexFloat display "\<0x\x\+\.\x*\(p[-+]\=\x\+\)\=[fl]\=i\=" | |
161 | +syn match dHexFloat display "\<0x\x\+\.\x*\(p[-+]\=\x\+\)\=[fl]\=i\=" | |
162 | 162 | "floating point number, without dot, with exponent |
163 | -syn match dHexFloat display "\<0x\x\+p[-+]\=\x\+[fl]\=\>" | |
163 | +syn match dHexFloat display "\<0x\x\+p[-+]\=\x\+[fl]\=\>" | |
164 | 164 | |
165 | 165 | " binary numbers |
166 | -syn match dBinary display "\<0b[01_]\+\>" | |
166 | +syn match dBinary display "\<0b[01_]\+\>" | |
167 | 167 | " flag an octal number with wrong digits |
168 | -syn match dOctalError display "0\o*[89]\d*" | |
168 | +syn match dOctalError display "0\o*[89]\d*" | |
169 | 169 | syn case match |
170 | 170 | |
171 | 171 | " Pragma (preprocessor) support |
@@ -1,7 +1,8 @@ | ||
1 | 1 | " Vim syntax file |
2 | -" Language: Inno Setup File (iss file) and My InnoSetup extension | |
3 | -" Maintainer: Dominique Stéphan (dominique@mggen.com) | |
4 | -" Last change: 2004 July 5 | |
2 | +" Language: Inno Setup File (iss file) and My InnoSetup extension | |
3 | +" Maintainer: Jason Mills (jmills@cs.mun.ca) | |
4 | +" Previous Maintainer: Dominique Stéphan (dominique@mggen.com) | |
5 | +" Last Change: 2004 Jul 13 | |
5 | 6 | |
6 | 7 | " For version 5.x: Clear all syntax items |
7 | 8 | " For version 6.x: Quit when a syntax file was already loaded |
@@ -14,37 +15,40 @@ | ||
14 | 15 | " shut case off |
15 | 16 | syn case ignore |
16 | 17 | |
18 | +" Preprocessor | |
19 | +syn region issPreProc start="^\s*#" end="$" | |
20 | + | |
17 | 21 | " Section |
18 | -syn region issHeader start="\[" end="\]" | |
22 | +syn region issHeader start="\[" end="\]" | |
19 | 23 | |
20 | 24 | " Label in the [Setup] Section |
21 | -syn match issLabel "^[^=]\+=" | |
25 | +syn match issLabel "^[^=]\+=" | |
22 | 26 | |
23 | 27 | " URL |
24 | -syn match issURL "http[s]\=:\/\/.*$" | |
28 | +syn match issURL "http[s]\=:\/\/.*$" | |
25 | 29 | |
26 | -" syn match issName "[^: ]\+:" | |
27 | -syn match issName "Name:" | |
28 | -syn match issName "MinVersion:\|OnlyBelowVersion:\|Languages:" | |
29 | -syn match issName "Source:\|DestDir:\|DestName:\|CopyMode:" | |
30 | -syn match issName "Attribs:\|Permissions:\|FontInstall:\|Flags:" | |
31 | -syn match issName "FileName:\|Parameters:\|WorkingDir:\|HotKey:\|Comment:" | |
32 | -syn match issName "IconFilename:\|IconIndex:" | |
33 | -syn match issName "Section:\|Key:\|String:" | |
34 | -syn match issName "Root:\|SubKey:\|ValueType:\|ValueName:\|ValueData:" | |
35 | -syn match issName "RunOnceId:" | |
36 | -syn match issName "Type:" | |
37 | -syn match issName "Components:\|Description:\|GroupDescription:\|Types:\|ExtraDiskSpaceRequired:" | |
38 | -syn match issName "StatusMsg:\|RunOnceId:\|Tasks:" | |
39 | -syn match issName "MessagesFile:\|LicenseFile:\|InfoBeforeFile:\|InfoAfterFile:" | |
30 | +" syn match issName "[^: ]\+:" | |
31 | +syn match issName "Name:" | |
32 | +syn match issName "MinVersion:\|OnlyBelowVersion:\|Languages:" | |
33 | +syn match issName "Source:\|DestDir:\|DestName:\|CopyMode:" | |
34 | +syn match issName "Attribs:\|Permissions:\|FontInstall:\|Flags:" | |
35 | +syn match issName "FileName:\|Parameters:\|WorkingDir:\|HotKey:\|Comment:" | |
36 | +syn match issName "IconFilename:\|IconIndex:" | |
37 | +syn match issName "Section:\|Key:\|String:" | |
38 | +syn match issName "Root:\|SubKey:\|ValueType:\|ValueName:\|ValueData:" | |
39 | +syn match issName "RunOnceId:" | |
40 | +syn match issName "Type:" | |
41 | +syn match issName "Components:\|Description:\|GroupDescription:\|Types:\|ExtraDiskSpaceRequired:" | |
42 | +syn match issName "StatusMsg:\|RunOnceId:\|Tasks:" | |
43 | +syn match issName "MessagesFile:\|LicenseFile:\|InfoBeforeFile:\|InfoAfterFile:" | |
40 | 44 | |
41 | -syn match issComment "^;.*$" | |
45 | +syn match issComment "^;.*$" | |
42 | 46 | |
43 | 47 | " folder constant |
44 | -syn match issFolder "{[^{]*}" | |
48 | +syn match issFolder "{[^{]*}" | |
45 | 49 | |
46 | 50 | " string |
47 | -syn region issString start=+"+ end=+"+ contains=issFolder | |
51 | +syn region issString start=+"+ end=+"+ contains=issFolder | |
48 | 52 | |
49 | 53 | " [Dirs] |
50 | 54 | syn keyword issDirsFlags deleteafterinstall uninsalwaysuninstall uninsneveruninstall |
@@ -104,31 +108,30 @@ | ||
104 | 108 | endif |
105 | 109 | |
106 | 110 | " The default methods for highlighting. Can be overridden later |
107 | - HiLink issHeader Special | |
108 | - HiLink issComment Comment | |
109 | - HiLink issLabel Type | |
110 | - HiLink issName Type | |
111 | - HiLink issFolder Special | |
112 | - HiLink issString String | |
113 | - HiLink issValue String | |
114 | - HiLink issURL Include | |
111 | + HiLink issHeader Special | |
112 | + HiLink issComment Comment | |
113 | + HiLink issLabel Type | |
114 | + HiLink issName Type | |
115 | + HiLink issFolder Special | |
116 | + HiLink issString String | |
117 | + HiLink issValue String | |
118 | + HiLink issURL Include | |
119 | + HiLink issPreProc PreProc | |
115 | 120 | |
116 | - HiLink issDirsFlags Keyword | |
117 | - HiLink issFilesCopyMode Keyword | |
118 | - HiLink issFilesAttribs Keyword | |
119 | - HiLink issFilesPermissions Keyword | |
120 | - HiLink issFilesFlags Keyword | |
121 | - HiLink issIconsFlags Keyword | |
122 | - HiLink issINIFlags Keyword | |
123 | - HiLink issRegRootKey Keyword | |
124 | - HiLink issRegValueType Keyword | |
125 | - HiLink issRegFlags Keyword | |
126 | - HiLink issRunFlags Keyword | |
127 | - HiLink issTypesFlags Keyword | |
128 | - HiLink issComponentsFlags Keyword | |
129 | - HiLink issInstallDeleteType Keyword | |
130 | - HiLink issTasksFlags Keyword | |
131 | - | |
121 | + HiLink issDirsFlags Keyword | |
122 | + HiLink issFilesCopyMode Keyword | |
123 | + HiLink issFilesAttribs Keyword | |
124 | + HiLink issFilesFlags Keyword | |
125 | + HiLink issIconsFlags Keyword | |
126 | + HiLink issINIFlags Keyword | |
127 | + HiLink issRegRootKey Keyword | |
128 | + HiLink issRegValueType Keyword | |
129 | + HiLink issRegFlags Keyword | |
130 | + HiLink issRunFlags Keyword | |
131 | + HiLink issTypesFlags Keyword | |
132 | + HiLink issComponentsFlags Keyword | |
133 | + HiLink issInstallDeleteType Keyword | |
134 | + HiLink issTasksFlags Keyword | |
132 | 135 | |
133 | 136 | delcommand HiLink |
134 | 137 | endif |
@@ -1,11 +1,14 @@ | ||
1 | 1 | " Vim syntax file |
2 | 2 | " Language: Scheme (R5RS) |
3 | -" Maintainer: Dirk van Deun <dirk@igwe.vub.ac.be> | |
4 | -" Last Change: April 30, 1998 | |
3 | +" Last Change: July 14, 2004 | |
4 | +" Maintainer: Sergey Khorev <iamphet@nm.ru> | |
5 | +" Original author: Dirk van Deun <dirk@igwe.vub.ac.be> | |
5 | 6 | |
6 | 7 | " This script incorrectly recognizes some junk input as numerals: |
7 | 8 | " parsing the complete system of Scheme numerals using the pattern |
8 | 9 | " language is practically impossible: I did a lax approximation. |
10 | + | |
11 | +" MzScheme extensions can be activated with setting is_mzscheme variable | |
9 | 12 | |
10 | 13 | " Suggestions and bug reports are solicited by the author. |
11 | 14 |
@@ -23,12 +26,12 @@ | ||
23 | 26 | |
24 | 27 | " Fascist highlighting: everything that doesn't fit the rules is an error... |
25 | 28 | |
26 | -syn match schemeError oneline ![^ \t()";]*! | |
29 | +syn match schemeError oneline ![^ \t()\[\]";]*! | |
27 | 30 | syn match schemeError oneline ")" |
28 | 31 | |
29 | 32 | " Quoted and backquoted stuff |
30 | 33 | |
31 | -syn region schemeQuoted matchgroup=Delimiter start="['`]" end=![ \t()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
34 | +syn region schemeQuoted matchgroup=Delimiter start="['`]" end=![ \t()\[\]";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
32 | 35 | |
33 | 36 | syn region schemeQuoted matchgroup=Delimiter start="['`](" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc |
34 | 37 | syn region schemeQuoted matchgroup=Delimiter start="['`]#(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc |
@@ -36,15 +39,26 @@ | ||
36 | 39 | syn region schemeStrucRestricted matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc |
37 | 40 | syn region schemeStrucRestricted matchgroup=Delimiter start="#(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc |
38 | 41 | |
39 | -syn region schemeUnquote matchgroup=Delimiter start="," end=![ \t()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
40 | -syn region schemeUnquote matchgroup=Delimiter start=",@" end=![ \t()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
42 | +" Popular Scheme extension: | |
43 | +" using [] as well as () | |
44 | +syn region schemeStrucRestricted matchgroup=Delimiter start="\[" matchgroup=Delimiter end="\]" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
45 | +syn region schemeStrucRestricted matchgroup=Delimiter start="#\[" matchgroup=Delimiter end="\]" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
41 | 46 | |
42 | -syn region schemeUnquote matchgroup=Delimiter start=",(" end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
43 | -syn region schemeUnquote matchgroup=Delimiter start=",@(" end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
47 | +syn region schemeUnquote matchgroup=Delimiter start="," end=![ \t\[\]()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
48 | +syn region schemeUnquote matchgroup=Delimiter start=",@" end=![ \t\[\]()";]!me=e-1 contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
49 | + | |
50 | +syn region schemeUnquote matchgroup=Delimiter start=",(" end=")" contains=ALL | |
51 | +syn region schemeUnquote matchgroup=Delimiter start=",@(" end=")" contains=ALL | |
44 | 52 | |
45 | 53 | syn region schemeUnquote matchgroup=Delimiter start=",#(" end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc |
46 | 54 | syn region schemeUnquote matchgroup=Delimiter start=",@#(" end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc |
47 | 55 | |
56 | +syn region schemeUnquote matchgroup=Delimiter start=",\[" end="\]" contains=ALL | |
57 | +syn region schemeUnquote matchgroup=Delimiter start=",@\[" end="\]" contains=ALL | |
58 | + | |
59 | +syn region schemeUnquote matchgroup=Delimiter start=",#\[" end="\]" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
60 | +syn region schemeUnquote matchgroup=Delimiter start=",@#\[" end="\]" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc | |
61 | + | |
48 | 62 | " R5RS Scheme Functions and Syntax: |
49 | 63 | |
50 | 64 | if version < 600 |
@@ -96,63 +110,126 @@ | ||
96 | 110 | syn keyword schemeFunc scheme-report-environment null-environment |
97 | 111 | syn keyword schemeFunc interaction-environment |
98 | 112 | |
99 | -" Writing out the complete description of Scheme numerals without | |
100 | -" using variables is a day's work for a trained secretary... | |
101 | -" This is a useful lax approximation: | |
102 | - | |
103 | -syn match schemeNumber oneline "[-#+0-9.][-#+/0-9a-f@i.boxesfdl]*" | |
104 | -syn match schemeError oneline ![-#+0-9.][-#+/0-9a-f@i.boxesfdl]*[^-#+/0-9a-f@i.boxesfdl \t()";][^ \t()";]*! | |
105 | - | |
106 | -syn match schemeOther oneline ![+-][ \t()";]!me=e-1 | |
107 | -syn match schemeOther oneline ![+-]$! | |
108 | 113 | " ... so that a single + or -, inside a quoted context, would not be |
109 | 114 | " interpreted as a number (outside such contexts, it's a schemeFunc) |
110 | 115 | |
111 | -syn match schemeDelimiter oneline !\.[ \t()";]!me=e-1 | |
116 | +syn match schemeDelimiter oneline !\.[ \t\[\]()";]!me=e-1 | |
112 | 117 | syn match schemeDelimiter oneline !\.$! |
113 | 118 | " ... and a single dot is not a number but a delimiter |
114 | 119 | |
115 | -" Simple literals: | |
116 | - | |
117 | -syn match schemeBoolean oneline "#[tf]" | |
118 | -syn match schemeError oneline !#[tf][^ \t()";]\+! | |
119 | - | |
120 | -syn match schemeChar oneline "#\\" | |
121 | -syn match schemeChar oneline "#\\." | |
122 | -syn match schemeError oneline !#\\.[^ \t()";]\+! | |
123 | -syn match schemeChar oneline "#\\space" | |
124 | -syn match schemeError oneline !#\\space[^ \t()";]\+! | |
125 | -syn match schemeChar oneline "#\\newline" | |
126 | -syn match schemeError oneline !#\\newline[^ \t()";]\+! | |
127 | - | |
128 | 120 | " This keeps all other stuff unhighlighted, except *stuff* and <stuff>: |
129 | 121 | |
130 | -syn match schemeOther oneline ,[a-z!$%&*/:<=>?^_~][-a-z!$%&*/:<=>?^_~0-9+.@]*, | |
131 | -syn match schemeError oneline ,[a-z!$%&*/:<=>?^_~][-a-z!$%&*/:<=>?^_~0-9+.@]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t()";]\+[^ \t()";]*, | |
122 | +syn match schemeOther oneline ,[a-z!$%&*/:<=>?^_~+@#%-][-a-z!$%&*/:<=>?^_~0-9+.@#%]*, | |
123 | +syn match schemeError oneline ,[a-z!$%&*/:<=>?^_~+@#%-][-a-z!$%&*/:<=>?^_~0-9+.@#%]*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*, | |
132 | 124 | |
133 | 125 | syn match schemeOther oneline "\.\.\." |
134 | -syn match schemeError oneline !\.\.\.[^ \t()";]\+! | |
126 | +syn match schemeError oneline !\.\.\.[^ \t\[\]()";]\+! | |
135 | 127 | " ... a special identifier |
136 | 128 | |
137 | -syn match schemeConstant oneline ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[ \t()";],me=e-1 | |
129 | +syn match schemeConstant oneline ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[ \t\[\]()";],me=e-1 | |
138 | 130 | syn match schemeConstant oneline ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*$, |
139 | -syn match schemeError oneline ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t()";]\+[^ \t()";]*, | |
131 | +syn match schemeError oneline ,\*[-a-z!$%&*/:<=>?^_~0-9+.@]*\*[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*, | |
140 | 132 | |
141 | -syn match schemeConstant oneline ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[ \t()";],me=e-1 | |
133 | +syn match schemeConstant oneline ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[ \t\[\]()";],me=e-1 | |
142 | 134 | syn match schemeConstant oneline ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>$, |
143 | -syn match schemeError oneline ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t()";]\+[^ \t()";]*, | |
135 | +syn match schemeError oneline ,<[-a-z!$%&*/:<=>?^_~0-9+.@]*>[^-a-z!$%&*/:<=>?^_~0-9+.@ \t\[\]()";]\+[^ \t\[\]()";]*, | |
144 | 136 | |
145 | 137 | " Non-quoted lists, and strings: |
146 | 138 | |
147 | 139 | syn region schemeStruc matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALL |
148 | 140 | syn region schemeStruc matchgroup=Delimiter start="#(" matchgroup=Delimiter end=")" contains=ALL |
149 | 141 | |
142 | +syn region schemeStruc matchgroup=Delimiter start="\[" matchgroup=Delimiter end="\]" contains=ALL | |
143 | +syn region schemeStruc matchgroup=Delimiter start="#\[" matchgroup=Delimiter end="\]" contains=ALL | |
144 | + | |
145 | +" Simple literals: | |
150 | 146 | syn region schemeString start=+"+ skip=+\\[\\"]+ end=+"+ |
151 | 147 | |
152 | 148 | " Comments: |
153 | 149 | |
154 | 150 | syn match schemeComment ";.*$" |
155 | 151 | |
152 | + | |
153 | +" Writing out the complete description of Scheme numerals without | |
154 | +" using variables is a day's work for a trained secretary... | |
155 | + | |
156 | +syn match schemeOther oneline ![+-][ \t\[\]()";]!me=e-1 | |
157 | +syn match schemeOther oneline ![+-]$! | |
158 | +" | |
159 | +" This is a useful lax approximation: | |
160 | +syn match schemeNumber oneline "[-#+0-9.][-#+/0-9a-f@i.boxesfdl]*" | |
161 | +syn match schemeError oneline ![-#+0-9.][-#+/0-9a-f@i.boxesfdl]*[^-#+/0-9a-f@i.boxesfdl \t\[\]()";][^ \t\[\]()";]*! | |
162 | + | |
163 | +syn match schemeBoolean oneline "#[tf]" | |
164 | +syn match schemeError oneline !#[tf][^ \t\[\]()";]\+! | |
165 | + | |
166 | +syn match schemeChar oneline "#\\" | |
167 | +syn match schemeChar oneline "#\\." | |
168 | +syn match schemeError oneline !#\\.[^ \t\[\]()";]\+! | |
169 | +syn match schemeChar oneline "#\\space" | |
170 | +syn match schemeError oneline !#\\space[^ \t\[\]()";]\+! | |
171 | +syn match schemeChar oneline "#\\newline" | |
172 | +syn match schemeError oneline !#\\newline[^ \t\[\]()";]\+! | |
173 | + | |
174 | +if exists("b:is_mzscheme") || exists("is_mzscheme") | |
175 | + " MzScheme extensions added by Sergey Khorev | |
176 | + " multiline comment | |
177 | + syntax region schemeMultilineComment start=/#|/ end=/|#/ | |
178 | + " #%xxx are the special MzScheme identifiers | |
179 | + syn match schemeOther oneline "#%[-a-z!$%&*/:<=>?^_~0-9+.@#%]\+" | |
180 | + " anything limited by |'s is identifier | |
181 | + syn match schemeOther oneline "|[^|]\+|" | |
182 | + | |
183 | + syn match schemeChar oneline "#\\return" | |
184 | + | |
185 | + " Modules require stmt | |
186 | + syn keyword schemeExtSyntax module require dynamic-require lib prefix all-except prefix-all-except rename | |
187 | + " modules provide stmt | |
188 | + syn keyword schemeExtSyntax provide struct all-from all-from-except all-defined all-defined-except | |
189 | + " Other from MzScheme | |
190 | + syn keyword schemeExtSyntax with-handlers when unless instantiate define-struct case-lambda syntax-case | |
191 | + syn keyword schemeExtSyntax free-identifier=? bound-identifier=? module-identifier=? syntax-object->datum | |
192 | + syn keyword schemeExtSyntax datum->syntax-object | |
193 | + syn keyword schemeExtSyntax let-values let*-values letrec-values set!-values fluid-let parameterize begin0 | |
194 | + syn keyword schemeExtSyntax error raise opt-lambda define-values unit unit/sig define-signature | |
195 | + syn keyword schemeExtSyntax invoke-unit/sig define-values/invoke-unit/sig compound-unit/sig import export | |
196 | + syn keyword schemeExtSyntax link syntax quasisyntax unsyntax with-syntax | |
197 | + hi def link schemeExtSyntax Type | |
198 | + | |
199 | + syn keyword schemeExtFunc format system-type current-extension-compiler current-extension-linker | |
200 | + syn keyword schemeExtFunc use-standard-linker use-standard-compiler | |
201 | + syn keyword schemeExtFunc find-executable-path append-object-suffix append-extension-suffix | |
202 | + syn keyword schemeExtFunc current-library-collection-paths current-extension-compiler-flags make-parameter | |
203 | + syn keyword schemeExtFunc current-directory build-path normalize-path current-extension-linker-flags | |
204 | + syn keyword schemeExtFunc file-exists? directory-exists? delete-directory/files delete-directory delete-file | |
205 | + syn keyword schemeExtFunc system compile-file system-library-subpath getenv putenv current-standard-link-libraries | |
206 | + syn keyword schemeExtFunc remove* file-size find-files fold-files directory-list shell-execute split-path | |
207 | + syn keyword schemeExtFunc current-error-port process/ports process printf fprintf open-input-string open-output-string | |
208 | + syn keyword schemeExtFunc get-output-string | |
209 | + " exceptions | |
210 | + syn keyword schemeExtFunc exn exn:application:arity exn:application:continuation exn:application:fprintf:mismatch | |
211 | + syn keyword schemeExtFunc exn:application:mismatch exn:application:type exn:application:mismatch exn:break exn:i/o:filesystem exn:i/o:port | |
212 | + syn keyword schemeExtFunc exn:i/o:port:closed exn:i/o:tcp exn:i/o:udp exn:misc exn:misc:application exn:misc:unsupported exn:module exn:read | |
213 | + syn keyword schemeExtFunc exn:read:non-char exn:special-comment exn:syntax exn:thread exn:user exn:variable exn:application:mismatch | |
214 | + syn keyword schemeExtFunc exn? exn:application:arity? exn:application:continuation? exn:application:fprintf:mismatch? exn:application:mismatch? | |
215 | + syn keyword schemeExtFunc exn:application:type? exn:application:mismatch? exn:break? exn:i/o:filesystem? exn:i/o:port? exn:i/o:port:closed? | |
216 | + syn keyword schemeExtFunc exn:i/o:tcp? exn:i/o:udp? exn:misc? exn:misc:application? exn:misc:unsupported? exn:module? exn:read? exn:read:non-char? | |
217 | + syn keyword schemeExtFunc exn:special-comment? exn:syntax? exn:thread? exn:user? exn:variable? exn:application:mismatch? | |
218 | + " Command-line parsing | |
219 | + syn keyword schemeExtFunc command-line current-command-line-arguments once-any help-labels multi once-each | |
220 | + hi def link schemeExtFunc PreProc | |
221 | + | |
222 | + " syntax quoting, unquoting and quasiquotation | |
223 | + syn region schemeUnquote matchgroup=Delimiter start="#," end=![ \t\[\]()";]!me=e-1 contains=ALL | |
224 | + syn region schemeUnquote matchgroup=Delimiter start="#,@" end=![ \t\[\]()";]!me=e-1 contains=ALL | |
225 | + syn region schemeUnquote matchgroup=Delimiter start="#,(" end=")" contains=ALL | |
226 | + syn region schemeUnquote matchgroup=Delimiter start="#,@(" end=")" contains=ALL | |
227 | + syn region schemeUnquote matchgroup=Delimiter start="#,\[" end="\]" contains=ALL | |
228 | + syn region schemeUnquote matchgroup=Delimiter start="#,@\[" end="\]" contains=ALL | |
229 | + syn region schemeQuoted matchgroup=Delimiter start="#['`]" end=![ \t()\[\]";]!me=e-1 contains=ALL | |
230 | + syn region schemeQuoted matchgroup=Delimiter start="#['`](" matchgroup=Delimiter end=")" contains=ALL | |
231 | +endif | |
232 | + | |
156 | 233 | " Synchronization and the wrapping up... |
157 | 234 | |
158 | 235 | syn sync match matchPlace grouphere NONE "^[^ \t]" |
@@ -181,6 +258,7 @@ | ||
181 | 258 | HiLink schemeConstant Constant |
182 | 259 | |
183 | 260 | HiLink schemeComment Comment |
261 | + HiLink schemeMultilineComment Comment | |
184 | 262 | HiLink schemeError Error |
185 | 263 | |
186 | 264 | delcommand HiLink |
@@ -1661,6 +1661,9 @@ | ||
1661 | 1661 | MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme" |
1662 | 1662 | if test "$GCC" = yes; then |
1663 | 1663 | MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" |
1664 | + elif test "`(uname) 2>/dev/null`" = SunOS && | |
1665 | + uname -r | grep '^5' >/dev/null; then | |
1666 | + MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" | |
1664 | 1667 | fi |
1665 | 1668 | fi |
1666 | 1669 | MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \ |
@@ -1682,7 +1685,7 @@ | ||
1682 | 1685 | |
1683 | 1686 | |
1684 | 1687 | echo $ac_n "checking --enable-perlinterp argument""... $ac_c" 1>&6 |
1685 | -echo "configure:1686: checking --enable-perlinterp argument" >&5 | |
1688 | +echo "configure:1689: checking --enable-perlinterp argument" >&5 | |
1686 | 1689 | # Check whether --enable-perlinterp or --disable-perlinterp was given. |
1687 | 1690 | if test "${enable_perlinterp+set}" = set; then |
1688 | 1691 | enableval="$enable_perlinterp" |
@@ -1697,7 +1700,7 @@ | ||
1697 | 1700 | # Extract the first word of "perl", so it can be a program name with args. |
1698 | 1701 | set dummy perl; ac_word=$2 |
1699 | 1702 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
1700 | -echo "configure:1701: checking for $ac_word" >&5 | |
1703 | +echo "configure:1704: checking for $ac_word" >&5 | |
1701 | 1704 | if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_perl'+set}'`\" = set"; then |
1702 | 1705 | echo $ac_n "(cached) $ac_c" 1>&6 |
1703 | 1706 | else |
@@ -1731,7 +1734,7 @@ | ||
1731 | 1734 | |
1732 | 1735 | if test "X$vi_cv_path_perl" != "X"; then |
1733 | 1736 | echo $ac_n "checking Perl version""... $ac_c" 1>&6 |
1734 | -echo "configure:1735: checking Perl version" >&5 | |
1737 | +echo "configure:1738: checking Perl version" >&5 | |
1735 | 1738 | if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then |
1736 | 1739 | eval `$vi_cv_path_perl -V:usethreads` |
1737 | 1740 | if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then |
@@ -1767,7 +1770,7 @@ | ||
1767 | 1770 | -e 'ccdlflags' | sed -e 's/-bE:perl.exp//'` |
1768 | 1771 | |
1769 | 1772 | echo $ac_n "checking if compile and link flags for Perl are sane""... $ac_c" 1>&6 |
1770 | -echo "configure:1771: checking if compile and link flags for Perl are sane" >&5 | |
1773 | +echo "configure:1774: checking if compile and link flags for Perl are sane" >&5 | |
1771 | 1774 | cflags_save=$CFLAGS |
1772 | 1775 | libs_save=$LIBS |
1773 | 1776 | ldflags_save=$LDFLAGS |
@@ -1775,14 +1778,14 @@ | ||
1775 | 1778 | LIBS="$LIBS $perllibs" |
1776 | 1779 | LDFLAGS="$perlldflags $LDFLAGS" |
1777 | 1780 | cat > conftest.$ac_ext <<EOF |
1778 | -#line 1779 "configure" | |
1781 | +#line 1782 "configure" | |
1779 | 1782 | #include "confdefs.h" |
1780 | 1783 | |
1781 | 1784 | int main() { |
1782 | 1785 | |
1783 | 1786 | ; return 0; } |
1784 | 1787 | EOF |
1785 | -if { (eval echo configure:1786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1788 | +if { (eval echo configure:1789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
1786 | 1789 | rm -rf conftest* |
1787 | 1790 | echo "$ac_t""yes" 1>&6; perl_ok=yes |
1788 | 1791 | else |
@@ -1845,7 +1848,7 @@ | ||
1845 | 1848 | |
1846 | 1849 | |
1847 | 1850 | echo $ac_n "checking --enable-pythoninterp argument""... $ac_c" 1>&6 |
1848 | -echo "configure:1849: checking --enable-pythoninterp argument" >&5 | |
1851 | +echo "configure:1852: checking --enable-pythoninterp argument" >&5 | |
1849 | 1852 | # Check whether --enable-pythoninterp or --disable-pythoninterp was given. |
1850 | 1853 | if test "${enable_pythoninterp+set}" = set; then |
1851 | 1854 | enableval="$enable_pythoninterp" |
@@ -1859,7 +1862,7 @@ | ||
1859 | 1862 | # Extract the first word of "python", so it can be a program name with args. |
1860 | 1863 | set dummy python; ac_word=$2 |
1861 | 1864 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
1862 | -echo "configure:1863: checking for $ac_word" >&5 | |
1865 | +echo "configure:1866: checking for $ac_word" >&5 | |
1863 | 1866 | if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_python'+set}'`\" = set"; then |
1864 | 1867 | echo $ac_n "(cached) $ac_c" 1>&6 |
1865 | 1868 | else |
@@ -1894,7 +1897,7 @@ | ||
1894 | 1897 | if test "X$vi_cv_path_python" != "X"; then |
1895 | 1898 | |
1896 | 1899 | echo $ac_n "checking Python version""... $ac_c" 1>&6 |
1897 | -echo "configure:1898: checking Python version" >&5 | |
1900 | +echo "configure:1901: checking Python version" >&5 | |
1898 | 1901 | if eval "test \"`echo '$''{'vi_cv_var_python_version'+set}'`\" = set"; then |
1899 | 1902 | echo $ac_n "(cached) $ac_c" 1>&6 |
1900 | 1903 | else |
@@ -1906,14 +1909,14 @@ | ||
1906 | 1909 | echo "$ac_t""$vi_cv_var_python_version" 1>&6 |
1907 | 1910 | |
1908 | 1911 | echo $ac_n "checking Python is 1.4 or better""... $ac_c" 1>&6 |
1909 | -echo "configure:1910: checking Python is 1.4 or better" >&5 | |
1912 | +echo "configure:1913: checking Python is 1.4 or better" >&5 | |
1910 | 1913 | if ${vi_cv_path_python} -c \ |
1911 | 1914 | "import sys; sys.exit(${vi_cv_var_python_version} < 1.4)" |
1912 | 1915 | then |
1913 | 1916 | echo "$ac_t""yep" 1>&6 |
1914 | 1917 | |
1915 | 1918 | echo $ac_n "checking Python's install prefix""... $ac_c" 1>&6 |
1916 | -echo "configure:1917: checking Python's install prefix" >&5 | |
1919 | +echo "configure:1920: checking Python's install prefix" >&5 | |
1917 | 1920 | if eval "test \"`echo '$''{'vi_cv_path_python_pfx'+set}'`\" = set"; then |
1918 | 1921 | echo $ac_n "(cached) $ac_c" 1>&6 |
1919 | 1922 | else |
@@ -1925,7 +1928,7 @@ | ||
1925 | 1928 | echo "$ac_t""$vi_cv_path_python_pfx" 1>&6 |
1926 | 1929 | |
1927 | 1930 | echo $ac_n "checking Python's execution prefix""... $ac_c" 1>&6 |
1928 | -echo "configure:1929: checking Python's execution prefix" >&5 | |
1931 | +echo "configure:1932: checking Python's execution prefix" >&5 | |
1929 | 1932 | if eval "test \"`echo '$''{'vi_cv_path_python_epfx'+set}'`\" = set"; then |
1930 | 1933 | echo $ac_n "(cached) $ac_c" 1>&6 |
1931 | 1934 | else |
@@ -1956,7 +1959,7 @@ | ||
1956 | 1959 | |
1957 | 1960 | |
1958 | 1961 | echo $ac_n "checking Python's configuration directory""... $ac_c" 1>&6 |
1959 | -echo "configure:1960: checking Python's configuration directory" >&5 | |
1962 | +echo "configure:1963: checking Python's configuration directory" >&5 | |
1960 | 1963 | if eval "test \"`echo '$''{'vi_cv_path_python_conf'+set}'`\" = set"; then |
1961 | 1964 | echo $ac_n "(cached) $ac_c" 1>&6 |
1962 | 1965 | else |
@@ -2029,7 +2032,7 @@ | ||
2029 | 2032 | PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'" |
2030 | 2033 | |
2031 | 2034 | echo $ac_n "checking if -pthread should be used""... $ac_c" 1>&6 |
2032 | -echo "configure:2033: checking if -pthread should be used" >&5 | |
2035 | +echo "configure:2036: checking if -pthread should be used" >&5 | |
2033 | 2036 | threadsafe_flag= |
2034 | 2037 | thread_lib= |
2035 | 2038 | if test "x$MACOSX" != "xyes"; then |
@@ -2045,14 +2048,14 @@ | ||
2045 | 2048 | CFLAGS="$CFLAGS $threadsafe_flag" |
2046 | 2049 | LIBS="$LIBS $thread_lib" |
2047 | 2050 | cat > conftest.$ac_ext <<EOF |
2048 | -#line 2049 "configure" | |
2051 | +#line 2052 "configure" | |
2049 | 2052 | #include "confdefs.h" |
2050 | 2053 | |
2051 | 2054 | int main() { |
2052 | 2055 | |
2053 | 2056 | ; return 0; } |
2054 | 2057 | EOF |
2055 | -if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2058 | +if { (eval echo configure:2059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2056 | 2059 | rm -rf conftest* |
2057 | 2060 | echo "$ac_t""yes" 1>&6; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" |
2058 | 2061 | else |
@@ -2069,20 +2072,20 @@ | ||
2069 | 2072 | fi |
2070 | 2073 | |
2071 | 2074 | echo $ac_n "checking if compile and link flags for Python are sane""... $ac_c" 1>&6 |
2072 | -echo "configure:2073: checking if compile and link flags for Python are sane" >&5 | |
2075 | +echo "configure:2076: checking if compile and link flags for Python are sane" >&5 | |
2073 | 2076 | cflags_save=$CFLAGS |
2074 | 2077 | libs_save=$LIBS |
2075 | 2078 | CFLAGS="$CFLAGS $PYTHON_CFLAGS" |
2076 | 2079 | LIBS="$LIBS $PYTHON_LIBS" |
2077 | 2080 | cat > conftest.$ac_ext <<EOF |
2078 | -#line 2079 "configure" | |
2081 | +#line 2082 "configure" | |
2079 | 2082 | #include "confdefs.h" |
2080 | 2083 | |
2081 | 2084 | int main() { |
2082 | 2085 | |
2083 | 2086 | ; return 0; } |
2084 | 2087 | EOF |
2085 | -if { (eval echo configure:2086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2088 | +if { (eval echo configure:2089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2086 | 2089 | rm -rf conftest* |
2087 | 2090 | echo "$ac_t""yes" 1>&6; python_ok=yes |
2088 | 2091 | else |
@@ -2121,7 +2124,7 @@ | ||
2121 | 2124 | |
2122 | 2125 | |
2123 | 2126 | echo $ac_n "checking --enable-tclinterp argument""... $ac_c" 1>&6 |
2124 | -echo "configure:2125: checking --enable-tclinterp argument" >&5 | |
2127 | +echo "configure:2128: checking --enable-tclinterp argument" >&5 | |
2125 | 2128 | # Check whether --enable-tclinterp or --disable-tclinterp was given. |
2126 | 2129 | if test "${enable_tclinterp+set}" = set; then |
2127 | 2130 | enableval="$enable_tclinterp" |
@@ -2135,7 +2138,7 @@ | ||
2135 | 2138 | if test "$enable_tclinterp" = "yes"; then |
2136 | 2139 | |
2137 | 2140 | echo $ac_n "checking --with-tclsh argument""... $ac_c" 1>&6 |
2138 | -echo "configure:2139: checking --with-tclsh argument" >&5 | |
2141 | +echo "configure:2142: checking --with-tclsh argument" >&5 | |
2139 | 2142 | # Check whether --with-tclsh or --without-tclsh was given. |
2140 | 2143 | if test "${with_tclsh+set}" = set; then |
2141 | 2144 | withval="$with_tclsh" |
@@ -2147,7 +2150,7 @@ | ||
2147 | 2150 | # Extract the first word of "$tclsh_name", so it can be a program name with args. |
2148 | 2151 | set dummy $tclsh_name; ac_word=$2 |
2149 | 2152 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2150 | -echo "configure:2151: checking for $ac_word" >&5 | |
2153 | +echo "configure:2154: checking for $ac_word" >&5 | |
2151 | 2154 | if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then |
2152 | 2155 | echo $ac_n "(cached) $ac_c" 1>&6 |
2153 | 2156 | else |
@@ -2186,7 +2189,7 @@ | ||
2186 | 2189 | # Extract the first word of "$tclsh_name", so it can be a program name with args. |
2187 | 2190 | set dummy $tclsh_name; ac_word=$2 |
2188 | 2191 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2189 | -echo "configure:2190: checking for $ac_word" >&5 | |
2192 | +echo "configure:2193: checking for $ac_word" >&5 | |
2190 | 2193 | if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then |
2191 | 2194 | echo $ac_n "(cached) $ac_c" 1>&6 |
2192 | 2195 | else |
@@ -2224,7 +2227,7 @@ | ||
2224 | 2227 | # Extract the first word of "$tclsh_name", so it can be a program name with args. |
2225 | 2228 | set dummy $tclsh_name; ac_word=$2 |
2226 | 2229 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2227 | -echo "configure:2228: checking for $ac_word" >&5 | |
2230 | +echo "configure:2231: checking for $ac_word" >&5 | |
2228 | 2231 | if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then |
2229 | 2232 | echo $ac_n "(cached) $ac_c" 1>&6 |
2230 | 2233 | else |
@@ -2259,14 +2262,14 @@ | ||
2259 | 2262 | fi |
2260 | 2263 | if test "X$vi_cv_path_tcl" != "X"; then |
2261 | 2264 | echo $ac_n "checking Tcl version""... $ac_c" 1>&6 |
2262 | -echo "configure:2263: checking Tcl version" >&5 | |
2265 | +echo "configure:2266: checking Tcl version" >&5 | |
2263 | 2266 | if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then |
2264 | 2267 | tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` |
2265 | 2268 | echo "$ac_t""$tclver - OK" 1>&6; |
2266 | 2269 | tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -` |
2267 | 2270 | |
2268 | 2271 | echo $ac_n "checking for location of Tcl include""... $ac_c" 1>&6 |
2269 | -echo "configure:2270: checking for location of Tcl include" >&5 | |
2272 | +echo "configure:2273: checking for location of Tcl include" >&5 | |
2270 | 2273 | if test "x$MACOSX" != "xyes"; then |
2271 | 2274 | tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include" |
2272 | 2275 | else |
@@ -2285,7 +2288,7 @@ | ||
2285 | 2288 | fi |
2286 | 2289 | if test -z "$SKIP_TCL"; then |
2287 | 2290 | echo $ac_n "checking for location of tclConfig.sh script""... $ac_c" 1>&6 |
2288 | -echo "configure:2289: checking for location of tclConfig.sh script" >&5 | |
2291 | +echo "configure:2292: checking for location of tclConfig.sh script" >&5 | |
2289 | 2292 | if test "x$MACOSX" != "xyes"; then |
2290 | 2293 | tclcnf=`echo $tclinc | sed s/include/lib/g` |
2291 | 2294 | else |
@@ -2303,7 +2306,7 @@ | ||
2303 | 2306 | if test -z "$TCL_LIBS"; then |
2304 | 2307 | echo "$ac_t""<not found>" 1>&6 |
2305 | 2308 | echo $ac_n "checking for Tcl library by myself""... $ac_c" 1>&6 |
2306 | -echo "configure:2307: checking for Tcl library by myself" >&5 | |
2309 | +echo "configure:2310: checking for Tcl library by myself" >&5 | |
2307 | 2310 | tcllib=`echo $tclinc | sed s/include/lib/g` |
2308 | 2311 | for ext in .so .a ; do |
2309 | 2312 | for ver in "" $tclver ; do |
@@ -2349,7 +2352,7 @@ | ||
2349 | 2352 | |
2350 | 2353 | |
2351 | 2354 | echo $ac_n "checking --enable-rubyinterp argument""... $ac_c" 1>&6 |
2352 | -echo "configure:2353: checking --enable-rubyinterp argument" >&5 | |
2355 | +echo "configure:2356: checking --enable-rubyinterp argument" >&5 | |
2353 | 2356 | # Check whether --enable-rubyinterp or --disable-rubyinterp was given. |
2354 | 2357 | if test "${enable_rubyinterp+set}" = set; then |
2355 | 2358 | enableval="$enable_rubyinterp" |
@@ -2364,7 +2367,7 @@ | ||
2364 | 2367 | # Extract the first word of "ruby", so it can be a program name with args. |
2365 | 2368 | set dummy ruby; ac_word=$2 |
2366 | 2369 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2367 | -echo "configure:2368: checking for $ac_word" >&5 | |
2370 | +echo "configure:2371: checking for $ac_word" >&5 | |
2368 | 2371 | if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_ruby'+set}'`\" = set"; then |
2369 | 2372 | echo $ac_n "(cached) $ac_c" 1>&6 |
2370 | 2373 | else |
@@ -2398,11 +2401,11 @@ | ||
2398 | 2401 | |
2399 | 2402 | if test "X$vi_cv_path_ruby" != "X"; then |
2400 | 2403 | echo $ac_n "checking Ruby version""... $ac_c" 1>&6 |
2401 | -echo "configure:2402: checking Ruby version" >&5 | |
2404 | +echo "configure:2405: checking Ruby version" >&5 | |
2402 | 2405 | if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then |
2403 | 2406 | echo "$ac_t""OK" 1>&6 |
2404 | 2407 | echo $ac_n "checking Ruby header files""... $ac_c" 1>&6 |
2405 | -echo "configure:2406: checking Ruby header files" >&5 | |
2408 | +echo "configure:2409: checking Ruby header files" >&5 | |
2406 | 2409 | rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null` |
2407 | 2410 | if test "X$rubyhdrdir" != "X"; then |
2408 | 2411 | echo "$ac_t""$rubyhdrdir" 1>&6 |
@@ -2454,7 +2457,7 @@ | ||
2454 | 2457 | |
2455 | 2458 | |
2456 | 2459 | echo $ac_n "checking --enable-cscope argument""... $ac_c" 1>&6 |
2457 | -echo "configure:2458: checking --enable-cscope argument" >&5 | |
2460 | +echo "configure:2461: checking --enable-cscope argument" >&5 | |
2458 | 2461 | # Check whether --enable-cscope or --disable-cscope was given. |
2459 | 2462 | if test "${enable_cscope+set}" = set; then |
2460 | 2463 | enableval="$enable_cscope" |
@@ -2472,7 +2475,7 @@ | ||
2472 | 2475 | fi |
2473 | 2476 | |
2474 | 2477 | echo $ac_n "checking --enable-workshop argument""... $ac_c" 1>&6 |
2475 | -echo "configure:2476: checking --enable-workshop argument" >&5 | |
2478 | +echo "configure:2479: checking --enable-workshop argument" >&5 | |
2476 | 2479 | # Check whether --enable-workshop or --disable-workshop was given. |
2477 | 2480 | if test "${enable_workshop+set}" = set; then |
2478 | 2481 | enableval="$enable_workshop" |
@@ -2497,7 +2500,7 @@ | ||
2497 | 2500 | fi |
2498 | 2501 | |
2499 | 2502 | echo $ac_n "checking --disable-netbeans argument""... $ac_c" 1>&6 |
2500 | -echo "configure:2501: checking --disable-netbeans argument" >&5 | |
2503 | +echo "configure:2504: checking --disable-netbeans argument" >&5 | |
2501 | 2504 | # Check whether --enable-netbeans or --disable-netbeans was given. |
2502 | 2505 | if test "${enable_netbeans+set}" = set; then |
2503 | 2506 | enableval="$enable_netbeans" |
@@ -2509,7 +2512,7 @@ | ||
2509 | 2512 | if test "$enable_netbeans" = "yes"; then |
2510 | 2513 | echo "$ac_t""no" 1>&6 |
2511 | 2514 | echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 |
2512 | -echo "configure:2513: checking for socket in -lsocket" >&5 | |
2515 | +echo "configure:2516: checking for socket in -lsocket" >&5 | |
2513 | 2516 | ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` |
2514 | 2517 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2515 | 2518 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -2517,7 +2520,7 @@ | ||
2517 | 2520 | ac_save_LIBS="$LIBS" |
2518 | 2521 | LIBS="-lsocket $LIBS" |
2519 | 2522 | cat > conftest.$ac_ext <<EOF |
2520 | -#line 2521 "configure" | |
2523 | +#line 2524 "configure" | |
2521 | 2524 | #include "confdefs.h" |
2522 | 2525 | /* Override any gcc2 internal prototype to avoid an error. */ |
2523 | 2526 | /* We use char because int might match the return type of a gcc2 |
@@ -2528,7 +2531,7 @@ | ||
2528 | 2531 | socket() |
2529 | 2532 | ; return 0; } |
2530 | 2533 | EOF |
2531 | -if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2534 | +if { (eval echo configure:2535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2532 | 2535 | rm -rf conftest* |
2533 | 2536 | eval "ac_cv_lib_$ac_lib_var=yes" |
2534 | 2537 | else |
@@ -2556,7 +2559,7 @@ | ||
2556 | 2559 | fi |
2557 | 2560 | |
2558 | 2561 | echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 |
2559 | -echo "configure:2560: checking for gethostbyname in -lnsl" >&5 | |
2562 | +echo "configure:2563: checking for gethostbyname in -lnsl" >&5 | |
2560 | 2563 | ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` |
2561 | 2564 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
2562 | 2565 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -2564,7 +2567,7 @@ | ||
2564 | 2567 | ac_save_LIBS="$LIBS" |
2565 | 2568 | LIBS="-lnsl $LIBS" |
2566 | 2569 | cat > conftest.$ac_ext <<EOF |
2567 | -#line 2568 "configure" | |
2570 | +#line 2571 "configure" | |
2568 | 2571 | #include "confdefs.h" |
2569 | 2572 | /* Override any gcc2 internal prototype to avoid an error. */ |
2570 | 2573 | /* We use char because int might match the return type of a gcc2 |
@@ -2575,7 +2578,7 @@ | ||
2575 | 2578 | gethostbyname() |
2576 | 2579 | ; return 0; } |
2577 | 2580 | EOF |
2578 | -if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2581 | +if { (eval echo configure:2582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2579 | 2582 | rm -rf conftest* |
2580 | 2583 | eval "ac_cv_lib_$ac_lib_var=yes" |
2581 | 2584 | else |
@@ -2603,9 +2606,9 @@ | ||
2603 | 2606 | fi |
2604 | 2607 | |
2605 | 2608 | echo $ac_n "checking whether compiling netbeans integration is possible""... $ac_c" 1>&6 |
2606 | -echo "configure:2607: checking whether compiling netbeans integration is possible" >&5 | |
2609 | +echo "configure:2610: checking whether compiling netbeans integration is possible" >&5 | |
2607 | 2610 | cat > conftest.$ac_ext <<EOF |
2608 | -#line 2609 "configure" | |
2611 | +#line 2612 "configure" | |
2609 | 2612 | #include "confdefs.h" |
2610 | 2613 | |
2611 | 2614 | #include <stdio.h> |
@@ -2635,7 +2638,7 @@ | ||
2635 | 2638 | |
2636 | 2639 | ; return 0; } |
2637 | 2640 | EOF |
2638 | -if { (eval echo configure:2639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2641 | +if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2639 | 2642 | rm -rf conftest* |
2640 | 2643 | echo "$ac_t""yes" 1>&6 |
2641 | 2644 | else |
@@ -2660,7 +2663,7 @@ | ||
2660 | 2663 | fi |
2661 | 2664 | |
2662 | 2665 | echo $ac_n "checking --enable-sniff argument""... $ac_c" 1>&6 |
2663 | -echo "configure:2664: checking --enable-sniff argument" >&5 | |
2666 | +echo "configure:2667: checking --enable-sniff argument" >&5 | |
2664 | 2667 | # Check whether --enable-sniff or --disable-sniff was given. |
2665 | 2668 | if test "${enable_sniff+set}" = set; then |
2666 | 2669 | enableval="$enable_sniff" |
@@ -2682,7 +2685,7 @@ | ||
2682 | 2685 | fi |
2683 | 2686 | |
2684 | 2687 | echo $ac_n "checking --enable-multibyte argument""... $ac_c" 1>&6 |
2685 | -echo "configure:2686: checking --enable-multibyte argument" >&5 | |
2688 | +echo "configure:2689: checking --enable-multibyte argument" >&5 | |
2686 | 2689 | # Check whether --enable-multibyte or --disable-multibyte was given. |
2687 | 2690 | if test "${enable_multibyte+set}" = set; then |
2688 | 2691 | enableval="$enable_multibyte" |
@@ -2700,7 +2703,7 @@ | ||
2700 | 2703 | fi |
2701 | 2704 | |
2702 | 2705 | echo $ac_n "checking --enable-hangulinput argument""... $ac_c" 1>&6 |
2703 | -echo "configure:2704: checking --enable-hangulinput argument" >&5 | |
2706 | +echo "configure:2707: checking --enable-hangulinput argument" >&5 | |
2704 | 2707 | # Check whether --enable-hangulinput or --disable-hangulinput was given. |
2705 | 2708 | if test "${enable_hangulinput+set}" = set; then |
2706 | 2709 | enableval="$enable_hangulinput" |
@@ -2712,7 +2715,7 @@ | ||
2712 | 2715 | echo "$ac_t""$enable_hangulinput" 1>&6 |
2713 | 2716 | |
2714 | 2717 | echo $ac_n "checking --enable-xim argument""... $ac_c" 1>&6 |
2715 | -echo "configure:2716: checking --enable-xim argument" >&5 | |
2718 | +echo "configure:2719: checking --enable-xim argument" >&5 | |
2716 | 2719 | # Check whether --enable-xim or --disable-xim was given. |
2717 | 2720 | if test "${enable_xim+set}" = set; then |
2718 | 2721 | enableval="$enable_xim" |
@@ -2723,7 +2726,7 @@ | ||
2723 | 2726 | |
2724 | 2727 | |
2725 | 2728 | echo $ac_n "checking --enable-fontset argument""... $ac_c" 1>&6 |
2726 | -echo "configure:2727: checking --enable-fontset argument" >&5 | |
2729 | +echo "configure:2730: checking --enable-fontset argument" >&5 | |
2727 | 2730 | # Check whether --enable-fontset or --disable-fontset was given. |
2728 | 2731 | if test "${enable_fontset+set}" = set; then |
2729 | 2732 | enableval="$enable_fontset" |
@@ -2743,7 +2746,7 @@ | ||
2743 | 2746 | # Extract the first word of "xmkmf", so it can be a program name with args. |
2744 | 2747 | set dummy xmkmf; ac_word=$2 |
2745 | 2748 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
2746 | -echo "configure:2747: checking for $ac_word" >&5 | |
2749 | +echo "configure:2750: checking for $ac_word" >&5 | |
2747 | 2750 | if eval "test \"`echo '$''{'ac_cv_path_xmkmfpath'+set}'`\" = set"; then |
2748 | 2751 | echo $ac_n "(cached) $ac_c" 1>&6 |
2749 | 2752 | else |
@@ -2781,7 +2784,7 @@ | ||
2781 | 2784 | # Uses ac_ vars as temps to allow command line to override cache and checks. |
2782 | 2785 | # --without-x overrides everything else, but does not touch the cache. |
2783 | 2786 | echo $ac_n "checking for X""... $ac_c" 1>&6 |
2784 | -echo "configure:2785: checking for X" >&5 | |
2787 | +echo "configure:2788: checking for X" >&5 | |
2785 | 2788 | |
2786 | 2789 | # Check whether --with-x or --without-x was given. |
2787 | 2790 | if test "${with_x+set}" = set; then |
@@ -2843,12 +2846,12 @@ | ||
2843 | 2846 | |
2844 | 2847 | # First, try using that file with no special directory specified. |
2845 | 2848 | cat > conftest.$ac_ext <<EOF |
2846 | -#line 2847 "configure" | |
2849 | +#line 2850 "configure" | |
2847 | 2850 | #include "confdefs.h" |
2848 | 2851 | #include <$x_direct_test_include> |
2849 | 2852 | EOF |
2850 | 2853 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
2851 | -{ (eval echo configure:2852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
2854 | +{ (eval echo configure:2855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
2852 | 2855 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
2853 | 2856 | if test -z "$ac_err"; then |
2854 | 2857 | rm -rf conftest* |
@@ -2917,14 +2920,14 @@ | ||
2917 | 2920 | ac_save_LIBS="$LIBS" |
2918 | 2921 | LIBS="-l$x_direct_test_library $LIBS" |
2919 | 2922 | cat > conftest.$ac_ext <<EOF |
2920 | -#line 2921 "configure" | |
2923 | +#line 2924 "configure" | |
2921 | 2924 | #include "confdefs.h" |
2922 | 2925 | |
2923 | 2926 | int main() { |
2924 | 2927 | ${x_direct_test_function}() |
2925 | 2928 | ; return 0; } |
2926 | 2929 | EOF |
2927 | -if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2930 | +if { (eval echo configure:2931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
2928 | 2931 | rm -rf conftest* |
2929 | 2932 | LIBS="$ac_save_LIBS" |
2930 | 2933 | # We can link X programs with no special library path. |
@@ -3030,17 +3033,17 @@ | ||
3030 | 3033 | case "`(uname -sr) 2>/dev/null`" in |
3031 | 3034 | "SunOS 5"*) |
3032 | 3035 | echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 |
3033 | -echo "configure:3034: checking whether -R must be followed by a space" >&5 | |
3036 | +echo "configure:3037: checking whether -R must be followed by a space" >&5 | |
3034 | 3037 | ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" |
3035 | 3038 | cat > conftest.$ac_ext <<EOF |
3036 | -#line 3037 "configure" | |
3039 | +#line 3040 "configure" | |
3037 | 3040 | #include "confdefs.h" |
3038 | 3041 | |
3039 | 3042 | int main() { |
3040 | 3043 | |
3041 | 3044 | ; return 0; } |
3042 | 3045 | EOF |
3043 | -if { (eval echo configure:3044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3046 | +if { (eval echo configure:3047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3044 | 3047 | rm -rf conftest* |
3045 | 3048 | ac_R_nospace=yes |
3046 | 3049 | else |
@@ -3056,14 +3059,14 @@ | ||
3056 | 3059 | else |
3057 | 3060 | LIBS="$ac_xsave_LIBS -R $x_libraries" |
3058 | 3061 | cat > conftest.$ac_ext <<EOF |
3059 | -#line 3060 "configure" | |
3062 | +#line 3063 "configure" | |
3060 | 3063 | #include "confdefs.h" |
3061 | 3064 | |
3062 | 3065 | int main() { |
3063 | 3066 | |
3064 | 3067 | ; return 0; } |
3065 | 3068 | EOF |
3066 | -if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3069 | +if { (eval echo configure:3070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3067 | 3070 | rm -rf conftest* |
3068 | 3071 | ac_R_space=yes |
3069 | 3072 | else |
@@ -3095,7 +3098,7 @@ | ||
3095 | 3098 | # libraries were built with DECnet support. And karl@cs.umb.edu says |
3096 | 3099 | # the Alpha needs dnet_stub (dnet does not exist). |
3097 | 3100 | echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 |
3098 | -echo "configure:3099: checking for dnet_ntoa in -ldnet" >&5 | |
3101 | +echo "configure:3102: checking for dnet_ntoa in -ldnet" >&5 | |
3099 | 3102 | ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` |
3100 | 3103 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3101 | 3104 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3103,7 +3106,7 @@ | ||
3103 | 3106 | ac_save_LIBS="$LIBS" |
3104 | 3107 | LIBS="-ldnet $LIBS" |
3105 | 3108 | cat > conftest.$ac_ext <<EOF |
3106 | -#line 3107 "configure" | |
3109 | +#line 3110 "configure" | |
3107 | 3110 | #include "confdefs.h" |
3108 | 3111 | /* Override any gcc2 internal prototype to avoid an error. */ |
3109 | 3112 | /* We use char because int might match the return type of a gcc2 |
@@ -3114,7 +3117,7 @@ | ||
3114 | 3117 | dnet_ntoa() |
3115 | 3118 | ; return 0; } |
3116 | 3119 | EOF |
3117 | -if { (eval echo configure:3118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3120 | +if { (eval echo configure:3121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3118 | 3121 | rm -rf conftest* |
3119 | 3122 | eval "ac_cv_lib_$ac_lib_var=yes" |
3120 | 3123 | else |
@@ -3136,7 +3139,7 @@ | ||
3136 | 3139 | |
3137 | 3140 | if test $ac_cv_lib_dnet_dnet_ntoa = no; then |
3138 | 3141 | echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 |
3139 | -echo "configure:3140: checking for dnet_ntoa in -ldnet_stub" >&5 | |
3142 | +echo "configure:3143: checking for dnet_ntoa in -ldnet_stub" >&5 | |
3140 | 3143 | ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` |
3141 | 3144 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3142 | 3145 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3144,7 +3147,7 @@ | ||
3144 | 3147 | ac_save_LIBS="$LIBS" |
3145 | 3148 | LIBS="-ldnet_stub $LIBS" |
3146 | 3149 | cat > conftest.$ac_ext <<EOF |
3147 | -#line 3148 "configure" | |
3150 | +#line 3151 "configure" | |
3148 | 3151 | #include "confdefs.h" |
3149 | 3152 | /* Override any gcc2 internal prototype to avoid an error. */ |
3150 | 3153 | /* We use char because int might match the return type of a gcc2 |
@@ -3155,7 +3158,7 @@ | ||
3155 | 3158 | dnet_ntoa() |
3156 | 3159 | ; return 0; } |
3157 | 3160 | EOF |
3158 | -if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3161 | +if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3159 | 3162 | rm -rf conftest* |
3160 | 3163 | eval "ac_cv_lib_$ac_lib_var=yes" |
3161 | 3164 | else |
@@ -3184,12 +3187,12 @@ | ||
3184 | 3187 | # The nsl library prevents programs from opening the X display |
3185 | 3188 | # on Irix 5.2, according to dickey@clark.net. |
3186 | 3189 | echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 |
3187 | -echo "configure:3188: checking for gethostbyname" >&5 | |
3190 | +echo "configure:3191: checking for gethostbyname" >&5 | |
3188 | 3191 | if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then |
3189 | 3192 | echo $ac_n "(cached) $ac_c" 1>&6 |
3190 | 3193 | else |
3191 | 3194 | cat > conftest.$ac_ext <<EOF |
3192 | -#line 3193 "configure" | |
3195 | +#line 3196 "configure" | |
3193 | 3196 | #include "confdefs.h" |
3194 | 3197 | /* System header to define __stub macros and hopefully few prototypes, |
3195 | 3198 | which can conflict with char gethostbyname(); below. */ |
@@ -3212,7 +3215,7 @@ | ||
3212 | 3215 | |
3213 | 3216 | ; return 0; } |
3214 | 3217 | EOF |
3215 | -if { (eval echo configure:3216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3218 | +if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3216 | 3219 | rm -rf conftest* |
3217 | 3220 | eval "ac_cv_func_gethostbyname=yes" |
3218 | 3221 | else |
@@ -3233,7 +3236,7 @@ | ||
3233 | 3236 | |
3234 | 3237 | if test $ac_cv_func_gethostbyname = no; then |
3235 | 3238 | echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 |
3236 | -echo "configure:3237: checking for gethostbyname in -lnsl" >&5 | |
3239 | +echo "configure:3240: checking for gethostbyname in -lnsl" >&5 | |
3237 | 3240 | ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` |
3238 | 3241 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3239 | 3242 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3241,7 +3244,7 @@ | ||
3241 | 3244 | ac_save_LIBS="$LIBS" |
3242 | 3245 | LIBS="-lnsl $LIBS" |
3243 | 3246 | cat > conftest.$ac_ext <<EOF |
3244 | -#line 3245 "configure" | |
3247 | +#line 3248 "configure" | |
3245 | 3248 | #include "confdefs.h" |
3246 | 3249 | /* Override any gcc2 internal prototype to avoid an error. */ |
3247 | 3250 | /* We use char because int might match the return type of a gcc2 |
@@ -3252,7 +3255,7 @@ | ||
3252 | 3255 | gethostbyname() |
3253 | 3256 | ; return 0; } |
3254 | 3257 | EOF |
3255 | -if { (eval echo configure:3256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3258 | +if { (eval echo configure:3259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3256 | 3259 | rm -rf conftest* |
3257 | 3260 | eval "ac_cv_lib_$ac_lib_var=yes" |
3258 | 3261 | else |
@@ -3282,12 +3285,12 @@ | ||
3282 | 3285 | # -lsocket must be given before -lnsl if both are needed. |
3283 | 3286 | # We assume that if connect needs -lnsl, so does gethostbyname. |
3284 | 3287 | echo $ac_n "checking for connect""... $ac_c" 1>&6 |
3285 | -echo "configure:3286: checking for connect" >&5 | |
3288 | +echo "configure:3289: checking for connect" >&5 | |
3286 | 3289 | if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then |
3287 | 3290 | echo $ac_n "(cached) $ac_c" 1>&6 |
3288 | 3291 | else |
3289 | 3292 | cat > conftest.$ac_ext <<EOF |
3290 | -#line 3291 "configure" | |
3293 | +#line 3294 "configure" | |
3291 | 3294 | #include "confdefs.h" |
3292 | 3295 | /* System header to define __stub macros and hopefully few prototypes, |
3293 | 3296 | which can conflict with char connect(); below. */ |
@@ -3310,7 +3313,7 @@ | ||
3310 | 3313 | |
3311 | 3314 | ; return 0; } |
3312 | 3315 | EOF |
3313 | -if { (eval echo configure:3314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3316 | +if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3314 | 3317 | rm -rf conftest* |
3315 | 3318 | eval "ac_cv_func_connect=yes" |
3316 | 3319 | else |
@@ -3331,7 +3334,7 @@ | ||
3331 | 3334 | |
3332 | 3335 | if test $ac_cv_func_connect = no; then |
3333 | 3336 | echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 |
3334 | -echo "configure:3335: checking for connect in -lsocket" >&5 | |
3337 | +echo "configure:3338: checking for connect in -lsocket" >&5 | |
3335 | 3338 | ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` |
3336 | 3339 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3337 | 3340 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3339,7 +3342,7 @@ | ||
3339 | 3342 | ac_save_LIBS="$LIBS" |
3340 | 3343 | LIBS="-lsocket $X_EXTRA_LIBS $LIBS" |
3341 | 3344 | cat > conftest.$ac_ext <<EOF |
3342 | -#line 3343 "configure" | |
3345 | +#line 3346 "configure" | |
3343 | 3346 | #include "confdefs.h" |
3344 | 3347 | /* Override any gcc2 internal prototype to avoid an error. */ |
3345 | 3348 | /* We use char because int might match the return type of a gcc2 |
@@ -3350,7 +3353,7 @@ | ||
3350 | 3353 | connect() |
3351 | 3354 | ; return 0; } |
3352 | 3355 | EOF |
3353 | -if { (eval echo configure:3354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3356 | +if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3354 | 3357 | rm -rf conftest* |
3355 | 3358 | eval "ac_cv_lib_$ac_lib_var=yes" |
3356 | 3359 | else |
@@ -3374,12 +3377,12 @@ | ||
3374 | 3377 | |
3375 | 3378 | # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. |
3376 | 3379 | echo $ac_n "checking for remove""... $ac_c" 1>&6 |
3377 | -echo "configure:3378: checking for remove" >&5 | |
3380 | +echo "configure:3381: checking for remove" >&5 | |
3378 | 3381 | if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then |
3379 | 3382 | echo $ac_n "(cached) $ac_c" 1>&6 |
3380 | 3383 | else |
3381 | 3384 | cat > conftest.$ac_ext <<EOF |
3382 | -#line 3383 "configure" | |
3385 | +#line 3386 "configure" | |
3383 | 3386 | #include "confdefs.h" |
3384 | 3387 | /* System header to define __stub macros and hopefully few prototypes, |
3385 | 3388 | which can conflict with char remove(); below. */ |
@@ -3402,7 +3405,7 @@ | ||
3402 | 3405 | |
3403 | 3406 | ; return 0; } |
3404 | 3407 | EOF |
3405 | -if { (eval echo configure:3406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3408 | +if { (eval echo configure:3409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3406 | 3409 | rm -rf conftest* |
3407 | 3410 | eval "ac_cv_func_remove=yes" |
3408 | 3411 | else |
@@ -3423,7 +3426,7 @@ | ||
3423 | 3426 | |
3424 | 3427 | if test $ac_cv_func_remove = no; then |
3425 | 3428 | echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 |
3426 | -echo "configure:3427: checking for remove in -lposix" >&5 | |
3429 | +echo "configure:3430: checking for remove in -lposix" >&5 | |
3427 | 3430 | ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` |
3428 | 3431 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3429 | 3432 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3431,7 +3434,7 @@ | ||
3431 | 3434 | ac_save_LIBS="$LIBS" |
3432 | 3435 | LIBS="-lposix $LIBS" |
3433 | 3436 | cat > conftest.$ac_ext <<EOF |
3434 | -#line 3435 "configure" | |
3437 | +#line 3438 "configure" | |
3435 | 3438 | #include "confdefs.h" |
3436 | 3439 | /* Override any gcc2 internal prototype to avoid an error. */ |
3437 | 3440 | /* We use char because int might match the return type of a gcc2 |
@@ -3442,7 +3445,7 @@ | ||
3442 | 3445 | remove() |
3443 | 3446 | ; return 0; } |
3444 | 3447 | EOF |
3445 | -if { (eval echo configure:3446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3448 | +if { (eval echo configure:3449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3446 | 3449 | rm -rf conftest* |
3447 | 3450 | eval "ac_cv_lib_$ac_lib_var=yes" |
3448 | 3451 | else |
@@ -3466,12 +3469,12 @@ | ||
3466 | 3469 | |
3467 | 3470 | # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. |
3468 | 3471 | echo $ac_n "checking for shmat""... $ac_c" 1>&6 |
3469 | -echo "configure:3470: checking for shmat" >&5 | |
3472 | +echo "configure:3473: checking for shmat" >&5 | |
3470 | 3473 | if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then |
3471 | 3474 | echo $ac_n "(cached) $ac_c" 1>&6 |
3472 | 3475 | else |
3473 | 3476 | cat > conftest.$ac_ext <<EOF |
3474 | -#line 3475 "configure" | |
3477 | +#line 3478 "configure" | |
3475 | 3478 | #include "confdefs.h" |
3476 | 3479 | /* System header to define __stub macros and hopefully few prototypes, |
3477 | 3480 | which can conflict with char shmat(); below. */ |
@@ -3494,7 +3497,7 @@ | ||
3494 | 3497 | |
3495 | 3498 | ; return 0; } |
3496 | 3499 | EOF |
3497 | -if { (eval echo configure:3498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3500 | +if { (eval echo configure:3501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3498 | 3501 | rm -rf conftest* |
3499 | 3502 | eval "ac_cv_func_shmat=yes" |
3500 | 3503 | else |
@@ -3515,7 +3518,7 @@ | ||
3515 | 3518 | |
3516 | 3519 | if test $ac_cv_func_shmat = no; then |
3517 | 3520 | echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 |
3518 | -echo "configure:3519: checking for shmat in -lipc" >&5 | |
3521 | +echo "configure:3522: checking for shmat in -lipc" >&5 | |
3519 | 3522 | ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` |
3520 | 3523 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3521 | 3524 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3523,7 +3526,7 @@ | ||
3523 | 3526 | ac_save_LIBS="$LIBS" |
3524 | 3527 | LIBS="-lipc $LIBS" |
3525 | 3528 | cat > conftest.$ac_ext <<EOF |
3526 | -#line 3527 "configure" | |
3529 | +#line 3530 "configure" | |
3527 | 3530 | #include "confdefs.h" |
3528 | 3531 | /* Override any gcc2 internal prototype to avoid an error. */ |
3529 | 3532 | /* We use char because int might match the return type of a gcc2 |
@@ -3534,7 +3537,7 @@ | ||
3534 | 3537 | shmat() |
3535 | 3538 | ; return 0; } |
3536 | 3539 | EOF |
3537 | -if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3540 | +if { (eval echo configure:3541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3538 | 3541 | rm -rf conftest* |
3539 | 3542 | eval "ac_cv_lib_$ac_lib_var=yes" |
3540 | 3543 | else |
@@ -3567,7 +3570,7 @@ | ||
3567 | 3570 | # libraries we check for below, so use a different variable. |
3568 | 3571 | # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. |
3569 | 3572 | echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 |
3570 | -echo "configure:3571: checking for IceConnectionNumber in -lICE" >&5 | |
3573 | +echo "configure:3574: checking for IceConnectionNumber in -lICE" >&5 | |
3571 | 3574 | ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` |
3572 | 3575 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3573 | 3576 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3575,7 +3578,7 @@ | ||
3575 | 3578 | ac_save_LIBS="$LIBS" |
3576 | 3579 | LIBS="-lICE $X_EXTRA_LIBS $LIBS" |
3577 | 3580 | cat > conftest.$ac_ext <<EOF |
3578 | -#line 3579 "configure" | |
3581 | +#line 3582 "configure" | |
3579 | 3582 | #include "confdefs.h" |
3580 | 3583 | /* Override any gcc2 internal prototype to avoid an error. */ |
3581 | 3584 | /* We use char because int might match the return type of a gcc2 |
@@ -3586,7 +3589,7 @@ | ||
3586 | 3589 | IceConnectionNumber() |
3587 | 3590 | ; return 0; } |
3588 | 3591 | EOF |
3589 | -if { (eval echo configure:3590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3592 | +if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3590 | 3593 | rm -rf conftest* |
3591 | 3594 | eval "ac_cv_lib_$ac_lib_var=yes" |
3592 | 3595 | else |
@@ -3640,18 +3643,18 @@ | ||
3640 | 3643 | |
3641 | 3644 | |
3642 | 3645 | echo $ac_n "checking if X11 header files can be found""... $ac_c" 1>&6 |
3643 | -echo "configure:3644: checking if X11 header files can be found" >&5 | |
3646 | +echo "configure:3647: checking if X11 header files can be found" >&5 | |
3644 | 3647 | cflags_save=$CFLAGS |
3645 | 3648 | CFLAGS="$CFLAGS $X_CFLAGS" |
3646 | 3649 | cat > conftest.$ac_ext <<EOF |
3647 | -#line 3648 "configure" | |
3650 | +#line 3651 "configure" | |
3648 | 3651 | #include "confdefs.h" |
3649 | 3652 | #include <X11/Xlib.h> |
3650 | 3653 | int main() { |
3651 | 3654 | |
3652 | 3655 | ; return 0; } |
3653 | 3656 | EOF |
3654 | -if { (eval echo configure:3655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
3657 | +if { (eval echo configure:3658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
3655 | 3658 | rm -rf conftest* |
3656 | 3659 | echo "$ac_t""yes" 1>&6 |
3657 | 3660 | else |
@@ -3677,7 +3680,7 @@ | ||
3677 | 3680 | LDFLAGS="-L$x_libraries $LDFLAGS" |
3678 | 3681 | |
3679 | 3682 | echo $ac_n "checking for _XdmcpAuthDoIt in -lXdmcp""... $ac_c" 1>&6 |
3680 | -echo "configure:3681: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 | |
3683 | +echo "configure:3684: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 | |
3681 | 3684 | ac_lib_var=`echo Xdmcp'_'_XdmcpAuthDoIt | sed 'y%./+-%__p_%'` |
3682 | 3685 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3683 | 3686 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3685,7 +3688,7 @@ | ||
3685 | 3688 | ac_save_LIBS="$LIBS" |
3686 | 3689 | LIBS="-lXdmcp -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lXdmcp $LIBS" |
3687 | 3690 | cat > conftest.$ac_ext <<EOF |
3688 | -#line 3689 "configure" | |
3691 | +#line 3692 "configure" | |
3689 | 3692 | #include "confdefs.h" |
3690 | 3693 | /* Override any gcc2 internal prototype to avoid an error. */ |
3691 | 3694 | /* We use char because int might match the return type of a gcc2 |
@@ -3696,7 +3699,7 @@ | ||
3696 | 3699 | _XdmcpAuthDoIt() |
3697 | 3700 | ; return 0; } |
3698 | 3701 | EOF |
3699 | -if { (eval echo configure:3700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3702 | +if { (eval echo configure:3703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3700 | 3703 | rm -rf conftest* |
3701 | 3704 | eval "ac_cv_lib_$ac_lib_var=yes" |
3702 | 3705 | else |
@@ -3718,7 +3721,7 @@ | ||
3718 | 3721 | |
3719 | 3722 | |
3720 | 3723 | echo $ac_n "checking for IceOpenConnection in -lICE""... $ac_c" 1>&6 |
3721 | -echo "configure:3722: checking for IceOpenConnection in -lICE" >&5 | |
3724 | +echo "configure:3725: checking for IceOpenConnection in -lICE" >&5 | |
3722 | 3725 | ac_lib_var=`echo ICE'_'IceOpenConnection | sed 'y%./+-%__p_%'` |
3723 | 3726 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3724 | 3727 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3726,7 +3729,7 @@ | ||
3726 | 3729 | ac_save_LIBS="$LIBS" |
3727 | 3730 | LIBS="-lICE $X_EXTRA_LIBS $LIBS" |
3728 | 3731 | cat > conftest.$ac_ext <<EOF |
3729 | -#line 3730 "configure" | |
3732 | +#line 3733 "configure" | |
3730 | 3733 | #include "confdefs.h" |
3731 | 3734 | /* Override any gcc2 internal prototype to avoid an error. */ |
3732 | 3735 | /* We use char because int might match the return type of a gcc2 |
@@ -3737,7 +3740,7 @@ | ||
3737 | 3740 | IceOpenConnection() |
3738 | 3741 | ; return 0; } |
3739 | 3742 | EOF |
3740 | -if { (eval echo configure:3741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3743 | +if { (eval echo configure:3744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3741 | 3744 | rm -rf conftest* |
3742 | 3745 | eval "ac_cv_lib_$ac_lib_var=yes" |
3743 | 3746 | else |
@@ -3760,7 +3763,7 @@ | ||
3760 | 3763 | |
3761 | 3764 | LDFLAGS="$X_LIBS $ac_save_LDFLAGS" |
3762 | 3765 | echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6 |
3763 | -echo "configure:3764: checking for XpmCreatePixmapFromData in -lXpm" >&5 | |
3766 | +echo "configure:3767: checking for XpmCreatePixmapFromData in -lXpm" >&5 | |
3764 | 3767 | ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'` |
3765 | 3768 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
3766 | 3769 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -3768,7 +3771,7 @@ | ||
3768 | 3771 | ac_save_LIBS="$LIBS" |
3769 | 3772 | LIBS="-lXpm -lXt $X_PRE_LIBS -lXpm -lX11 $X_EXTRA_LIBS $LIBS" |
3770 | 3773 | cat > conftest.$ac_ext <<EOF |
3771 | -#line 3772 "configure" | |
3774 | +#line 3775 "configure" | |
3772 | 3775 | #include "confdefs.h" |
3773 | 3776 | /* Override any gcc2 internal prototype to avoid an error. */ |
3774 | 3777 | /* We use char because int might match the return type of a gcc2 |
@@ -3779,7 +3782,7 @@ | ||
3779 | 3782 | XpmCreatePixmapFromData() |
3780 | 3783 | ; return 0; } |
3781 | 3784 | EOF |
3782 | -if { (eval echo configure:3783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3785 | +if { (eval echo configure:3786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
3783 | 3786 | rm -rf conftest* |
3784 | 3787 | eval "ac_cv_lib_$ac_lib_var=yes" |
3785 | 3788 | else |
@@ -3801,18 +3804,18 @@ | ||
3801 | 3804 | |
3802 | 3805 | |
3803 | 3806 | echo $ac_n "checking if X11 header files implicitly declare return values""... $ac_c" 1>&6 |
3804 | -echo "configure:3805: checking if X11 header files implicitly declare return values" >&5 | |
3807 | +echo "configure:3808: checking if X11 header files implicitly declare return values" >&5 | |
3805 | 3808 | cflags_save=$CFLAGS |
3806 | 3809 | CFLAGS="$CFLAGS $X_CFLAGS -Werror" |
3807 | 3810 | cat > conftest.$ac_ext <<EOF |
3808 | -#line 3809 "configure" | |
3811 | +#line 3812 "configure" | |
3809 | 3812 | #include "confdefs.h" |
3810 | 3813 | #include <X11/Xlib.h> |
3811 | 3814 | int main() { |
3812 | 3815 | |
3813 | 3816 | ; return 0; } |
3814 | 3817 | EOF |
3815 | -if { (eval echo configure:3816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
3818 | +if { (eval echo configure:3819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
3816 | 3819 | rm -rf conftest* |
3817 | 3820 | echo "$ac_t""no" 1>&6 |
3818 | 3821 | else |
@@ -3821,14 +3824,14 @@ | ||
3821 | 3824 | rm -rf conftest* |
3822 | 3825 | CFLAGS="$CFLAGS -Wno-implicit-int" |
3823 | 3826 | cat > conftest.$ac_ext <<EOF |
3824 | -#line 3825 "configure" | |
3827 | +#line 3828 "configure" | |
3825 | 3828 | #include "confdefs.h" |
3826 | 3829 | #include <X11/Xlib.h> |
3827 | 3830 | int main() { |
3828 | 3831 | |
3829 | 3832 | ; return 0; } |
3830 | 3833 | EOF |
3831 | -if { (eval echo configure:3832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
3834 | +if { (eval echo configure:3835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
3832 | 3835 | rm -rf conftest* |
3833 | 3836 | echo "$ac_t""yes" 1>&6; cflags_save="$cflags_save -Wno-implicit-int" |
3834 | 3837 | else |
@@ -3852,7 +3855,7 @@ | ||
3852 | 3855 | test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no |
3853 | 3856 | |
3854 | 3857 | echo $ac_n "checking --enable-gui argument""... $ac_c" 1>&6 |
3855 | -echo "configure:3856: checking --enable-gui argument" >&5 | |
3858 | +echo "configure:3859: checking --enable-gui argument" >&5 | |
3856 | 3859 | # Check whether --enable-gui or --disable-gui was given. |
3857 | 3860 | if test "${enable_gui+set}" = set; then |
3858 | 3861 | enableval="$enable_gui" |
@@ -3952,7 +3955,7 @@ | ||
3952 | 3955 | |
3953 | 3956 | if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then |
3954 | 3957 | echo $ac_n "checking whether or not to look for KDE""... $ac_c" 1>&6 |
3955 | -echo "configure:3956: checking whether or not to look for KDE" >&5 | |
3958 | +echo "configure:3959: checking whether or not to look for KDE" >&5 | |
3956 | 3959 | # Check whether --enable-kde-check or --disable-kde-check was given. |
3957 | 3960 | if test "${enable_kde_check+set}" = set; then |
3958 | 3961 | enableval="$enable_kde_check" |
@@ -3969,7 +3972,7 @@ | ||
3969 | 3972 | |
3970 | 3973 | if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then |
3971 | 3974 | echo $ac_n "checking whether or not to look for GTK""... $ac_c" 1>&6 |
3972 | -echo "configure:3973: checking whether or not to look for GTK" >&5 | |
3975 | +echo "configure:3976: checking whether or not to look for GTK" >&5 | |
3973 | 3976 | # Check whether --enable-gtk-check or --disable-gtk-check was given. |
3974 | 3977 | if test "${enable_gtk_check+set}" = set; then |
3975 | 3978 | enableval="$enable_gtk_check" |
@@ -3988,7 +3991,7 @@ | ||
3988 | 3991 | if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \ |
3989 | 3992 | -a "$enable_gui_canon" != "gnome2"; then |
3990 | 3993 | echo $ac_n "checking whether or not to look for GTK+ 2""... $ac_c" 1>&6 |
3991 | -echo "configure:3992: checking whether or not to look for GTK+ 2" >&5 | |
3994 | +echo "configure:3995: checking whether or not to look for GTK+ 2" >&5 | |
3992 | 3995 | # Check whether --enable-gtk2-check or --disable-gtk2-check was given. |
3993 | 3996 | if test "${enable_gtk2_check+set}" = set; then |
3994 | 3997 | enableval="$enable_gtk2_check" |
@@ -4006,7 +4009,7 @@ | ||
4006 | 4009 | if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \ |
4007 | 4010 | -a "$enable_gui_canon" != "gnome2"; then |
4008 | 4011 | echo $ac_n "checking whether or not to look for GNOME""... $ac_c" 1>&6 |
4009 | -echo "configure:4010: checking whether or not to look for GNOME" >&5 | |
4012 | +echo "configure:4013: checking whether or not to look for GNOME" >&5 | |
4010 | 4013 | # Check whether --enable-gnome-check or --disable-gnome-check was given. |
4011 | 4014 | if test "${enable_gnome_check+set}" = set; then |
4012 | 4015 | enableval="$enable_gnome_check" |
@@ -4023,7 +4026,7 @@ | ||
4023 | 4026 | |
4024 | 4027 | if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then |
4025 | 4028 | echo $ac_n "checking whether or not to look for Motif""... $ac_c" 1>&6 |
4026 | -echo "configure:4027: checking whether or not to look for Motif" >&5 | |
4029 | +echo "configure:4030: checking whether or not to look for Motif" >&5 | |
4027 | 4030 | # Check whether --enable-motif-check or --disable-motif-check was given. |
4028 | 4031 | if test "${enable_motif_check+set}" = set; then |
4029 | 4032 | enableval="$enable_motif_check" |
@@ -4040,7 +4043,7 @@ | ||
4040 | 4043 | |
4041 | 4044 | if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then |
4042 | 4045 | echo $ac_n "checking whether or not to look for Athena""... $ac_c" 1>&6 |
4043 | -echo "configure:4044: checking whether or not to look for Athena" >&5 | |
4046 | +echo "configure:4047: checking whether or not to look for Athena" >&5 | |
4044 | 4047 | # Check whether --enable-athena-check or --disable-athena-check was given. |
4045 | 4048 | if test "${enable_athena_check+set}" = set; then |
4046 | 4049 | enableval="$enable_athena_check" |
@@ -4057,7 +4060,7 @@ | ||
4057 | 4060 | |
4058 | 4061 | if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then |
4059 | 4062 | echo $ac_n "checking whether or not to look for neXtaw""... $ac_c" 1>&6 |
4060 | -echo "configure:4061: checking whether or not to look for neXtaw" >&5 | |
4063 | +echo "configure:4064: checking whether or not to look for neXtaw" >&5 | |
4061 | 4064 | # Check whether --enable-nextaw-check or --disable-nextaw-check was given. |
4062 | 4065 | if test "${enable_nextaw_check+set}" = set; then |
4063 | 4066 | enableval="$enable_nextaw_check" |
@@ -4074,7 +4077,7 @@ | ||
4074 | 4077 | |
4075 | 4078 | if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then |
4076 | 4079 | echo $ac_n "checking whether or not to look for Carbon""... $ac_c" 1>&6 |
4077 | -echo "configure:4078: checking whether or not to look for Carbon" >&5 | |
4080 | +echo "configure:4081: checking whether or not to look for Carbon" >&5 | |
4078 | 4081 | # Check whether --enable-carbon-check or --disable-carbon-check was given. |
4079 | 4082 | if test "${enable_carbon_check+set}" = set; then |
4080 | 4083 | enableval="$enable_carbon_check" |
@@ -4108,7 +4111,7 @@ | ||
4108 | 4111 | # Extract the first word of "moc", so it can be a program name with args. |
4109 | 4112 | set dummy moc; ac_word=$2 |
4110 | 4113 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
4111 | -echo "configure:4112: checking for $ac_word" >&5 | |
4114 | +echo "configure:4115: checking for $ac_word" >&5 | |
4112 | 4115 | if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then |
4113 | 4116 | echo $ac_n "(cached) $ac_c" 1>&6 |
4114 | 4117 | else |
@@ -4178,7 +4181,7 @@ | ||
4178 | 4181 | fi |
4179 | 4182 | |
4180 | 4183 | echo $ac_n "checking whether or not to use a KDE Toolbar in KVim""... $ac_c" 1>&6 |
4181 | -echo "configure:4182: checking whether or not to use a KDE Toolbar in KVim" >&5 | |
4184 | +echo "configure:4185: checking whether or not to use a KDE Toolbar in KVim" >&5 | |
4182 | 4185 | # Check whether --enable-kde-toolbar or --disable-kde-toolbar was given. |
4183 | 4186 | if test "${enable_kde_toolbar+set}" = set; then |
4184 | 4187 | enableval="$enable_kde_toolbar" |
@@ -4203,7 +4206,7 @@ | ||
4203 | 4206 | |
4204 | 4207 | |
4205 | 4208 | echo $ac_n "checking --disable-rpath argument""... $ac_c" 1>&6 |
4206 | -echo "configure:4207: checking --disable-rpath argument" >&5 | |
4209 | +echo "configure:4210: checking --disable-rpath argument" >&5 | |
4207 | 4210 | # Check whether --enable-rpath or --disable-rpath was given. |
4208 | 4211 | if test "${enable_rpath+set}" = set; then |
4209 | 4212 | enableval="$enable_rpath" |
@@ -4219,7 +4222,7 @@ | ||
4219 | 4222 | fi |
4220 | 4223 | |
4221 | 4224 | echo $ac_n "checking --with-kde-prefix argument""... $ac_c" 1>&6 |
4222 | -echo "configure:4223: checking --with-kde-prefix argument" >&5 | |
4225 | +echo "configure:4226: checking --with-kde-prefix argument" >&5 | |
4223 | 4226 | # Check whether --with-kde-prefix or --without-kde-prefix was given. |
4224 | 4227 | if test "${with_kde_prefix+set}" = set; then |
4225 | 4228 | withval="$with_kde_prefix" |
@@ -4247,7 +4250,7 @@ | ||
4247 | 4250 | |
4248 | 4251 | |
4249 | 4252 | echo $ac_n "checking --disable-kdetest argument""... $ac_c" 1>&6 |
4250 | -echo "configure:4251: checking --disable-kdetest argument" >&5 | |
4253 | +echo "configure:4254: checking --disable-kdetest argument" >&5 | |
4251 | 4254 | # Check whether --enable-kdetest or --disable-kdetest was given. |
4252 | 4255 | if test "${enable_kdetest+set}" = set; then |
4253 | 4256 | enableval="$enable_kdetest" |
@@ -4269,7 +4272,7 @@ | ||
4269 | 4272 | # Extract the first word of "kde-config", so it can be a program name with args. |
4270 | 4273 | set dummy kde-config; ac_word=$2 |
4271 | 4274 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
4272 | -echo "configure:4273: checking for $ac_word" >&5 | |
4275 | +echo "configure:4276: checking for $ac_word" >&5 | |
4273 | 4276 | if eval "test \"`echo '$''{'ac_cv_path_KDE_CONFIG'+set}'`\" = set"; then |
4274 | 4277 | echo $ac_n "(cached) $ac_c" 1>&6 |
4275 | 4278 | else |
@@ -4311,7 +4314,7 @@ | ||
4311 | 4314 | if test "X$KDE_CONFIG" != "X"; then |
4312 | 4315 | min_kde_version=2.0.0 |
4313 | 4316 | echo $ac_n "checking for KDE version >= $min_kde_version""... $ac_c" 1>&6 |
4314 | -echo "configure:4315: checking for KDE version >= $min_kde_version" >&5 | |
4317 | +echo "configure:4318: checking for KDE version >= $min_kde_version" >&5 | |
4315 | 4318 | no_kde="" |
4316 | 4319 | if test "$KDE_CONFIG" = "no" ; then |
4317 | 4320 | no_kde=yes |
@@ -4344,7 +4347,7 @@ | ||
4344 | 4347 | echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)" |
4345 | 4348 | else |
4346 | 4349 | cat > conftest.$ac_ext <<EOF |
4347 | -#line 4348 "configure" | |
4350 | +#line 4351 "configure" | |
4348 | 4351 | #include "confdefs.h" |
4349 | 4352 | |
4350 | 4353 | #include <stdio.h> |
@@ -4353,7 +4356,7 @@ | ||
4353 | 4356 | { return 0; } |
4354 | 4357 | |
4355 | 4358 | EOF |
4356 | -if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
4359 | +if { (eval echo configure:4360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
4357 | 4360 | then |
4358 | 4361 | : |
4359 | 4362 | else |
@@ -4390,7 +4393,7 @@ | ||
4390 | 4393 | |
4391 | 4394 | if test "x$KDE_PREFIX" != "x"; then |
4392 | 4395 | echo $ac_n "checking for QT version $qt_major_version.x""... $ac_c" 1>&6 |
4393 | -echo "configure:4394: checking for QT version $qt_major_version.x" >&5 | |
4396 | +echo "configure:4397: checking for QT version $qt_major_version.x" >&5 | |
4394 | 4397 | if test "x$ROOTQT" != "x" ; then |
4395 | 4398 | GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC" |
4396 | 4399 | if test $qt_major_version -lt 2; then |
@@ -4429,7 +4432,7 @@ | ||
4429 | 4432 | do |
4430 | 4433 | for j in qstyle.h; |
4431 | 4434 | do |
4432 | - echo "configure: 4433: $i/$j" >&5 | |
4435 | + echo "configure: 4436: $i/$j" >&5 | |
4433 | 4436 | if test -r "$i/$j"; then |
4434 | 4437 | echo "taking that" >&5 |
4435 | 4438 | qt_incdir=$i |
@@ -4447,7 +4450,7 @@ | ||
4447 | 4450 | do |
4448 | 4451 | for j in kapplication.h; |
4449 | 4452 | do |
4450 | - echo "configure: 4451: $i/$j" >&5 | |
4453 | + echo "configure: 4454: $i/$j" >&5 | |
4451 | 4454 | if test -r "$i/$j"; then |
4452 | 4455 | echo "taking that" >&5 |
4453 | 4456 | kde_incdir=$i |
@@ -4473,9 +4476,9 @@ | ||
4473 | 4476 | ac_save_CXXFLAGS="$CXXFLAGS" |
4474 | 4477 | CXXFLAGS="$CXXFLAGS $GUI_INC_LOC" |
4475 | 4478 | echo $ac_n "checking whether Qt libraries are usable""... $ac_c" 1>&6 |
4476 | -echo "configure:4477: checking whether Qt libraries are usable" >&5 | |
4479 | +echo "configure:4480: checking whether Qt libraries are usable" >&5 | |
4477 | 4480 | cat > conftest.$ac_ext <<EOF |
4478 | -#line 4479 "configure" | |
4481 | +#line 4482 "configure" | |
4479 | 4482 | #include "confdefs.h" |
4480 | 4483 | #include <qapplication.h> |
4481 | 4484 | int main() { |
@@ -4486,7 +4489,7 @@ | ||
4486 | 4489 | |
4487 | 4490 | ; return 0; } |
4488 | 4491 | EOF |
4489 | -if { (eval echo configure:4490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
4492 | +if { (eval echo configure:4493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
4490 | 4493 | rm -rf conftest* |
4491 | 4494 | echo "$ac_t""yes" 1>&6 |
4492 | 4495 | else |
@@ -4498,9 +4501,9 @@ | ||
4498 | 4501 | rm -f conftest* |
4499 | 4502 | |
4500 | 4503 | echo $ac_n "checking whether KDE libraries are usable""... $ac_c" 1>&6 |
4501 | -echo "configure:4502: checking whether KDE libraries are usable" >&5 | |
4504 | +echo "configure:4505: checking whether KDE libraries are usable" >&5 | |
4502 | 4505 | cat > conftest.$ac_ext <<EOF |
4503 | -#line 4504 "configure" | |
4506 | +#line 4507 "configure" | |
4504 | 4507 | #include "confdefs.h" |
4505 | 4508 | #include <kapplication.h> |
4506 | 4509 | int main() { |
@@ -4511,7 +4514,7 @@ | ||
4511 | 4514 | |
4512 | 4515 | ; return 0; } |
4513 | 4516 | EOF |
4514 | -if { (eval echo configure:4515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
4517 | +if { (eval echo configure:4518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
4515 | 4518 | rm -rf conftest* |
4516 | 4519 | echo "$ac_t""yes" 1>&6 |
4517 | 4520 | else |
@@ -4557,7 +4560,7 @@ | ||
4557 | 4560 | |
4558 | 4561 | if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then |
4559 | 4562 | echo $ac_n "checking for Carbon GUI""... $ac_c" 1>&6 |
4560 | -echo "configure:4561: checking for Carbon GUI" >&5 | |
4563 | +echo "configure:4564: checking for Carbon GUI" >&5 | |
4561 | 4564 | echo "$ac_t""yes" 1>&6; |
4562 | 4565 | GUITYPE=CARBONGUI |
4563 | 4566 | SKIP_GTK=YES; |
@@ -4582,7 +4585,7 @@ | ||
4582 | 4585 | if test -z "$SKIP_GTK"; then |
4583 | 4586 | |
4584 | 4587 | echo $ac_n "checking --with-gtk-prefix argument""... $ac_c" 1>&6 |
4585 | -echo "configure:4586: checking --with-gtk-prefix argument" >&5 | |
4588 | +echo "configure:4589: checking --with-gtk-prefix argument" >&5 | |
4586 | 4589 | # Check whether --with-gtk-prefix or --without-gtk-prefix was given. |
4587 | 4590 | if test "${with_gtk_prefix+set}" = set; then |
4588 | 4591 | withval="$with_gtk_prefix" |
@@ -4593,7 +4596,7 @@ | ||
4593 | 4596 | |
4594 | 4597 | |
4595 | 4598 | echo $ac_n "checking --with-gtk-exec-prefix argument""... $ac_c" 1>&6 |
4596 | -echo "configure:4597: checking --with-gtk-exec-prefix argument" >&5 | |
4599 | +echo "configure:4600: checking --with-gtk-exec-prefix argument" >&5 | |
4597 | 4600 | # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given. |
4598 | 4601 | if test "${with_gtk_exec_prefix+set}" = set; then |
4599 | 4602 | withval="$with_gtk_exec_prefix" |
@@ -4604,7 +4607,7 @@ | ||
4604 | 4607 | |
4605 | 4608 | |
4606 | 4609 | echo $ac_n "checking --disable-gtktest argument""... $ac_c" 1>&6 |
4607 | -echo "configure:4608: checking --disable-gtktest argument" >&5 | |
4610 | +echo "configure:4611: checking --disable-gtktest argument" >&5 | |
4608 | 4611 | # Check whether --enable-gtktest or --disable-gtktest was given. |
4609 | 4612 | if test "${enable_gtktest+set}" = set; then |
4610 | 4613 | enableval="$enable_gtktest" |
@@ -4631,7 +4634,7 @@ | ||
4631 | 4634 | # Extract the first word of "gtk-config", so it can be a program name with args. |
4632 | 4635 | set dummy gtk-config; ac_word=$2 |
4633 | 4636 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
4634 | -echo "configure:4635: checking for $ac_word" >&5 | |
4637 | +echo "configure:4638: checking for $ac_word" >&5 | |
4635 | 4638 | if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then |
4636 | 4639 | echo $ac_n "(cached) $ac_c" 1>&6 |
4637 | 4640 | else |
@@ -4668,7 +4671,7 @@ | ||
4668 | 4671 | # Extract the first word of "gtk12-config", so it can be a program name with args. |
4669 | 4672 | set dummy gtk12-config; ac_word=$2 |
4670 | 4673 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
4671 | -echo "configure:4672: checking for $ac_word" >&5 | |
4674 | +echo "configure:4675: checking for $ac_word" >&5 | |
4672 | 4675 | if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then |
4673 | 4676 | echo $ac_n "(cached) $ac_c" 1>&6 |
4674 | 4677 | else |
@@ -4710,7 +4713,7 @@ | ||
4710 | 4713 | # Extract the first word of "pkg-config", so it can be a program name with args. |
4711 | 4714 | set dummy pkg-config; ac_word=$2 |
4712 | 4715 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
4713 | -echo "configure:4714: checking for $ac_word" >&5 | |
4716 | +echo "configure:4717: checking for $ac_word" >&5 | |
4714 | 4717 | if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then |
4715 | 4718 | echo $ac_n "(cached) $ac_c" 1>&6 |
4716 | 4719 | else |
@@ -4752,7 +4755,7 @@ | ||
4752 | 4755 | { |
4753 | 4756 | min_gtk_version=2.2.0 |
4754 | 4757 | echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 |
4755 | -echo "configure:4756: checking for GTK - version >= $min_gtk_version" >&5 | |
4758 | +echo "configure:4759: checking for GTK - version >= $min_gtk_version" >&5 | |
4756 | 4759 | no_gtk="" |
4757 | 4760 | if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ |
4758 | 4761 | && $PKG_CONFIG --exists gtk+-2.0; then |
@@ -4793,7 +4796,7 @@ | ||
4793 | 4796 | echo $ac_n "cross compiling; assumed OK... $ac_c" |
4794 | 4797 | else |
4795 | 4798 | cat > conftest.$ac_ext <<EOF |
4796 | -#line 4797 "configure" | |
4799 | +#line 4800 "configure" | |
4797 | 4800 | #include "confdefs.h" |
4798 | 4801 | |
4799 | 4802 | #include <gtk/gtk.h> |
@@ -4825,7 +4828,7 @@ | ||
4825 | 4828 | } |
4826 | 4829 | |
4827 | 4830 | EOF |
4828 | -if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
4831 | +if { (eval echo configure:4832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
4829 | 4832 | then |
4830 | 4833 | : |
4831 | 4834 | else |
@@ -4883,7 +4886,7 @@ | ||
4883 | 4886 | { |
4884 | 4887 | min_gtk_version=1.1.16 |
4885 | 4888 | echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 |
4886 | -echo "configure:4887: checking for GTK - version >= $min_gtk_version" >&5 | |
4889 | +echo "configure:4890: checking for GTK - version >= $min_gtk_version" >&5 | |
4887 | 4890 | no_gtk="" |
4888 | 4891 | if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \ |
4889 | 4892 | && $PKG_CONFIG --exists gtk+-2.0; then |
@@ -4924,7 +4927,7 @@ | ||
4924 | 4927 | echo $ac_n "cross compiling; assumed OK... $ac_c" |
4925 | 4928 | else |
4926 | 4929 | cat > conftest.$ac_ext <<EOF |
4927 | -#line 4928 "configure" | |
4930 | +#line 4931 "configure" | |
4928 | 4931 | #include "confdefs.h" |
4929 | 4932 | |
4930 | 4933 | #include <gtk/gtk.h> |
@@ -4956,7 +4959,7 @@ | ||
4956 | 4959 | } |
4957 | 4960 | |
4958 | 4961 | EOF |
4959 | -if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
4962 | +if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
4960 | 4963 | then |
4961 | 4964 | : |
4962 | 4965 | else |
@@ -5074,7 +5077,7 @@ | ||
5074 | 5077 | if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then |
5075 | 5078 | { |
5076 | 5079 | echo $ac_n "checking for libgnomeui-2.0""... $ac_c" 1>&6 |
5077 | -echo "configure:5078: checking for libgnomeui-2.0" >&5 | |
5080 | +echo "configure:5081: checking for libgnomeui-2.0" >&5 | |
5078 | 5081 | if $PKG_CONFIG --exists libgnomeui-2.0; then |
5079 | 5082 | echo "$ac_t""yes" 1>&6 |
5080 | 5083 | GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` |
@@ -5093,7 +5096,7 @@ | ||
5093 | 5096 | # Extract the first word of "gnome-config", so it can be a program name with args. |
5094 | 5097 | set dummy gnome-config; ac_word=$2 |
5095 | 5098 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
5096 | -echo "configure:5097: checking for $ac_word" >&5 | |
5099 | +echo "configure:5100: checking for $ac_word" >&5 | |
5097 | 5100 | if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then |
5098 | 5101 | echo $ac_n "(cached) $ac_c" 1>&6 |
5099 | 5102 | else |
@@ -5130,7 +5133,7 @@ | ||
5130 | 5133 | no_gnome_config="yes" |
5131 | 5134 | else |
5132 | 5135 | echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 |
5133 | -echo "configure:5134: checking if $GNOME_CONFIG works" >&5 | |
5136 | +echo "configure:5137: checking if $GNOME_CONFIG works" >&5 | |
5134 | 5137 | if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then |
5135 | 5138 | echo "$ac_t""yes" 1>&6 |
5136 | 5139 | GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`" |
@@ -5155,7 +5158,7 @@ | ||
5155 | 5158 | |
5156 | 5159 | if test "$no_gnome_config" = "yes"; then |
5157 | 5160 | echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6 |
5158 | -echo "configure:5159: checking for gnomeConf.sh file in $gnome_prefix" >&5 | |
5161 | +echo "configure:5162: checking for gnomeConf.sh file in $gnome_prefix" >&5 | |
5159 | 5162 | if test -f $gnome_prefix/gnomeConf.sh; then |
5160 | 5163 | echo "$ac_t""found" 1>&6 |
5161 | 5164 | echo "loading gnome configuration from" \ |
@@ -5193,7 +5196,7 @@ | ||
5193 | 5196 | GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" |
5194 | 5197 | |
5195 | 5198 | echo $ac_n "checking for location of Motif GUI includes""... $ac_c" 1>&6 |
5196 | -echo "configure:5197: checking for location of Motif GUI includes" >&5 | |
5199 | +echo "configure:5200: checking for location of Motif GUI includes" >&5 | |
5197 | 5200 | gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC" |
5198 | 5201 | GUI_INC_LOC= |
5199 | 5202 | for try in $gui_includes; do |
@@ -5217,7 +5220,7 @@ | ||
5217 | 5220 | |
5218 | 5221 | if test -z "$SKIP_MOTIF"; then |
5219 | 5222 | echo $ac_n "checking --with-motif-lib argument""... $ac_c" 1>&6 |
5220 | -echo "configure:5221: checking --with-motif-lib argument" >&5 | |
5223 | +echo "configure:5224: checking --with-motif-lib argument" >&5 | |
5221 | 5224 | # Check whether --with-motif-lib or --without-motif-lib was given. |
5222 | 5225 | if test "${with_motif_lib+set}" = set; then |
5223 | 5226 | withval="$with_motif_lib" |
@@ -5234,7 +5237,7 @@ | ||
5234 | 5237 | GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" |
5235 | 5238 | |
5236 | 5239 | echo $ac_n "checking for location of Motif GUI libs""... $ac_c" 1>&6 |
5237 | -echo "configure:5238: checking for location of Motif GUI libs" >&5 | |
5240 | +echo "configure:5241: checking for location of Motif GUI libs" >&5 | |
5238 | 5241 | gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" |
5239 | 5242 | GUI_LIB_LOC= |
5240 | 5243 | for try in $gui_libs; do |
@@ -5277,11 +5280,11 @@ | ||
5277 | 5280 | |
5278 | 5281 | if test -z "$SKIP_ATHENA"; then |
5279 | 5282 | echo $ac_n "checking if Athena header files can be found""... $ac_c" 1>&6 |
5280 | -echo "configure:5281: checking if Athena header files can be found" >&5 | |
5283 | +echo "configure:5284: checking if Athena header files can be found" >&5 | |
5281 | 5284 | cflags_save=$CFLAGS |
5282 | 5285 | CFLAGS="$CFLAGS $X_CFLAGS" |
5283 | 5286 | cat > conftest.$ac_ext <<EOF |
5284 | -#line 5285 "configure" | |
5287 | +#line 5288 "configure" | |
5285 | 5288 | #include "confdefs.h" |
5286 | 5289 | |
5287 | 5290 | #include <X11/Intrinsic.h> |
@@ -5290,7 +5293,7 @@ | ||
5290 | 5293 | |
5291 | 5294 | ; return 0; } |
5292 | 5295 | EOF |
5293 | -if { (eval echo configure:5294: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
5296 | +if { (eval echo configure:5297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
5294 | 5297 | rm -rf conftest* |
5295 | 5298 | echo "$ac_t""yes" 1>&6 |
5296 | 5299 | else |
@@ -5309,11 +5312,11 @@ | ||
5309 | 5312 | |
5310 | 5313 | if test -z "$SKIP_NEXTAW"; then |
5311 | 5314 | echo $ac_n "checking if neXtaw header files can be found""... $ac_c" 1>&6 |
5312 | -echo "configure:5313: checking if neXtaw header files can be found" >&5 | |
5315 | +echo "configure:5316: checking if neXtaw header files can be found" >&5 | |
5313 | 5316 | cflags_save=$CFLAGS |
5314 | 5317 | CFLAGS="$CFLAGS $X_CFLAGS" |
5315 | 5318 | cat > conftest.$ac_ext <<EOF |
5316 | -#line 5317 "configure" | |
5319 | +#line 5320 "configure" | |
5317 | 5320 | #include "confdefs.h" |
5318 | 5321 | |
5319 | 5322 | #include <X11/Intrinsic.h> |
@@ -5322,7 +5325,7 @@ | ||
5322 | 5325 | |
5323 | 5326 | ; return 0; } |
5324 | 5327 | EOF |
5325 | -if { (eval echo configure:5326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
5328 | +if { (eval echo configure:5329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
5326 | 5329 | rm -rf conftest* |
5327 | 5330 | echo "$ac_t""yes" 1>&6 |
5328 | 5331 | else |
@@ -5350,7 +5353,7 @@ | ||
5350 | 5353 | ldflags_save=$LDFLAGS |
5351 | 5354 | LDFLAGS="$X_LIBS $LDFLAGS" |
5352 | 5355 | echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6 |
5353 | -echo "configure:5354: checking for XShapeQueryExtension in -lXext" >&5 | |
5356 | +echo "configure:5357: checking for XShapeQueryExtension in -lXext" >&5 | |
5354 | 5357 | ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'` |
5355 | 5358 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
5356 | 5359 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -5358,7 +5361,7 @@ | ||
5358 | 5361 | ac_save_LIBS="$LIBS" |
5359 | 5362 | LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" |
5360 | 5363 | cat > conftest.$ac_ext <<EOF |
5361 | -#line 5362 "configure" | |
5364 | +#line 5365 "configure" | |
5362 | 5365 | #include "confdefs.h" |
5363 | 5366 | /* Override any gcc2 internal prototype to avoid an error. */ |
5364 | 5367 | /* We use char because int might match the return type of a gcc2 |
@@ -5369,7 +5372,7 @@ | ||
5369 | 5372 | XShapeQueryExtension() |
5370 | 5373 | ; return 0; } |
5371 | 5374 | EOF |
5372 | -if { (eval echo configure:5373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5375 | +if { (eval echo configure:5376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5373 | 5376 | rm -rf conftest* |
5374 | 5377 | eval "ac_cv_lib_$ac_lib_var=yes" |
5375 | 5378 | else |
@@ -5390,7 +5393,7 @@ | ||
5390 | 5393 | fi |
5391 | 5394 | |
5392 | 5395 | echo $ac_n "checking for wslen in -lw""... $ac_c" 1>&6 |
5393 | -echo "configure:5394: checking for wslen in -lw" >&5 | |
5396 | +echo "configure:5397: checking for wslen in -lw" >&5 | |
5394 | 5397 | ac_lib_var=`echo w'_'wslen | sed 'y%./+-%__p_%'` |
5395 | 5398 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
5396 | 5399 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -5398,7 +5401,7 @@ | ||
5398 | 5401 | ac_save_LIBS="$LIBS" |
5399 | 5402 | LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" |
5400 | 5403 | cat > conftest.$ac_ext <<EOF |
5401 | -#line 5402 "configure" | |
5404 | +#line 5405 "configure" | |
5402 | 5405 | #include "confdefs.h" |
5403 | 5406 | /* Override any gcc2 internal prototype to avoid an error. */ |
5404 | 5407 | /* We use char because int might match the return type of a gcc2 |
@@ -5409,7 +5412,7 @@ | ||
5409 | 5412 | wslen() |
5410 | 5413 | ; return 0; } |
5411 | 5414 | EOF |
5412 | -if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5415 | +if { (eval echo configure:5416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5413 | 5416 | rm -rf conftest* |
5414 | 5417 | eval "ac_cv_lib_$ac_lib_var=yes" |
5415 | 5418 | else |
@@ -5430,7 +5433,7 @@ | ||
5430 | 5433 | fi |
5431 | 5434 | |
5432 | 5435 | echo $ac_n "checking for dlsym in -ldl""... $ac_c" 1>&6 |
5433 | -echo "configure:5434: checking for dlsym in -ldl" >&5 | |
5436 | +echo "configure:5437: checking for dlsym in -ldl" >&5 | |
5434 | 5437 | ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'` |
5435 | 5438 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
5436 | 5439 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -5438,7 +5441,7 @@ | ||
5438 | 5441 | ac_save_LIBS="$LIBS" |
5439 | 5442 | LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" |
5440 | 5443 | cat > conftest.$ac_ext <<EOF |
5441 | -#line 5442 "configure" | |
5444 | +#line 5445 "configure" | |
5442 | 5445 | #include "confdefs.h" |
5443 | 5446 | /* Override any gcc2 internal prototype to avoid an error. */ |
5444 | 5447 | /* We use char because int might match the return type of a gcc2 |
@@ -5449,7 +5452,7 @@ | ||
5449 | 5452 | dlsym() |
5450 | 5453 | ; return 0; } |
5451 | 5454 | EOF |
5452 | -if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5455 | +if { (eval echo configure:5456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5453 | 5456 | rm -rf conftest* |
5454 | 5457 | eval "ac_cv_lib_$ac_lib_var=yes" |
5455 | 5458 | else |
@@ -5470,7 +5473,7 @@ | ||
5470 | 5473 | fi |
5471 | 5474 | |
5472 | 5475 | echo $ac_n "checking for XmuCreateStippledPixmap in -lXmu""... $ac_c" 1>&6 |
5473 | -echo "configure:5474: checking for XmuCreateStippledPixmap in -lXmu" >&5 | |
5476 | +echo "configure:5477: checking for XmuCreateStippledPixmap in -lXmu" >&5 | |
5474 | 5477 | ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'` |
5475 | 5478 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
5476 | 5479 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -5478,7 +5481,7 @@ | ||
5478 | 5481 | ac_save_LIBS="$LIBS" |
5479 | 5482 | LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" |
5480 | 5483 | cat > conftest.$ac_ext <<EOF |
5481 | -#line 5482 "configure" | |
5484 | +#line 5485 "configure" | |
5482 | 5485 | #include "confdefs.h" |
5483 | 5486 | /* Override any gcc2 internal prototype to avoid an error. */ |
5484 | 5487 | /* We use char because int might match the return type of a gcc2 |
@@ -5489,7 +5492,7 @@ | ||
5489 | 5492 | XmuCreateStippledPixmap() |
5490 | 5493 | ; return 0; } |
5491 | 5494 | EOF |
5492 | -if { (eval echo configure:5493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5495 | +if { (eval echo configure:5496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5493 | 5496 | rm -rf conftest* |
5494 | 5497 | eval "ac_cv_lib_$ac_lib_var=yes" |
5495 | 5498 | else |
@@ -5511,7 +5514,7 @@ | ||
5511 | 5514 | |
5512 | 5515 | if test -z "$SKIP_MOTIF"; then |
5513 | 5516 | echo $ac_n "checking for XpEndJob in -lXp""... $ac_c" 1>&6 |
5514 | -echo "configure:5515: checking for XpEndJob in -lXp" >&5 | |
5517 | +echo "configure:5518: checking for XpEndJob in -lXp" >&5 | |
5515 | 5518 | ac_lib_var=`echo Xp'_'XpEndJob | sed 'y%./+-%__p_%'` |
5516 | 5519 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
5517 | 5520 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -5519,7 +5522,7 @@ | ||
5519 | 5522 | ac_save_LIBS="$LIBS" |
5520 | 5523 | LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" |
5521 | 5524 | cat > conftest.$ac_ext <<EOF |
5522 | -#line 5523 "configure" | |
5525 | +#line 5526 "configure" | |
5523 | 5526 | #include "confdefs.h" |
5524 | 5527 | /* Override any gcc2 internal prototype to avoid an error. */ |
5525 | 5528 | /* We use char because int might match the return type of a gcc2 |
@@ -5530,7 +5533,7 @@ | ||
5530 | 5533 | XpEndJob() |
5531 | 5534 | ; return 0; } |
5532 | 5535 | EOF |
5533 | -if { (eval echo configure:5534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5536 | +if { (eval echo configure:5537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5534 | 5537 | rm -rf conftest* |
5535 | 5538 | eval "ac_cv_lib_$ac_lib_var=yes" |
5536 | 5539 | else |
@@ -5554,7 +5557,7 @@ | ||
5554 | 5557 | LDFLAGS=$ldflags_save |
5555 | 5558 | |
5556 | 5559 | echo $ac_n "checking for extra X11 defines""... $ac_c" 1>&6 |
5557 | -echo "configure:5558: checking for extra X11 defines" >&5 | |
5560 | +echo "configure:5561: checking for extra X11 defines" >&5 | |
5558 | 5561 | NARROW_PROTO= |
5559 | 5562 | rm -fr conftestdir |
5560 | 5563 | if mkdir conftestdir; then |
@@ -5584,17 +5587,17 @@ | ||
5584 | 5587 | do |
5585 | 5588 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
5586 | 5589 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
5587 | -echo "configure:5588: checking for $ac_hdr" >&5 | |
5590 | +echo "configure:5591: checking for $ac_hdr" >&5 | |
5588 | 5591 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
5589 | 5592 | echo $ac_n "(cached) $ac_c" 1>&6 |
5590 | 5593 | else |
5591 | 5594 | cat > conftest.$ac_ext <<EOF |
5592 | -#line 5593 "configure" | |
5595 | +#line 5596 "configure" | |
5593 | 5596 | #include "confdefs.h" |
5594 | 5597 | #include <$ac_hdr> |
5595 | 5598 | EOF |
5596 | 5599 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
5597 | -{ (eval echo configure:5598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5600 | +{ (eval echo configure:5601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5598 | 5601 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
5599 | 5602 | if test -z "$ac_err"; then |
5600 | 5603 | rm -rf conftest* |
@@ -5631,17 +5634,17 @@ | ||
5631 | 5634 | do |
5632 | 5635 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
5633 | 5636 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
5634 | -echo "configure:5635: checking for $ac_hdr" >&5 | |
5637 | +echo "configure:5638: checking for $ac_hdr" >&5 | |
5635 | 5638 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
5636 | 5639 | echo $ac_n "(cached) $ac_c" 1>&6 |
5637 | 5640 | else |
5638 | 5641 | cat > conftest.$ac_ext <<EOF |
5639 | -#line 5640 "configure" | |
5642 | +#line 5643 "configure" | |
5640 | 5643 | #include "confdefs.h" |
5641 | 5644 | #include <$ac_hdr> |
5642 | 5645 | EOF |
5643 | 5646 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
5644 | -{ (eval echo configure:5645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5647 | +{ (eval echo configure:5648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5645 | 5648 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
5646 | 5649 | if test -z "$ac_err"; then |
5647 | 5650 | rm -rf conftest* |
@@ -5670,9 +5673,9 @@ | ||
5670 | 5673 | |
5671 | 5674 | if test ! "$enable_xim" = "no"; then |
5672 | 5675 | echo $ac_n "checking for XIMText in X11/Xlib.h""... $ac_c" 1>&6 |
5673 | -echo "configure:5674: checking for XIMText in X11/Xlib.h" >&5 | |
5676 | +echo "configure:5677: checking for XIMText in X11/Xlib.h" >&5 | |
5674 | 5677 | cat > conftest.$ac_ext <<EOF |
5675 | -#line 5676 "configure" | |
5678 | +#line 5679 "configure" | |
5676 | 5679 | #include "confdefs.h" |
5677 | 5680 | #include <X11/Xlib.h> |
5678 | 5681 | EOF |
@@ -5703,17 +5706,17 @@ | ||
5703 | 5706 | do |
5704 | 5707 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
5705 | 5708 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
5706 | -echo "configure:5707: checking for $ac_hdr" >&5 | |
5709 | +echo "configure:5710: checking for $ac_hdr" >&5 | |
5707 | 5710 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
5708 | 5711 | echo $ac_n "(cached) $ac_c" 1>&6 |
5709 | 5712 | else |
5710 | 5713 | cat > conftest.$ac_ext <<EOF |
5711 | -#line 5712 "configure" | |
5714 | +#line 5715 "configure" | |
5712 | 5715 | #include "confdefs.h" |
5713 | 5716 | #include <$ac_hdr> |
5714 | 5717 | EOF |
5715 | 5718 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
5716 | -{ (eval echo configure:5717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5719 | +{ (eval echo configure:5720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5717 | 5720 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
5718 | 5721 | if test -z "$ac_err"; then |
5719 | 5722 | rm -rf conftest* |
@@ -5749,17 +5752,17 @@ | ||
5749 | 5752 | do |
5750 | 5753 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
5751 | 5754 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
5752 | -echo "configure:5753: checking for $ac_hdr" >&5 | |
5755 | +echo "configure:5756: checking for $ac_hdr" >&5 | |
5753 | 5756 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
5754 | 5757 | echo $ac_n "(cached) $ac_c" 1>&6 |
5755 | 5758 | else |
5756 | 5759 | cat > conftest.$ac_ext <<EOF |
5757 | -#line 5758 "configure" | |
5760 | +#line 5761 "configure" | |
5758 | 5761 | #include "confdefs.h" |
5759 | 5762 | #include <$ac_hdr> |
5760 | 5763 | EOF |
5761 | 5764 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
5762 | -{ (eval echo configure:5763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5765 | +{ (eval echo configure:5766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5763 | 5766 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
5764 | 5767 | if test -z "$ac_err"; then |
5765 | 5768 | rm -rf conftest* |
@@ -5852,17 +5855,17 @@ | ||
5852 | 5855 | |
5853 | 5856 | |
5854 | 5857 | echo $ac_n "checking quality of toupper""... $ac_c" 1>&6 |
5855 | -echo "configure:5856: checking quality of toupper" >&5 | |
5858 | +echo "configure:5859: checking quality of toupper" >&5 | |
5856 | 5859 | if test "$cross_compiling" = yes; then |
5857 | 5860 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
5858 | 5861 | else |
5859 | 5862 | cat > conftest.$ac_ext <<EOF |
5860 | -#line 5861 "configure" | |
5863 | +#line 5864 "configure" | |
5861 | 5864 | #include "confdefs.h" |
5862 | 5865 | #include <ctype.h> |
5863 | 5866 | main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); } |
5864 | 5867 | EOF |
5865 | -if { (eval echo configure:5866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
5868 | +if { (eval echo configure:5869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
5866 | 5869 | then |
5867 | 5870 | cat >> confdefs.h <<\EOF |
5868 | 5871 | #define BROKEN_TOUPPER 1 |
@@ -5879,16 +5882,16 @@ | ||
5879 | 5882 | |
5880 | 5883 | |
5881 | 5884 | echo $ac_n "checking whether __DATE__ and __TIME__ work""... $ac_c" 1>&6 |
5882 | -echo "configure:5883: checking whether __DATE__ and __TIME__ work" >&5 | |
5885 | +echo "configure:5886: checking whether __DATE__ and __TIME__ work" >&5 | |
5883 | 5886 | cat > conftest.$ac_ext <<EOF |
5884 | -#line 5885 "configure" | |
5887 | +#line 5888 "configure" | |
5885 | 5888 | #include "confdefs.h" |
5886 | 5889 | |
5887 | 5890 | int main() { |
5888 | 5891 | printf("(" __DATE__ " " __TIME__ ")"); |
5889 | 5892 | ; return 0; } |
5890 | 5893 | EOF |
5891 | -if { (eval echo configure:5892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
5894 | +if { (eval echo configure:5895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
5892 | 5895 | rm -rf conftest* |
5893 | 5896 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
5894 | 5897 | #define HAVE_DATE_TIME 1 |
@@ -5904,17 +5907,17 @@ | ||
5904 | 5907 | |
5905 | 5908 | ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'` |
5906 | 5909 | echo $ac_n "checking for elf.h""... $ac_c" 1>&6 |
5907 | -echo "configure:5908: checking for elf.h" >&5 | |
5910 | +echo "configure:5911: checking for elf.h" >&5 | |
5908 | 5911 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
5909 | 5912 | echo $ac_n "(cached) $ac_c" 1>&6 |
5910 | 5913 | else |
5911 | 5914 | cat > conftest.$ac_ext <<EOF |
5912 | -#line 5913 "configure" | |
5915 | +#line 5916 "configure" | |
5913 | 5916 | #include "confdefs.h" |
5914 | 5917 | #include <elf.h> |
5915 | 5918 | EOF |
5916 | 5919 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
5917 | -{ (eval echo configure:5918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5920 | +{ (eval echo configure:5921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
5918 | 5921 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
5919 | 5922 | if test -z "$ac_err"; then |
5920 | 5923 | rm -rf conftest* |
@@ -5937,7 +5940,7 @@ | ||
5937 | 5940 | |
5938 | 5941 | if test "$HAS_ELF" = 1; then |
5939 | 5942 | echo $ac_n "checking for main in -lelf""... $ac_c" 1>&6 |
5940 | -echo "configure:5941: checking for main in -lelf" >&5 | |
5943 | +echo "configure:5944: checking for main in -lelf" >&5 | |
5941 | 5944 | ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'` |
5942 | 5945 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
5943 | 5946 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -5945,14 +5948,14 @@ | ||
5945 | 5948 | ac_save_LIBS="$LIBS" |
5946 | 5949 | LIBS="-lelf $LIBS" |
5947 | 5950 | cat > conftest.$ac_ext <<EOF |
5948 | -#line 5949 "configure" | |
5951 | +#line 5952 "configure" | |
5949 | 5952 | #include "confdefs.h" |
5950 | 5953 | |
5951 | 5954 | int main() { |
5952 | 5955 | main() |
5953 | 5956 | ; return 0; } |
5954 | 5957 | EOF |
5955 | -if { (eval echo configure:5956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5958 | +if { (eval echo configure:5959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
5956 | 5959 | rm -rf conftest* |
5957 | 5960 | eval "ac_cv_lib_$ac_lib_var=yes" |
5958 | 5961 | else |
@@ -5986,12 +5989,12 @@ | ||
5986 | 5989 | do |
5987 | 5990 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
5988 | 5991 | echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 |
5989 | -echo "configure:5990: checking for $ac_hdr that defines DIR" >&5 | |
5992 | +echo "configure:5993: checking for $ac_hdr that defines DIR" >&5 | |
5990 | 5993 | if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then |
5991 | 5994 | echo $ac_n "(cached) $ac_c" 1>&6 |
5992 | 5995 | else |
5993 | 5996 | cat > conftest.$ac_ext <<EOF |
5994 | -#line 5995 "configure" | |
5997 | +#line 5998 "configure" | |
5995 | 5998 | #include "confdefs.h" |
5996 | 5999 | #include <sys/types.h> |
5997 | 6000 | #include <$ac_hdr> |
@@ -5999,7 +6002,7 @@ | ||
5999 | 6002 | DIR *dirp = 0; |
6000 | 6003 | ; return 0; } |
6001 | 6004 | EOF |
6002 | -if { (eval echo configure:6003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6005 | +if { (eval echo configure:6006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6003 | 6006 | rm -rf conftest* |
6004 | 6007 | eval "ac_cv_header_dirent_$ac_safe=yes" |
6005 | 6008 | else |
@@ -6024,7 +6027,7 @@ | ||
6024 | 6027 | # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. |
6025 | 6028 | if test $ac_header_dirent = dirent.h; then |
6026 | 6029 | echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 |
6027 | -echo "configure:6028: checking for opendir in -ldir" >&5 | |
6030 | +echo "configure:6031: checking for opendir in -ldir" >&5 | |
6028 | 6031 | ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` |
6029 | 6032 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
6030 | 6033 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -6032,7 +6035,7 @@ | ||
6032 | 6035 | ac_save_LIBS="$LIBS" |
6033 | 6036 | LIBS="-ldir $LIBS" |
6034 | 6037 | cat > conftest.$ac_ext <<EOF |
6035 | -#line 6036 "configure" | |
6038 | +#line 6039 "configure" | |
6036 | 6039 | #include "confdefs.h" |
6037 | 6040 | /* Override any gcc2 internal prototype to avoid an error. */ |
6038 | 6041 | /* We use char because int might match the return type of a gcc2 |
@@ -6043,7 +6046,7 @@ | ||
6043 | 6046 | opendir() |
6044 | 6047 | ; return 0; } |
6045 | 6048 | EOF |
6046 | -if { (eval echo configure:6047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
6049 | +if { (eval echo configure:6050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
6047 | 6050 | rm -rf conftest* |
6048 | 6051 | eval "ac_cv_lib_$ac_lib_var=yes" |
6049 | 6052 | else |
@@ -6065,7 +6068,7 @@ | ||
6065 | 6068 | |
6066 | 6069 | else |
6067 | 6070 | echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 |
6068 | -echo "configure:6069: checking for opendir in -lx" >&5 | |
6071 | +echo "configure:6072: checking for opendir in -lx" >&5 | |
6069 | 6072 | ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` |
6070 | 6073 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
6071 | 6074 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -6073,7 +6076,7 @@ | ||
6073 | 6076 | ac_save_LIBS="$LIBS" |
6074 | 6077 | LIBS="-lx $LIBS" |
6075 | 6078 | cat > conftest.$ac_ext <<EOF |
6076 | -#line 6077 "configure" | |
6079 | +#line 6080 "configure" | |
6077 | 6080 | #include "confdefs.h" |
6078 | 6081 | /* Override any gcc2 internal prototype to avoid an error. */ |
6079 | 6082 | /* We use char because int might match the return type of a gcc2 |
@@ -6084,7 +6087,7 @@ | ||
6084 | 6087 | opendir() |
6085 | 6088 | ; return 0; } |
6086 | 6089 | EOF |
6087 | -if { (eval echo configure:6088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
6090 | +if { (eval echo configure:6091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
6088 | 6091 | rm -rf conftest* |
6089 | 6092 | eval "ac_cv_lib_$ac_lib_var=yes" |
6090 | 6093 | else |
@@ -6108,12 +6111,12 @@ | ||
6108 | 6111 | |
6109 | 6112 | |
6110 | 6113 | echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 |
6111 | -echo "configure:6112: checking for ANSI C header files" >&5 | |
6114 | +echo "configure:6115: checking for ANSI C header files" >&5 | |
6112 | 6115 | if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then |
6113 | 6116 | echo $ac_n "(cached) $ac_c" 1>&6 |
6114 | 6117 | else |
6115 | 6118 | cat > conftest.$ac_ext <<EOF |
6116 | -#line 6117 "configure" | |
6119 | +#line 6120 "configure" | |
6117 | 6120 | #include "confdefs.h" |
6118 | 6121 | #include <stdlib.h> |
6119 | 6122 | #include <stdarg.h> |
@@ -6121,7 +6124,7 @@ | ||
6121 | 6124 | #include <float.h> |
6122 | 6125 | EOF |
6123 | 6126 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
6124 | -{ (eval echo configure:6125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
6127 | +{ (eval echo configure:6128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
6125 | 6128 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
6126 | 6129 | if test -z "$ac_err"; then |
6127 | 6130 | rm -rf conftest* |
@@ -6138,7 +6141,7 @@ | ||
6138 | 6141 | if test $ac_cv_header_stdc = yes; then |
6139 | 6142 | # SunOS 4.x string.h does not declare mem*, contrary to ANSI. |
6140 | 6143 | cat > conftest.$ac_ext <<EOF |
6141 | -#line 6142 "configure" | |
6144 | +#line 6145 "configure" | |
6142 | 6145 | #include "confdefs.h" |
6143 | 6146 | #include <string.h> |
6144 | 6147 | EOF |
@@ -6156,7 +6159,7 @@ | ||
6156 | 6159 | if test $ac_cv_header_stdc = yes; then |
6157 | 6160 | # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. |
6158 | 6161 | cat > conftest.$ac_ext <<EOF |
6159 | -#line 6160 "configure" | |
6162 | +#line 6163 "configure" | |
6160 | 6163 | #include "confdefs.h" |
6161 | 6164 | #include <stdlib.h> |
6162 | 6165 | EOF |
@@ -6177,7 +6180,7 @@ | ||
6177 | 6180 | : |
6178 | 6181 | else |
6179 | 6182 | cat > conftest.$ac_ext <<EOF |
6180 | -#line 6181 "configure" | |
6183 | +#line 6184 "configure" | |
6181 | 6184 | #include "confdefs.h" |
6182 | 6185 | #include <ctype.h> |
6183 | 6186 | #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') |
@@ -6188,7 +6191,7 @@ | ||
6188 | 6191 | exit (0); } |
6189 | 6192 | |
6190 | 6193 | EOF |
6191 | -if { (eval echo configure:6192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
6194 | +if { (eval echo configure:6195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
6192 | 6195 | then |
6193 | 6196 | : |
6194 | 6197 | else |
@@ -6212,12 +6215,12 @@ | ||
6212 | 6215 | fi |
6213 | 6216 | |
6214 | 6217 | echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 |
6215 | -echo "configure:6216: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
6218 | +echo "configure:6219: checking for sys/wait.h that is POSIX.1 compatible" >&5 | |
6216 | 6219 | if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then |
6217 | 6220 | echo $ac_n "(cached) $ac_c" 1>&6 |
6218 | 6221 | else |
6219 | 6222 | cat > conftest.$ac_ext <<EOF |
6220 | -#line 6221 "configure" | |
6223 | +#line 6224 "configure" | |
6221 | 6224 | #include "confdefs.h" |
6222 | 6225 | #include <sys/types.h> |
6223 | 6226 | #include <sys/wait.h> |
@@ -6233,7 +6236,7 @@ | ||
6233 | 6236 | s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; |
6234 | 6237 | ; return 0; } |
6235 | 6238 | EOF |
6236 | -if { (eval echo configure:6237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6239 | +if { (eval echo configure:6240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6237 | 6240 | rm -rf conftest* |
6238 | 6241 | ac_cv_header_sys_wait_h=yes |
6239 | 6242 | else |
@@ -6256,16 +6259,16 @@ | ||
6256 | 6259 | |
6257 | 6260 | if test $ac_cv_header_sys_wait_h = no; then |
6258 | 6261 | echo $ac_n "checking for sys/wait.h that defines union wait""... $ac_c" 1>&6 |
6259 | -echo "configure:6260: checking for sys/wait.h that defines union wait" >&5 | |
6262 | +echo "configure:6263: checking for sys/wait.h that defines union wait" >&5 | |
6260 | 6263 | cat > conftest.$ac_ext <<EOF |
6261 | -#line 6262 "configure" | |
6264 | +#line 6265 "configure" | |
6262 | 6265 | #include "confdefs.h" |
6263 | 6266 | #include <sys/wait.h> |
6264 | 6267 | int main() { |
6265 | 6268 | union wait xx, yy; xx = yy |
6266 | 6269 | ; return 0; } |
6267 | 6270 | EOF |
6268 | -if { (eval echo configure:6269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6271 | +if { (eval echo configure:6272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6269 | 6272 | rm -rf conftest* |
6270 | 6273 | echo "$ac_t""yes" 1>&6 |
6271 | 6274 | cat >> confdefs.h <<\EOF |
@@ -6296,17 +6299,17 @@ | ||
6296 | 6299 | do |
6297 | 6300 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
6298 | 6301 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
6299 | -echo "configure:6300: checking for $ac_hdr" >&5 | |
6302 | +echo "configure:6303: checking for $ac_hdr" >&5 | |
6300 | 6303 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
6301 | 6304 | echo $ac_n "(cached) $ac_c" 1>&6 |
6302 | 6305 | else |
6303 | 6306 | cat > conftest.$ac_ext <<EOF |
6304 | -#line 6305 "configure" | |
6307 | +#line 6308 "configure" | |
6305 | 6308 | #include "confdefs.h" |
6306 | 6309 | #include <$ac_hdr> |
6307 | 6310 | EOF |
6308 | 6311 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
6309 | -{ (eval echo configure:6310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
6312 | +{ (eval echo configure:6313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
6310 | 6313 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
6311 | 6314 | if test -z "$ac_err"; then |
6312 | 6315 | rm -rf conftest* |
@@ -6338,17 +6341,17 @@ | ||
6338 | 6341 | do |
6339 | 6342 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
6340 | 6343 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
6341 | -echo "configure:6342: checking for $ac_hdr" >&5 | |
6344 | +echo "configure:6345: checking for $ac_hdr" >&5 | |
6342 | 6345 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
6343 | 6346 | echo $ac_n "(cached) $ac_c" 1>&6 |
6344 | 6347 | else |
6345 | 6348 | cat > conftest.$ac_ext <<EOF |
6346 | -#line 6347 "configure" | |
6349 | +#line 6350 "configure" | |
6347 | 6350 | #include "confdefs.h" |
6348 | 6351 | #include <$ac_hdr> |
6349 | 6352 | EOF |
6350 | 6353 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
6351 | -{ (eval echo configure:6352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
6354 | +{ (eval echo configure:6355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
6352 | 6355 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
6353 | 6356 | if test -z "$ac_err"; then |
6354 | 6357 | rm -rf conftest* |
@@ -6377,11 +6380,11 @@ | ||
6377 | 6380 | fi |
6378 | 6381 | |
6379 | 6382 | echo $ac_n "checking if strings.h can be included after string.h""... $ac_c" 1>&6 |
6380 | -echo "configure:6381: checking if strings.h can be included after string.h" >&5 | |
6383 | +echo "configure:6384: checking if strings.h can be included after string.h" >&5 | |
6381 | 6384 | cppflags_save=$CPPFLAGS |
6382 | 6385 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" |
6383 | 6386 | cat > conftest.$ac_ext <<EOF |
6384 | -#line 6385 "configure" | |
6387 | +#line 6388 "configure" | |
6385 | 6388 | #include "confdefs.h" |
6386 | 6389 | |
6387 | 6390 | #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO) |
@@ -6402,7 +6405,7 @@ | ||
6402 | 6405 | int i; i = 0; |
6403 | 6406 | ; return 0; } |
6404 | 6407 | EOF |
6405 | -if { (eval echo configure:6406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6408 | +if { (eval echo configure:6409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6406 | 6409 | rm -rf conftest* |
6407 | 6410 | echo "$ac_t""yes" 1>&6 |
6408 | 6411 | else |
@@ -6420,13 +6423,13 @@ | ||
6420 | 6423 | |
6421 | 6424 | if test $ac_cv_prog_gcc = yes; then |
6422 | 6425 | echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 |
6423 | -echo "configure:6424: checking whether ${CC-cc} needs -traditional" >&5 | |
6426 | +echo "configure:6427: checking whether ${CC-cc} needs -traditional" >&5 | |
6424 | 6427 | if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then |
6425 | 6428 | echo $ac_n "(cached) $ac_c" 1>&6 |
6426 | 6429 | else |
6427 | 6430 | ac_pattern="Autoconf.*'x'" |
6428 | 6431 | cat > conftest.$ac_ext <<EOF |
6429 | -#line 6430 "configure" | |
6432 | +#line 6433 "configure" | |
6430 | 6433 | #include "confdefs.h" |
6431 | 6434 | #include <sgtty.h> |
6432 | 6435 | Autoconf TIOCGETP |
@@ -6444,7 +6447,7 @@ | ||
6444 | 6447 | |
6445 | 6448 | if test $ac_cv_prog_gcc_traditional = no; then |
6446 | 6449 | cat > conftest.$ac_ext <<EOF |
6447 | -#line 6448 "configure" | |
6450 | +#line 6451 "configure" | |
6448 | 6451 | #include "confdefs.h" |
6449 | 6452 | #include <termio.h> |
6450 | 6453 | Autoconf TCGETA |
@@ -6466,12 +6469,12 @@ | ||
6466 | 6469 | fi |
6467 | 6470 | |
6468 | 6471 | echo $ac_n "checking for working const""... $ac_c" 1>&6 |
6469 | -echo "configure:6470: checking for working const" >&5 | |
6472 | +echo "configure:6473: checking for working const" >&5 | |
6470 | 6473 | if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then |
6471 | 6474 | echo $ac_n "(cached) $ac_c" 1>&6 |
6472 | 6475 | else |
6473 | 6476 | cat > conftest.$ac_ext <<EOF |
6474 | -#line 6475 "configure" | |
6477 | +#line 6478 "configure" | |
6475 | 6478 | #include "confdefs.h" |
6476 | 6479 | |
6477 | 6480 | int main() { |
@@ -6520,7 +6523,7 @@ | ||
6520 | 6523 | |
6521 | 6524 | ; return 0; } |
6522 | 6525 | EOF |
6523 | -if { (eval echo configure:6524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6526 | +if { (eval echo configure:6527: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6524 | 6527 | rm -rf conftest* |
6525 | 6528 | ac_cv_c_const=yes |
6526 | 6529 | else |
@@ -6541,12 +6544,12 @@ | ||
6541 | 6544 | fi |
6542 | 6545 | |
6543 | 6546 | echo $ac_n "checking for mode_t""... $ac_c" 1>&6 |
6544 | -echo "configure:6545: checking for mode_t" >&5 | |
6547 | +echo "configure:6548: checking for mode_t" >&5 | |
6545 | 6548 | if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then |
6546 | 6549 | echo $ac_n "(cached) $ac_c" 1>&6 |
6547 | 6550 | else |
6548 | 6551 | cat > conftest.$ac_ext <<EOF |
6549 | -#line 6550 "configure" | |
6552 | +#line 6553 "configure" | |
6550 | 6553 | #include "confdefs.h" |
6551 | 6554 | #include <sys/types.h> |
6552 | 6555 | #if STDC_HEADERS |
@@ -6574,12 +6577,12 @@ | ||
6574 | 6577 | fi |
6575 | 6578 | |
6576 | 6579 | echo $ac_n "checking for off_t""... $ac_c" 1>&6 |
6577 | -echo "configure:6578: checking for off_t" >&5 | |
6580 | +echo "configure:6581: checking for off_t" >&5 | |
6578 | 6581 | if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then |
6579 | 6582 | echo $ac_n "(cached) $ac_c" 1>&6 |
6580 | 6583 | else |
6581 | 6584 | cat > conftest.$ac_ext <<EOF |
6582 | -#line 6583 "configure" | |
6585 | +#line 6586 "configure" | |
6583 | 6586 | #include "confdefs.h" |
6584 | 6587 | #include <sys/types.h> |
6585 | 6588 | #if STDC_HEADERS |
@@ -6607,12 +6610,12 @@ | ||
6607 | 6610 | fi |
6608 | 6611 | |
6609 | 6612 | echo $ac_n "checking for pid_t""... $ac_c" 1>&6 |
6610 | -echo "configure:6611: checking for pid_t" >&5 | |
6613 | +echo "configure:6614: checking for pid_t" >&5 | |
6611 | 6614 | if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then |
6612 | 6615 | echo $ac_n "(cached) $ac_c" 1>&6 |
6613 | 6616 | else |
6614 | 6617 | cat > conftest.$ac_ext <<EOF |
6615 | -#line 6616 "configure" | |
6618 | +#line 6619 "configure" | |
6616 | 6619 | #include "confdefs.h" |
6617 | 6620 | #include <sys/types.h> |
6618 | 6621 | #if STDC_HEADERS |
@@ -6640,12 +6643,12 @@ | ||
6640 | 6643 | fi |
6641 | 6644 | |
6642 | 6645 | echo $ac_n "checking for size_t""... $ac_c" 1>&6 |
6643 | -echo "configure:6644: checking for size_t" >&5 | |
6646 | +echo "configure:6647: checking for size_t" >&5 | |
6644 | 6647 | if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then |
6645 | 6648 | echo $ac_n "(cached) $ac_c" 1>&6 |
6646 | 6649 | else |
6647 | 6650 | cat > conftest.$ac_ext <<EOF |
6648 | -#line 6649 "configure" | |
6651 | +#line 6652 "configure" | |
6649 | 6652 | #include "confdefs.h" |
6650 | 6653 | #include <sys/types.h> |
6651 | 6654 | #if STDC_HEADERS |
@@ -6673,12 +6676,12 @@ | ||
6673 | 6676 | fi |
6674 | 6677 | |
6675 | 6678 | echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 |
6676 | -echo "configure:6677: checking for uid_t in sys/types.h" >&5 | |
6679 | +echo "configure:6680: checking for uid_t in sys/types.h" >&5 | |
6677 | 6680 | if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then |
6678 | 6681 | echo $ac_n "(cached) $ac_c" 1>&6 |
6679 | 6682 | else |
6680 | 6683 | cat > conftest.$ac_ext <<EOF |
6681 | -#line 6682 "configure" | |
6684 | +#line 6685 "configure" | |
6682 | 6685 | #include "confdefs.h" |
6683 | 6686 | #include <sys/types.h> |
6684 | 6687 | EOF |
@@ -6707,12 +6710,12 @@ | ||
6707 | 6710 | fi |
6708 | 6711 | |
6709 | 6712 | echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 |
6710 | -echo "configure:6711: checking whether time.h and sys/time.h may both be included" >&5 | |
6713 | +echo "configure:6714: checking whether time.h and sys/time.h may both be included" >&5 | |
6711 | 6714 | if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then |
6712 | 6715 | echo $ac_n "(cached) $ac_c" 1>&6 |
6713 | 6716 | else |
6714 | 6717 | cat > conftest.$ac_ext <<EOF |
6715 | -#line 6716 "configure" | |
6718 | +#line 6719 "configure" | |
6716 | 6719 | #include "confdefs.h" |
6717 | 6720 | #include <sys/types.h> |
6718 | 6721 | #include <sys/time.h> |
@@ -6721,7 +6724,7 @@ | ||
6721 | 6724 | struct tm *tp; |
6722 | 6725 | ; return 0; } |
6723 | 6726 | EOF |
6724 | -if { (eval echo configure:6725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6727 | +if { (eval echo configure:6728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6725 | 6728 | rm -rf conftest* |
6726 | 6729 | ac_cv_header_time=yes |
6727 | 6730 | else |
@@ -6742,12 +6745,12 @@ | ||
6742 | 6745 | fi |
6743 | 6746 | |
6744 | 6747 | echo $ac_n "checking for ino_t""... $ac_c" 1>&6 |
6745 | -echo "configure:6746: checking for ino_t" >&5 | |
6748 | +echo "configure:6749: checking for ino_t" >&5 | |
6746 | 6749 | if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then |
6747 | 6750 | echo $ac_n "(cached) $ac_c" 1>&6 |
6748 | 6751 | else |
6749 | 6752 | cat > conftest.$ac_ext <<EOF |
6750 | -#line 6751 "configure" | |
6753 | +#line 6754 "configure" | |
6751 | 6754 | #include "confdefs.h" |
6752 | 6755 | #include <sys/types.h> |
6753 | 6756 | #if STDC_HEADERS |
@@ -6775,12 +6778,12 @@ | ||
6775 | 6778 | fi |
6776 | 6779 | |
6777 | 6780 | echo $ac_n "checking for dev_t""... $ac_c" 1>&6 |
6778 | -echo "configure:6779: checking for dev_t" >&5 | |
6781 | +echo "configure:6782: checking for dev_t" >&5 | |
6779 | 6782 | if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then |
6780 | 6783 | echo $ac_n "(cached) $ac_c" 1>&6 |
6781 | 6784 | else |
6782 | 6785 | cat > conftest.$ac_ext <<EOF |
6783 | -#line 6784 "configure" | |
6786 | +#line 6787 "configure" | |
6784 | 6787 | #include "confdefs.h" |
6785 | 6788 | #include <sys/types.h> |
6786 | 6789 | #if STDC_HEADERS |
@@ -6809,12 +6812,12 @@ | ||
6809 | 6812 | |
6810 | 6813 | |
6811 | 6814 | echo $ac_n "checking for rlim_t""... $ac_c" 1>&6 |
6812 | -echo "configure:6813: checking for rlim_t" >&5 | |
6815 | +echo "configure:6816: checking for rlim_t" >&5 | |
6813 | 6816 | if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then |
6814 | 6817 | echo "$ac_t""(cached) $ac_cv_type_rlim_t" 1>&6 |
6815 | 6818 | else |
6816 | 6819 | cat > conftest.$ac_ext <<EOF |
6817 | -#line 6818 "configure" | |
6820 | +#line 6821 "configure" | |
6818 | 6821 | #include "confdefs.h" |
6819 | 6822 | |
6820 | 6823 | #include <sys/types.h> |
@@ -6846,12 +6849,12 @@ | ||
6846 | 6849 | fi |
6847 | 6850 | |
6848 | 6851 | echo $ac_n "checking for stack_t""... $ac_c" 1>&6 |
6849 | -echo "configure:6850: checking for stack_t" >&5 | |
6852 | +echo "configure:6853: checking for stack_t" >&5 | |
6850 | 6853 | if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then |
6851 | 6854 | echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6 |
6852 | 6855 | else |
6853 | 6856 | cat > conftest.$ac_ext <<EOF |
6854 | -#line 6855 "configure" | |
6857 | +#line 6858 "configure" | |
6855 | 6858 | #include "confdefs.h" |
6856 | 6859 | |
6857 | 6860 | #include <sys/types.h> |
@@ -6881,9 +6884,9 @@ | ||
6881 | 6884 | fi |
6882 | 6885 | |
6883 | 6886 | echo $ac_n "checking whether stack_t has an ss_base field""... $ac_c" 1>&6 |
6884 | -echo "configure:6885: checking whether stack_t has an ss_base field" >&5 | |
6887 | +echo "configure:6888: checking whether stack_t has an ss_base field" >&5 | |
6885 | 6888 | cat > conftest.$ac_ext <<EOF |
6886 | -#line 6887 "configure" | |
6889 | +#line 6890 "configure" | |
6887 | 6890 | #include "confdefs.h" |
6888 | 6891 | |
6889 | 6892 | #include <sys/types.h> |
@@ -6898,7 +6901,7 @@ | ||
6898 | 6901 | stack_t sigstk; sigstk.ss_base = 0; |
6899 | 6902 | ; return 0; } |
6900 | 6903 | EOF |
6901 | -if { (eval echo configure:6902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6904 | +if { (eval echo configure:6905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
6902 | 6905 | rm -rf conftest* |
6903 | 6906 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
6904 | 6907 | #define HAVE_SS_BASE 1 |
@@ -6914,7 +6917,7 @@ | ||
6914 | 6917 | |
6915 | 6918 | olibs="$LIBS" |
6916 | 6919 | echo $ac_n "checking --with-tlib argument""... $ac_c" 1>&6 |
6917 | -echo "configure:6918: checking --with-tlib argument" >&5 | |
6920 | +echo "configure:6921: checking --with-tlib argument" >&5 | |
6918 | 6921 | # Check whether --with-tlib or --without-tlib was given. |
6919 | 6922 | if test "${with_tlib+set}" = set; then |
6920 | 6923 | withval="$with_tlib" |
@@ -6932,7 +6935,7 @@ | ||
6932 | 6935 | esac |
6933 | 6936 | for libname in $tlibs; do |
6934 | 6937 | echo $ac_n "checking for tgetent in -l${libname}""... $ac_c" 1>&6 |
6935 | -echo "configure:6936: checking for tgetent in -l${libname}" >&5 | |
6938 | +echo "configure:6939: checking for tgetent in -l${libname}" >&5 | |
6936 | 6939 | ac_lib_var=`echo ${libname}'_'tgetent | sed 'y%./+-%__p_%'` |
6937 | 6940 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
6938 | 6941 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -6940,7 +6943,7 @@ | ||
6940 | 6943 | ac_save_LIBS="$LIBS" |
6941 | 6944 | LIBS="-l${libname} $LIBS" |
6942 | 6945 | cat > conftest.$ac_ext <<EOF |
6943 | -#line 6944 "configure" | |
6946 | +#line 6947 "configure" | |
6944 | 6947 | #include "confdefs.h" |
6945 | 6948 | /* Override any gcc2 internal prototype to avoid an error. */ |
6946 | 6949 | /* We use char because int might match the return type of a gcc2 |
@@ -6951,7 +6954,7 @@ | ||
6951 | 6954 | tgetent() |
6952 | 6955 | ; return 0; } |
6953 | 6956 | EOF |
6954 | -if { (eval echo configure:6955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
6957 | +if { (eval echo configure:6958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
6955 | 6958 | rm -rf conftest* |
6956 | 6959 | eval "ac_cv_lib_$ac_lib_var=yes" |
6957 | 6960 | else |
@@ -6983,7 +6986,7 @@ | ||
6983 | 6986 | res="FAIL" |
6984 | 6987 | else |
6985 | 6988 | cat > conftest.$ac_ext <<EOF |
6986 | -#line 6987 "configure" | |
6989 | +#line 6990 "configure" | |
6987 | 6990 | #include "confdefs.h" |
6988 | 6991 | |
6989 | 6992 | #ifdef HAVE_TERMCAP_H |
@@ -6991,7 +6994,7 @@ | ||
6991 | 6994 | #endif |
6992 | 6995 | main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); } |
6993 | 6996 | EOF |
6994 | -if { (eval echo configure:6995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
6997 | +if { (eval echo configure:6998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
6995 | 6998 | then |
6996 | 6999 | res="OK" |
6997 | 7000 | else |
@@ -7013,12 +7016,12 @@ | ||
7013 | 7016 | fi |
7014 | 7017 | if test "x$olibs" != "x$LIBS"; then |
7015 | 7018 | echo $ac_n "checking whether we talk terminfo""... $ac_c" 1>&6 |
7016 | -echo "configure:7017: checking whether we talk terminfo" >&5 | |
7019 | +echo "configure:7020: checking whether we talk terminfo" >&5 | |
7017 | 7020 | if test "$cross_compiling" = yes; then |
7018 | 7021 | { echo "configure: error: failed to compile test program." 1>&2; exit 1; } |
7019 | 7022 | else |
7020 | 7023 | cat > conftest.$ac_ext <<EOF |
7021 | -#line 7022 "configure" | |
7024 | +#line 7025 "configure" | |
7022 | 7025 | #include "confdefs.h" |
7023 | 7026 | |
7024 | 7027 | #ifdef HAVE_TERMCAP_H |
@@ -7027,7 +7030,7 @@ | ||
7027 | 7030 | main() |
7028 | 7031 | {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); } |
7029 | 7032 | EOF |
7030 | -if { (eval echo configure:7031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7033 | +if { (eval echo configure:7034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7031 | 7034 | then |
7032 | 7035 | echo "$ac_t""no -- we are in termcap land" 1>&6 |
7033 | 7036 | else |
@@ -7048,12 +7051,12 @@ | ||
7048 | 7051 | |
7049 | 7052 | if test "x$olibs" != "x$LIBS"; then |
7050 | 7053 | echo $ac_n "checking what tgetent() returns for an unknown terminal""... $ac_c" 1>&6 |
7051 | -echo "configure:7052: checking what tgetent() returns for an unknown terminal" >&5 | |
7054 | +echo "configure:7055: checking what tgetent() returns for an unknown terminal" >&5 | |
7052 | 7055 | if test "$cross_compiling" = yes; then |
7053 | 7056 | { echo "configure: error: failed to compile test program." 1>&2; exit 1; } |
7054 | 7057 | else |
7055 | 7058 | cat > conftest.$ac_ext <<EOF |
7056 | -#line 7057 "configure" | |
7059 | +#line 7060 "configure" | |
7057 | 7060 | #include "confdefs.h" |
7058 | 7061 | |
7059 | 7062 | #ifdef HAVE_TERMCAP_H |
@@ -7062,7 +7065,7 @@ | ||
7062 | 7065 | main() |
7063 | 7066 | {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); } |
7064 | 7067 | EOF |
7065 | -if { (eval echo configure:7066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7068 | +if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7066 | 7069 | then |
7067 | 7070 | echo "$ac_t""zero" 1>&6; cat >> confdefs.h <<\EOF |
7068 | 7071 | #define TGETENT_ZERO_ERR 0 |
@@ -7080,9 +7083,9 @@ | ||
7080 | 7083 | fi |
7081 | 7084 | |
7082 | 7085 | echo $ac_n "checking whether termcap.h contains ospeed""... $ac_c" 1>&6 |
7083 | -echo "configure:7084: checking whether termcap.h contains ospeed" >&5 | |
7086 | +echo "configure:7087: checking whether termcap.h contains ospeed" >&5 | |
7084 | 7087 | cat > conftest.$ac_ext <<EOF |
7085 | -#line 7086 "configure" | |
7088 | +#line 7089 "configure" | |
7086 | 7089 | #include "confdefs.h" |
7087 | 7090 | |
7088 | 7091 | #ifdef HAVE_TERMCAP_H |
@@ -7093,7 +7096,7 @@ | ||
7093 | 7096 | ospeed = 20000 |
7094 | 7097 | ; return 0; } |
7095 | 7098 | EOF |
7096 | -if { (eval echo configure:7097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7099 | +if { (eval echo configure:7100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7097 | 7100 | rm -rf conftest* |
7098 | 7101 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7099 | 7102 | #define HAVE_OSPEED 1 |
@@ -7105,9 +7108,9 @@ | ||
7105 | 7108 | rm -rf conftest* |
7106 | 7109 | echo "$ac_t""no" 1>&6 |
7107 | 7110 | echo $ac_n "checking whether ospeed can be extern""... $ac_c" 1>&6 |
7108 | -echo "configure:7109: checking whether ospeed can be extern" >&5 | |
7111 | +echo "configure:7112: checking whether ospeed can be extern" >&5 | |
7109 | 7112 | cat > conftest.$ac_ext <<EOF |
7110 | -#line 7111 "configure" | |
7113 | +#line 7114 "configure" | |
7111 | 7114 | #include "confdefs.h" |
7112 | 7115 | |
7113 | 7116 | #ifdef HAVE_TERMCAP_H |
@@ -7119,7 +7122,7 @@ | ||
7119 | 7122 | ospeed = 20000 |
7120 | 7123 | ; return 0; } |
7121 | 7124 | EOF |
7122 | -if { (eval echo configure:7123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7125 | +if { (eval echo configure:7126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7123 | 7126 | rm -rf conftest* |
7124 | 7127 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7125 | 7128 | #define OSPEED_EXTERN 1 |
@@ -7137,9 +7140,9 @@ | ||
7137 | 7140 | rm -f conftest* |
7138 | 7141 | |
7139 | 7142 | echo $ac_n "checking whether termcap.h contains UP, BC and PC""... $ac_c" 1>&6 |
7140 | -echo "configure:7141: checking whether termcap.h contains UP, BC and PC" >&5 | |
7143 | +echo "configure:7144: checking whether termcap.h contains UP, BC and PC" >&5 | |
7141 | 7144 | cat > conftest.$ac_ext <<EOF |
7142 | -#line 7143 "configure" | |
7145 | +#line 7146 "configure" | |
7143 | 7146 | #include "confdefs.h" |
7144 | 7147 | |
7145 | 7148 | #ifdef HAVE_TERMCAP_H |
@@ -7150,7 +7153,7 @@ | ||
7150 | 7153 | if (UP == 0 && BC == 0) PC = 1 |
7151 | 7154 | ; return 0; } |
7152 | 7155 | EOF |
7153 | -if { (eval echo configure:7154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7156 | +if { (eval echo configure:7157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7154 | 7157 | rm -rf conftest* |
7155 | 7158 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7156 | 7159 | #define HAVE_UP_BC_PC 1 |
@@ -7162,9 +7165,9 @@ | ||
7162 | 7165 | rm -rf conftest* |
7163 | 7166 | echo "$ac_t""no" 1>&6 |
7164 | 7167 | echo $ac_n "checking whether UP, BC and PC can be extern""... $ac_c" 1>&6 |
7165 | -echo "configure:7166: checking whether UP, BC and PC can be extern" >&5 | |
7168 | +echo "configure:7169: checking whether UP, BC and PC can be extern" >&5 | |
7166 | 7169 | cat > conftest.$ac_ext <<EOF |
7167 | -#line 7168 "configure" | |
7170 | +#line 7171 "configure" | |
7168 | 7171 | #include "confdefs.h" |
7169 | 7172 | |
7170 | 7173 | #ifdef HAVE_TERMCAP_H |
@@ -7176,7 +7179,7 @@ | ||
7176 | 7179 | if (UP == 0 && BC == 0) PC = 1 |
7177 | 7180 | ; return 0; } |
7178 | 7181 | EOF |
7179 | -if { (eval echo configure:7180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7182 | +if { (eval echo configure:7183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7180 | 7183 | rm -rf conftest* |
7181 | 7184 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7182 | 7185 | #define UP_BC_PC_EXTERN 1 |
@@ -7194,9 +7197,9 @@ | ||
7194 | 7197 | rm -f conftest* |
7195 | 7198 | |
7196 | 7199 | echo $ac_n "checking whether tputs() uses outfuntype""... $ac_c" 1>&6 |
7197 | -echo "configure:7198: checking whether tputs() uses outfuntype" >&5 | |
7200 | +echo "configure:7201: checking whether tputs() uses outfuntype" >&5 | |
7198 | 7201 | cat > conftest.$ac_ext <<EOF |
7199 | -#line 7200 "configure" | |
7202 | +#line 7203 "configure" | |
7200 | 7203 | #include "confdefs.h" |
7201 | 7204 | |
7202 | 7205 | #ifdef HAVE_TERMCAP_H |
@@ -7207,7 +7210,7 @@ | ||
7207 | 7210 | extern int xx(); tputs("test", 1, (outfuntype)xx) |
7208 | 7211 | ; return 0; } |
7209 | 7212 | EOF |
7210 | -if { (eval echo configure:7211: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7213 | +if { (eval echo configure:7214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7211 | 7214 | rm -rf conftest* |
7212 | 7215 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7213 | 7216 | #define HAVE_OUTFUNTYPE 1 |
@@ -7222,9 +7225,9 @@ | ||
7222 | 7225 | rm -f conftest* |
7223 | 7226 | |
7224 | 7227 | echo $ac_n "checking whether sys/select.h and sys/time.h may both be included""... $ac_c" 1>&6 |
7225 | -echo "configure:7226: checking whether sys/select.h and sys/time.h may both be included" >&5 | |
7228 | +echo "configure:7229: checking whether sys/select.h and sys/time.h may both be included" >&5 | |
7226 | 7229 | cat > conftest.$ac_ext <<EOF |
7227 | -#line 7228 "configure" | |
7230 | +#line 7231 "configure" | |
7228 | 7231 | #include "confdefs.h" |
7229 | 7232 | |
7230 | 7233 | #include <sys/types.h> |
@@ -7234,7 +7237,7 @@ | ||
7234 | 7237 | |
7235 | 7238 | ; return 0; } |
7236 | 7239 | EOF |
7237 | -if { (eval echo configure:7238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7240 | +if { (eval echo configure:7241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7238 | 7241 | rm -rf conftest* |
7239 | 7242 | echo "$ac_t""yes" 1>&6 |
7240 | 7243 | cat >> confdefs.h <<\EOF |
@@ -7251,7 +7254,7 @@ | ||
7251 | 7254 | |
7252 | 7255 | |
7253 | 7256 | echo $ac_n "checking for /dev/ptc""... $ac_c" 1>&6 |
7254 | -echo "configure:7255: checking for /dev/ptc" >&5 | |
7257 | +echo "configure:7258: checking for /dev/ptc" >&5 | |
7255 | 7258 | if test -r /dev/ptc; then |
7256 | 7259 | cat >> confdefs.h <<\EOF |
7257 | 7260 | #define HAVE_DEV_PTC 1 |
@@ -7263,17 +7266,17 @@ | ||
7263 | 7266 | fi |
7264 | 7267 | |
7265 | 7268 | echo $ac_n "checking for SVR4 ptys""... $ac_c" 1>&6 |
7266 | -echo "configure:7267: checking for SVR4 ptys" >&5 | |
7269 | +echo "configure:7270: checking for SVR4 ptys" >&5 | |
7267 | 7270 | if test -c /dev/ptmx ; then |
7268 | 7271 | cat > conftest.$ac_ext <<EOF |
7269 | -#line 7270 "configure" | |
7272 | +#line 7273 "configure" | |
7270 | 7273 | #include "confdefs.h" |
7271 | 7274 | |
7272 | 7275 | int main() { |
7273 | 7276 | ptsname(0);grantpt(0);unlockpt(0); |
7274 | 7277 | ; return 0; } |
7275 | 7278 | EOF |
7276 | -if { (eval echo configure:7277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7279 | +if { (eval echo configure:7280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7277 | 7280 | rm -rf conftest* |
7278 | 7281 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7279 | 7282 | #define HAVE_SVR4_PTYS 1 |
@@ -7291,14 +7294,14 @@ | ||
7291 | 7294 | fi |
7292 | 7295 | |
7293 | 7296 | echo $ac_n "checking for ptyranges""... $ac_c" 1>&6 |
7294 | -echo "configure:7295: checking for ptyranges" >&5 | |
7297 | +echo "configure:7298: checking for ptyranges" >&5 | |
7295 | 7298 | if test -d /dev/ptym ; then |
7296 | 7299 | pdir='/dev/ptym' |
7297 | 7300 | else |
7298 | 7301 | pdir='/dev' |
7299 | 7302 | fi |
7300 | 7303 | cat > conftest.$ac_ext <<EOF |
7301 | -#line 7302 "configure" | |
7304 | +#line 7305 "configure" | |
7302 | 7305 | #include "confdefs.h" |
7303 | 7306 | #ifdef M_UNIX |
7304 | 7307 | yes; |
@@ -7332,13 +7335,13 @@ | ||
7332 | 7335 | fi |
7333 | 7336 | |
7334 | 7337 | echo $ac_n "checking default tty permissions/group""... $ac_c" 1>&6 |
7335 | -echo "configure:7336: checking default tty permissions/group" >&5 | |
7338 | +echo "configure:7339: checking default tty permissions/group" >&5 | |
7336 | 7339 | rm -f conftest_grp |
7337 | 7340 | if test "$cross_compiling" = yes; then |
7338 | 7341 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
7339 | 7342 | else |
7340 | 7343 | cat > conftest.$ac_ext <<EOF |
7341 | -#line 7342 "configure" | |
7344 | +#line 7345 "configure" | |
7342 | 7345 | #include "confdefs.h" |
7343 | 7346 | |
7344 | 7347 | #include <sys/types.h> |
@@ -7370,7 +7373,7 @@ | ||
7370 | 7373 | } |
7371 | 7374 | |
7372 | 7375 | EOF |
7373 | -if { (eval echo configure:7374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7376 | +if { (eval echo configure:7377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7374 | 7377 | then |
7375 | 7378 | |
7376 | 7379 | if test -f conftest_grp; then |
@@ -7401,12 +7404,12 @@ | ||
7401 | 7404 | |
7402 | 7405 | |
7403 | 7406 | echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 |
7404 | -echo "configure:7405: checking return type of signal handlers" >&5 | |
7407 | +echo "configure:7408: checking return type of signal handlers" >&5 | |
7405 | 7408 | if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then |
7406 | 7409 | echo $ac_n "(cached) $ac_c" 1>&6 |
7407 | 7410 | else |
7408 | 7411 | cat > conftest.$ac_ext <<EOF |
7409 | -#line 7410 "configure" | |
7412 | +#line 7413 "configure" | |
7410 | 7413 | #include "confdefs.h" |
7411 | 7414 | #include <sys/types.h> |
7412 | 7415 | #include <signal.h> |
@@ -7423,7 +7426,7 @@ | ||
7423 | 7426 | int i; |
7424 | 7427 | ; return 0; } |
7425 | 7428 | EOF |
7426 | -if { (eval echo configure:7427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7429 | +if { (eval echo configure:7430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7427 | 7430 | rm -rf conftest* |
7428 | 7431 | ac_cv_type_signal=void |
7429 | 7432 | else |
@@ -7455,9 +7458,9 @@ | ||
7455 | 7458 | fi |
7456 | 7459 | |
7457 | 7460 | echo $ac_n "checking for struct sigcontext""... $ac_c" 1>&6 |
7458 | -echo "configure:7459: checking for struct sigcontext" >&5 | |
7461 | +echo "configure:7462: checking for struct sigcontext" >&5 | |
7459 | 7462 | cat > conftest.$ac_ext <<EOF |
7460 | -#line 7461 "configure" | |
7463 | +#line 7464 "configure" | |
7461 | 7464 | #include "confdefs.h" |
7462 | 7465 | |
7463 | 7466 | #include <signal.h> |
@@ -7471,7 +7474,7 @@ | ||
7471 | 7474 | |
7472 | 7475 | ; return 0; } |
7473 | 7476 | EOF |
7474 | -if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7477 | +if { (eval echo configure:7478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7475 | 7478 | rm -rf conftest* |
7476 | 7479 | echo "$ac_t""yes" 1>&6 |
7477 | 7480 | cat >> confdefs.h <<\EOF |
@@ -7487,12 +7490,12 @@ | ||
7487 | 7490 | rm -f conftest* |
7488 | 7491 | |
7489 | 7492 | echo $ac_n "checking getcwd implementation""... $ac_c" 1>&6 |
7490 | -echo "configure:7491: checking getcwd implementation" >&5 | |
7493 | +echo "configure:7494: checking getcwd implementation" >&5 | |
7491 | 7494 | if test "$cross_compiling" = yes; then |
7492 | 7495 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
7493 | 7496 | else |
7494 | 7497 | cat > conftest.$ac_ext <<EOF |
7495 | -#line 7496 "configure" | |
7498 | +#line 7499 "configure" | |
7496 | 7499 | #include "confdefs.h" |
7497 | 7500 | |
7498 | 7501 | char *dagger[] = { "IFS=pwd", 0 }; |
@@ -7504,7 +7507,7 @@ | ||
7504 | 7507 | return getcwd(buffer, 500) ? 0 : 1; |
7505 | 7508 | } |
7506 | 7509 | EOF |
7507 | -if { (eval echo configure:7508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7510 | +if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7508 | 7511 | then |
7509 | 7512 | echo "$ac_t""it is usable" 1>&6 |
7510 | 7513 | else |
@@ -7529,12 +7532,12 @@ | ||
7529 | 7532 | strnicmp strpbrk strtol tgetent towlower towupper usleep utime utimes |
7530 | 7533 | do |
7531 | 7534 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
7532 | -echo "configure:7533: checking for $ac_func" >&5 | |
7535 | +echo "configure:7536: checking for $ac_func" >&5 | |
7533 | 7536 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
7534 | 7537 | echo $ac_n "(cached) $ac_c" 1>&6 |
7535 | 7538 | else |
7536 | 7539 | cat > conftest.$ac_ext <<EOF |
7537 | -#line 7538 "configure" | |
7540 | +#line 7541 "configure" | |
7538 | 7541 | #include "confdefs.h" |
7539 | 7542 | /* System header to define __stub macros and hopefully few prototypes, |
7540 | 7543 | which can conflict with char $ac_func(); below. */ |
@@ -7557,7 +7560,7 @@ | ||
7557 | 7560 | |
7558 | 7561 | ; return 0; } |
7559 | 7562 | EOF |
7560 | -if { (eval echo configure:7561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7563 | +if { (eval echo configure:7564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7561 | 7564 | rm -rf conftest* |
7562 | 7565 | eval "ac_cv_func_$ac_func=yes" |
7563 | 7566 | else |
@@ -7583,9 +7586,9 @@ | ||
7583 | 7586 | |
7584 | 7587 | |
7585 | 7588 | echo $ac_n "checking for st_blksize""... $ac_c" 1>&6 |
7586 | -echo "configure:7587: checking for st_blksize" >&5 | |
7589 | +echo "configure:7590: checking for st_blksize" >&5 | |
7587 | 7590 | cat > conftest.$ac_ext <<EOF |
7588 | -#line 7589 "configure" | |
7591 | +#line 7592 "configure" | |
7589 | 7592 | #include "confdefs.h" |
7590 | 7593 | #include <sys/types.h> |
7591 | 7594 | #include <sys/stat.h> |
@@ -7597,7 +7600,7 @@ | ||
7597 | 7600 | n = (int)st.st_blksize; |
7598 | 7601 | ; return 0; } |
7599 | 7602 | EOF |
7600 | -if { (eval echo configure:7601: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7603 | +if { (eval echo configure:7604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
7601 | 7604 | rm -rf conftest* |
7602 | 7605 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7603 | 7606 | #define HAVE_ST_BLKSIZE 1 |
@@ -7612,18 +7615,18 @@ | ||
7612 | 7615 | rm -f conftest* |
7613 | 7616 | |
7614 | 7617 | echo $ac_n "checking whether stat() ignores a trailing slash""... $ac_c" 1>&6 |
7615 | -echo "configure:7616: checking whether stat() ignores a trailing slash" >&5 | |
7618 | +echo "configure:7619: checking whether stat() ignores a trailing slash" >&5 | |
7616 | 7619 | if test "$cross_compiling" = yes; then |
7617 | 7620 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
7618 | 7621 | else |
7619 | 7622 | cat > conftest.$ac_ext <<EOF |
7620 | -#line 7621 "configure" | |
7623 | +#line 7624 "configure" | |
7621 | 7624 | #include "confdefs.h" |
7622 | 7625 | #include <sys/types.h> |
7623 | 7626 | #include <sys/stat.h> |
7624 | 7627 | main() {struct stat st; exit(stat("configure/", &st) != 0); } |
7625 | 7628 | EOF |
7626 | -if { (eval echo configure:7627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7629 | +if { (eval echo configure:7630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
7627 | 7630 | then |
7628 | 7631 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7629 | 7632 | #define STAT_IGNORES_SLASH 1 |
@@ -7640,11 +7643,11 @@ | ||
7640 | 7643 | |
7641 | 7644 | |
7642 | 7645 | echo $ac_n "checking for iconv_open()""... $ac_c" 1>&6 |
7643 | -echo "configure:7644: checking for iconv_open()" >&5 | |
7646 | +echo "configure:7647: checking for iconv_open()" >&5 | |
7644 | 7647 | save_LIBS="$LIBS" |
7645 | 7648 | LIBS="$LIBS -liconv" |
7646 | 7649 | cat > conftest.$ac_ext <<EOF |
7647 | -#line 7648 "configure" | |
7650 | +#line 7651 "configure" | |
7648 | 7651 | #include "confdefs.h" |
7649 | 7652 | |
7650 | 7653 | #ifdef HAVE_ICONV_H |
@@ -7655,7 +7658,7 @@ | ||
7655 | 7658 | iconv_open("fr", "to"); |
7656 | 7659 | ; return 0; } |
7657 | 7660 | EOF |
7658 | -if { (eval echo configure:7659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7661 | +if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7659 | 7662 | rm -rf conftest* |
7660 | 7663 | echo "$ac_t""yes; with -liconv" 1>&6; cat >> confdefs.h <<\EOF |
7661 | 7664 | #define HAVE_ICONV 1 |
@@ -7667,7 +7670,7 @@ | ||
7667 | 7670 | rm -rf conftest* |
7668 | 7671 | LIBS="$save_LIBS" |
7669 | 7672 | cat > conftest.$ac_ext <<EOF |
7670 | -#line 7671 "configure" | |
7673 | +#line 7674 "configure" | |
7671 | 7674 | #include "confdefs.h" |
7672 | 7675 | |
7673 | 7676 | #ifdef HAVE_ICONV_H |
@@ -7678,7 +7681,7 @@ | ||
7678 | 7681 | iconv_open("fr", "to"); |
7679 | 7682 | ; return 0; } |
7680 | 7683 | EOF |
7681 | -if { (eval echo configure:7682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7684 | +if { (eval echo configure:7685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7682 | 7685 | rm -rf conftest* |
7683 | 7686 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7684 | 7687 | #define HAVE_ICONV 1 |
@@ -7696,9 +7699,9 @@ | ||
7696 | 7699 | |
7697 | 7700 | |
7698 | 7701 | echo $ac_n "checking for nl_langinfo(CODESET)""... $ac_c" 1>&6 |
7699 | -echo "configure:7700: checking for nl_langinfo(CODESET)" >&5 | |
7702 | +echo "configure:7703: checking for nl_langinfo(CODESET)" >&5 | |
7700 | 7703 | cat > conftest.$ac_ext <<EOF |
7701 | -#line 7702 "configure" | |
7704 | +#line 7705 "configure" | |
7702 | 7705 | #include "confdefs.h" |
7703 | 7706 | |
7704 | 7707 | #ifdef HAVE_LANGINFO_H |
@@ -7709,7 +7712,7 @@ | ||
7709 | 7712 | char *cs = nl_langinfo(CODESET); |
7710 | 7713 | ; return 0; } |
7711 | 7714 | EOF |
7712 | -if { (eval echo configure:7713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7715 | +if { (eval echo configure:7716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7713 | 7716 | rm -rf conftest* |
7714 | 7717 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7715 | 7718 | #define HAVE_NL_LANGINFO_CODESET 1 |
@@ -7724,7 +7727,7 @@ | ||
7724 | 7727 | rm -f conftest* |
7725 | 7728 | |
7726 | 7729 | echo $ac_n "checking --disable-acl argument""... $ac_c" 1>&6 |
7727 | -echo "configure:7728: checking --disable-acl argument" >&5 | |
7730 | +echo "configure:7731: checking --disable-acl argument" >&5 | |
7728 | 7731 | # Check whether --enable-acl or --disable-acl was given. |
7729 | 7732 | if test "${enable_acl+set}" = set; then |
7730 | 7733 | enableval="$enable_acl" |
@@ -7736,7 +7739,7 @@ | ||
7736 | 7739 | if test "$enable_acl" = "yes"; then |
7737 | 7740 | echo "$ac_t""no" 1>&6 |
7738 | 7741 | echo $ac_n "checking for acl_get_file in -lposix1e""... $ac_c" 1>&6 |
7739 | -echo "configure:7740: checking for acl_get_file in -lposix1e" >&5 | |
7742 | +echo "configure:7743: checking for acl_get_file in -lposix1e" >&5 | |
7740 | 7743 | ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'` |
7741 | 7744 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
7742 | 7745 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -7744,7 +7747,7 @@ | ||
7744 | 7747 | ac_save_LIBS="$LIBS" |
7745 | 7748 | LIBS="-lposix1e $LIBS" |
7746 | 7749 | cat > conftest.$ac_ext <<EOF |
7747 | -#line 7748 "configure" | |
7750 | +#line 7751 "configure" | |
7748 | 7751 | #include "confdefs.h" |
7749 | 7752 | /* Override any gcc2 internal prototype to avoid an error. */ |
7750 | 7753 | /* We use char because int might match the return type of a gcc2 |
@@ -7755,7 +7758,7 @@ | ||
7755 | 7758 | acl_get_file() |
7756 | 7759 | ; return 0; } |
7757 | 7760 | EOF |
7758 | -if { (eval echo configure:7759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7761 | +if { (eval echo configure:7762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7759 | 7762 | rm -rf conftest* |
7760 | 7763 | eval "ac_cv_lib_$ac_lib_var=yes" |
7761 | 7764 | else |
@@ -7774,7 +7777,7 @@ | ||
7774 | 7777 | else |
7775 | 7778 | echo "$ac_t""no" 1>&6 |
7776 | 7779 | echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6 |
7777 | -echo "configure:7778: checking for acl_get_file in -lacl" >&5 | |
7780 | +echo "configure:7781: checking for acl_get_file in -lacl" >&5 | |
7778 | 7781 | ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'` |
7779 | 7782 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
7780 | 7783 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -7782,7 +7785,7 @@ | ||
7782 | 7785 | ac_save_LIBS="$LIBS" |
7783 | 7786 | LIBS="-lacl $LIBS" |
7784 | 7787 | cat > conftest.$ac_ext <<EOF |
7785 | -#line 7786 "configure" | |
7788 | +#line 7789 "configure" | |
7786 | 7789 | #include "confdefs.h" |
7787 | 7790 | /* Override any gcc2 internal prototype to avoid an error. */ |
7788 | 7791 | /* We use char because int might match the return type of a gcc2 |
@@ -7793,7 +7796,7 @@ | ||
7793 | 7796 | acl_get_file() |
7794 | 7797 | ; return 0; } |
7795 | 7798 | EOF |
7796 | -if { (eval echo configure:7797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7799 | +if { (eval echo configure:7800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7797 | 7800 | rm -rf conftest* |
7798 | 7801 | eval "ac_cv_lib_$ac_lib_var=yes" |
7799 | 7802 | else |
@@ -7810,7 +7813,7 @@ | ||
7810 | 7813 | echo "$ac_t""yes" 1>&6 |
7811 | 7814 | LIBS="$LIBS -lacl" |
7812 | 7815 | echo $ac_n "checking for fgetxattr in -lattr""... $ac_c" 1>&6 |
7813 | -echo "configure:7814: checking for fgetxattr in -lattr" >&5 | |
7816 | +echo "configure:7817: checking for fgetxattr in -lattr" >&5 | |
7814 | 7817 | ac_lib_var=`echo attr'_'fgetxattr | sed 'y%./+-%__p_%'` |
7815 | 7818 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
7816 | 7819 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -7818,7 +7821,7 @@ | ||
7818 | 7821 | ac_save_LIBS="$LIBS" |
7819 | 7822 | LIBS="-lattr $LIBS" |
7820 | 7823 | cat > conftest.$ac_ext <<EOF |
7821 | -#line 7822 "configure" | |
7824 | +#line 7825 "configure" | |
7822 | 7825 | #include "confdefs.h" |
7823 | 7826 | /* Override any gcc2 internal prototype to avoid an error. */ |
7824 | 7827 | /* We use char because int might match the return type of a gcc2 |
@@ -7829,7 +7832,7 @@ | ||
7829 | 7832 | fgetxattr() |
7830 | 7833 | ; return 0; } |
7831 | 7834 | EOF |
7832 | -if { (eval echo configure:7833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7835 | +if { (eval echo configure:7836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7833 | 7836 | rm -rf conftest* |
7834 | 7837 | eval "ac_cv_lib_$ac_lib_var=yes" |
7835 | 7838 | else |
@@ -7857,9 +7860,9 @@ | ||
7857 | 7860 | |
7858 | 7861 | |
7859 | 7862 | echo $ac_n "checking for POSIX ACL support""... $ac_c" 1>&6 |
7860 | -echo "configure:7861: checking for POSIX ACL support" >&5 | |
7863 | +echo "configure:7864: checking for POSIX ACL support" >&5 | |
7861 | 7864 | cat > conftest.$ac_ext <<EOF |
7862 | -#line 7863 "configure" | |
7865 | +#line 7866 "configure" | |
7863 | 7866 | #include "confdefs.h" |
7864 | 7867 | |
7865 | 7868 | #include <sys/types.h> |
@@ -7873,7 +7876,7 @@ | ||
7873 | 7876 | acl_free(acl); |
7874 | 7877 | ; return 0; } |
7875 | 7878 | EOF |
7876 | -if { (eval echo configure:7877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7879 | +if { (eval echo configure:7880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7877 | 7880 | rm -rf conftest* |
7878 | 7881 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7879 | 7882 | #define HAVE_POSIX_ACL 1 |
@@ -7888,9 +7891,9 @@ | ||
7888 | 7891 | rm -f conftest* |
7889 | 7892 | |
7890 | 7893 | echo $ac_n "checking for Solaris ACL support""... $ac_c" 1>&6 |
7891 | -echo "configure:7892: checking for Solaris ACL support" >&5 | |
7894 | +echo "configure:7895: checking for Solaris ACL support" >&5 | |
7892 | 7895 | cat > conftest.$ac_ext <<EOF |
7893 | -#line 7894 "configure" | |
7896 | +#line 7897 "configure" | |
7894 | 7897 | #include "confdefs.h" |
7895 | 7898 | |
7896 | 7899 | #ifdef HAVE_SYS_ACL_H |
@@ -7901,7 +7904,7 @@ | ||
7901 | 7904 | |
7902 | 7905 | ; return 0; } |
7903 | 7906 | EOF |
7904 | -if { (eval echo configure:7905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7907 | +if { (eval echo configure:7908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7905 | 7908 | rm -rf conftest* |
7906 | 7909 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7907 | 7910 | #define HAVE_SOLARIS_ACL 1 |
@@ -7916,9 +7919,9 @@ | ||
7916 | 7919 | rm -f conftest* |
7917 | 7920 | |
7918 | 7921 | echo $ac_n "checking for AIX ACL support""... $ac_c" 1>&6 |
7919 | -echo "configure:7920: checking for AIX ACL support" >&5 | |
7922 | +echo "configure:7923: checking for AIX ACL support" >&5 | |
7920 | 7923 | cat > conftest.$ac_ext <<EOF |
7921 | -#line 7922 "configure" | |
7924 | +#line 7925 "configure" | |
7922 | 7925 | #include "confdefs.h" |
7923 | 7926 | |
7924 | 7927 | #ifdef HAVE_SYS_ACL_H |
@@ -7940,7 +7943,7 @@ | ||
7940 | 7943 | |
7941 | 7944 | ; return 0; } |
7942 | 7945 | EOF |
7943 | -if { (eval echo configure:7944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7946 | +if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7944 | 7947 | rm -rf conftest* |
7945 | 7948 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
7946 | 7949 | #define HAVE_AIX_ACL 1 |
@@ -7958,7 +7961,7 @@ | ||
7958 | 7961 | fi |
7959 | 7962 | |
7960 | 7963 | echo $ac_n "checking --disable-gpm argument""... $ac_c" 1>&6 |
7961 | -echo "configure:7962: checking --disable-gpm argument" >&5 | |
7964 | +echo "configure:7965: checking --disable-gpm argument" >&5 | |
7962 | 7965 | # Check whether --enable-gpm or --disable-gpm was given. |
7963 | 7966 | if test "${enable_gpm+set}" = set; then |
7964 | 7967 | enableval="$enable_gpm" |
@@ -7971,13 +7974,13 @@ | ||
7971 | 7974 | if test "$enable_gpm" = "yes"; then |
7972 | 7975 | echo "$ac_t""no" 1>&6 |
7973 | 7976 | echo $ac_n "checking for gpm""... $ac_c" 1>&6 |
7974 | -echo "configure:7975: checking for gpm" >&5 | |
7977 | +echo "configure:7978: checking for gpm" >&5 | |
7975 | 7978 | if eval "test \"`echo '$''{'vi_cv_have_gpm'+set}'`\" = set"; then |
7976 | 7979 | echo $ac_n "(cached) $ac_c" 1>&6 |
7977 | 7980 | else |
7978 | 7981 | olibs="$LIBS" ; LIBS="-lgpm" |
7979 | 7982 | cat > conftest.$ac_ext <<EOF |
7980 | -#line 7981 "configure" | |
7983 | +#line 7984 "configure" | |
7981 | 7984 | #include "confdefs.h" |
7982 | 7985 | #include <gpm.h> |
7983 | 7986 | #include <linux/keyboard.h> |
@@ -7985,7 +7988,7 @@ | ||
7985 | 7988 | Gpm_GetLibVersion(NULL); |
7986 | 7989 | ; return 0; } |
7987 | 7990 | EOF |
7988 | -if { (eval echo configure:7989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7991 | +if { (eval echo configure:7992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
7989 | 7992 | rm -rf conftest* |
7990 | 7993 | vi_cv_have_gpm=yes |
7991 | 7994 | else |
@@ -8012,12 +8015,12 @@ | ||
8012 | 8015 | fi |
8013 | 8016 | |
8014 | 8017 | echo $ac_n "checking for vsnprintf()""... $ac_c" 1>&6 |
8015 | -echo "configure:8016: checking for vsnprintf()" >&5 | |
8018 | +echo "configure:8019: checking for vsnprintf()" >&5 | |
8016 | 8019 | if test "$cross_compiling" = yes; then |
8017 | 8020 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
8018 | 8021 | else |
8019 | 8022 | cat > conftest.$ac_ext <<EOF |
8020 | -#line 8021 "configure" | |
8023 | +#line 8024 "configure" | |
8021 | 8024 | #include "confdefs.h" |
8022 | 8025 | |
8023 | 8026 | #include <stdio.h> |
@@ -8038,7 +8041,7 @@ | ||
8038 | 8041 | } |
8039 | 8042 | |
8040 | 8043 | EOF |
8041 | -if { (eval echo configure:8042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8044 | +if { (eval echo configure:8045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8042 | 8045 | then |
8043 | 8046 | cat >> confdefs.h <<\EOF |
8044 | 8047 | #define HAVE_VSNPRINTF 1 |
@@ -8056,16 +8059,16 @@ | ||
8056 | 8059 | |
8057 | 8060 | |
8058 | 8061 | echo $ac_n "checking for rename""... $ac_c" 1>&6 |
8059 | -echo "configure:8060: checking for rename" >&5 | |
8062 | +echo "configure:8063: checking for rename" >&5 | |
8060 | 8063 | cat > conftest.$ac_ext <<EOF |
8061 | -#line 8062 "configure" | |
8064 | +#line 8065 "configure" | |
8062 | 8065 | #include "confdefs.h" |
8063 | 8066 | #include <stdio.h> |
8064 | 8067 | int main() { |
8065 | 8068 | rename("this", "that") |
8066 | 8069 | ; return 0; } |
8067 | 8070 | EOF |
8068 | -if { (eval echo configure:8069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8071 | +if { (eval echo configure:8072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8069 | 8072 | rm -rf conftest* |
8070 | 8073 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
8071 | 8074 | #define HAVE_RENAME 1 |
@@ -8080,9 +8083,9 @@ | ||
8080 | 8083 | rm -f conftest* |
8081 | 8084 | |
8082 | 8085 | echo $ac_n "checking for sysctl""... $ac_c" 1>&6 |
8083 | -echo "configure:8084: checking for sysctl" >&5 | |
8086 | +echo "configure:8087: checking for sysctl" >&5 | |
8084 | 8087 | cat > conftest.$ac_ext <<EOF |
8085 | -#line 8086 "configure" | |
8088 | +#line 8089 "configure" | |
8086 | 8089 | #include "confdefs.h" |
8087 | 8090 | #include <sys/types.h> |
8088 | 8091 | #include <sys/sysctl.h> |
@@ -8097,7 +8100,7 @@ | ||
8097 | 8100 | |
8098 | 8101 | ; return 0; } |
8099 | 8102 | EOF |
8100 | -if { (eval echo configure:8101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8103 | +if { (eval echo configure:8104: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8101 | 8104 | rm -rf conftest* |
8102 | 8105 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
8103 | 8106 | #define HAVE_SYSCTL 1 |
@@ -8112,9 +8115,9 @@ | ||
8112 | 8115 | rm -f conftest* |
8113 | 8116 | |
8114 | 8117 | echo $ac_n "checking for sysinfo""... $ac_c" 1>&6 |
8115 | -echo "configure:8116: checking for sysinfo" >&5 | |
8118 | +echo "configure:8119: checking for sysinfo" >&5 | |
8116 | 8119 | cat > conftest.$ac_ext <<EOF |
8117 | -#line 8118 "configure" | |
8120 | +#line 8121 "configure" | |
8118 | 8121 | #include "confdefs.h" |
8119 | 8122 | #include <sys/types.h> |
8120 | 8123 | #include <sys/sysinfo.h> |
@@ -8127,7 +8130,7 @@ | ||
8127 | 8130 | |
8128 | 8131 | ; return 0; } |
8129 | 8132 | EOF |
8130 | -if { (eval echo configure:8131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8133 | +if { (eval echo configure:8134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8131 | 8134 | rm -rf conftest* |
8132 | 8135 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
8133 | 8136 | #define HAVE_SYSINFO 1 |
@@ -8142,9 +8145,9 @@ | ||
8142 | 8145 | rm -f conftest* |
8143 | 8146 | |
8144 | 8147 | echo $ac_n "checking for sysconf""... $ac_c" 1>&6 |
8145 | -echo "configure:8146: checking for sysconf" >&5 | |
8148 | +echo "configure:8149: checking for sysconf" >&5 | |
8146 | 8149 | cat > conftest.$ac_ext <<EOF |
8147 | -#line 8148 "configure" | |
8150 | +#line 8151 "configure" | |
8148 | 8151 | #include "confdefs.h" |
8149 | 8152 | #include <unistd.h> |
8150 | 8153 | int main() { |
@@ -8153,7 +8156,7 @@ | ||
8153 | 8156 | |
8154 | 8157 | ; return 0; } |
8155 | 8158 | EOF |
8156 | -if { (eval echo configure:8157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8159 | +if { (eval echo configure:8160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8157 | 8160 | rm -rf conftest* |
8158 | 8161 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
8159 | 8162 | #define HAVE_SYSCONF 1 |
@@ -8169,7 +8172,7 @@ | ||
8169 | 8172 | |
8170 | 8173 | |
8171 | 8174 | echo $ac_n "checking size of int""... $ac_c" 1>&6 |
8172 | -echo "configure:8173: checking size of int" >&5 | |
8175 | +echo "configure:8176: checking size of int" >&5 | |
8173 | 8176 | if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then |
8174 | 8177 | echo $ac_n "(cached) $ac_c" 1>&6 |
8175 | 8178 | else |
@@ -8177,7 +8180,7 @@ | ||
8177 | 8180 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
8178 | 8181 | else |
8179 | 8182 | cat > conftest.$ac_ext <<EOF |
8180 | -#line 8181 "configure" | |
8183 | +#line 8184 "configure" | |
8181 | 8184 | #include "confdefs.h" |
8182 | 8185 | #include <stdio.h> |
8183 | 8186 | main() |
@@ -8188,7 +8191,7 @@ | ||
8188 | 8191 | exit(0); |
8189 | 8192 | } |
8190 | 8193 | EOF |
8191 | -if { (eval echo configure:8192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8194 | +if { (eval echo configure:8195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8192 | 8195 | then |
8193 | 8196 | ac_cv_sizeof_int=`cat conftestval` |
8194 | 8197 | else |
@@ -8209,7 +8212,7 @@ | ||
8209 | 8212 | |
8210 | 8213 | |
8211 | 8214 | echo $ac_n "checking whether memmove/bcopy/memcpy handle overlaps""... $ac_c" 1>&6 |
8212 | -echo "configure:8213: checking whether memmove/bcopy/memcpy handle overlaps" >&5 | |
8215 | +echo "configure:8216: checking whether memmove/bcopy/memcpy handle overlaps" >&5 | |
8213 | 8216 | bcopy_test_prog=' |
8214 | 8217 | main() { |
8215 | 8218 | char buf[10]; |
@@ -8229,11 +8232,11 @@ | ||
8229 | 8232 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
8230 | 8233 | else |
8231 | 8234 | cat > conftest.$ac_ext <<EOF |
8232 | -#line 8233 "configure" | |
8235 | +#line 8236 "configure" | |
8233 | 8236 | #include "confdefs.h" |
8234 | 8237 | #define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog |
8235 | 8238 | EOF |
8236 | -if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8239 | +if { (eval echo configure:8240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8237 | 8240 | then |
8238 | 8241 | cat >> confdefs.h <<\EOF |
8239 | 8242 | #define USEMEMMOVE 1 |
@@ -8247,11 +8250,11 @@ | ||
8247 | 8250 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
8248 | 8251 | else |
8249 | 8252 | cat > conftest.$ac_ext <<EOF |
8250 | -#line 8251 "configure" | |
8253 | +#line 8254 "configure" | |
8251 | 8254 | #include "confdefs.h" |
8252 | 8255 | #define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog |
8253 | 8256 | EOF |
8254 | -if { (eval echo configure:8255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8257 | +if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8255 | 8258 | then |
8256 | 8259 | cat >> confdefs.h <<\EOF |
8257 | 8260 | #define USEBCOPY 1 |
@@ -8265,11 +8268,11 @@ | ||
8265 | 8268 | { echo "configure: error: failed to compile test program" 1>&2; exit 1; } |
8266 | 8269 | else |
8267 | 8270 | cat > conftest.$ac_ext <<EOF |
8268 | -#line 8269 "configure" | |
8271 | +#line 8272 "configure" | |
8269 | 8272 | #include "confdefs.h" |
8270 | 8273 | #define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog |
8271 | 8274 | EOF |
8272 | -if { (eval echo configure:8273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8275 | +if { (eval echo configure:8276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null | |
8273 | 8276 | then |
8274 | 8277 | cat >> confdefs.h <<\EOF |
8275 | 8278 | #define USEMEMCPY 1 |
@@ -8301,19 +8304,19 @@ | ||
8301 | 8304 | CFLAGS="$CFLAGS -I$x_includes" |
8302 | 8305 | LDFLAGS="$X_LIBS $LDFLAGS -lX11" |
8303 | 8306 | echo $ac_n "checking whether X_LOCALE needed""... $ac_c" 1>&6 |
8304 | -echo "configure:8305: checking whether X_LOCALE needed" >&5 | |
8307 | +echo "configure:8308: checking whether X_LOCALE needed" >&5 | |
8305 | 8308 | cat > conftest.$ac_ext <<EOF |
8306 | -#line 8307 "configure" | |
8309 | +#line 8310 "configure" | |
8307 | 8310 | #include "confdefs.h" |
8308 | 8311 | #include <X11/Xlocale.h> |
8309 | 8312 | int main() { |
8310 | 8313 | |
8311 | 8314 | ; return 0; } |
8312 | 8315 | EOF |
8313 | -if { (eval echo configure:8314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8316 | +if { (eval echo configure:8317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then | |
8314 | 8317 | rm -rf conftest* |
8315 | 8318 | cat > conftest.$ac_ext <<EOF |
8316 | -#line 8317 "configure" | |
8319 | +#line 8320 "configure" | |
8317 | 8320 | #include "confdefs.h" |
8318 | 8321 | /* Override any gcc2 internal prototype to avoid an error. */ |
8319 | 8322 | /* We use char because int might match the return type of a gcc2 |
@@ -8324,7 +8327,7 @@ | ||
8324 | 8327 | _Xsetlocale() |
8325 | 8328 | ; return 0; } |
8326 | 8329 | EOF |
8327 | -if { (eval echo configure:8328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8330 | +if { (eval echo configure:8331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8328 | 8331 | rm -rf conftest* |
8329 | 8332 | echo "$ac_t""yes" 1>&6 |
8330 | 8333 | cat >> confdefs.h <<\EOF |
@@ -8351,7 +8354,7 @@ | ||
8351 | 8354 | fi |
8352 | 8355 | |
8353 | 8356 | echo $ac_n "checking for _xpg4_setrunelocale in -lxpg4""... $ac_c" 1>&6 |
8354 | -echo "configure:8355: checking for _xpg4_setrunelocale in -lxpg4" >&5 | |
8357 | +echo "configure:8358: checking for _xpg4_setrunelocale in -lxpg4" >&5 | |
8355 | 8358 | ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale | sed 'y%./+-%__p_%'` |
8356 | 8359 | if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then |
8357 | 8360 | echo $ac_n "(cached) $ac_c" 1>&6 |
@@ -8359,7 +8362,7 @@ | ||
8359 | 8362 | ac_save_LIBS="$LIBS" |
8360 | 8363 | LIBS="-lxpg4 $LIBS" |
8361 | 8364 | cat > conftest.$ac_ext <<EOF |
8362 | -#line 8363 "configure" | |
8365 | +#line 8366 "configure" | |
8363 | 8366 | #include "confdefs.h" |
8364 | 8367 | /* Override any gcc2 internal prototype to avoid an error. */ |
8365 | 8368 | /* We use char because int might match the return type of a gcc2 |
@@ -8370,7 +8373,7 @@ | ||
8370 | 8373 | _xpg4_setrunelocale() |
8371 | 8374 | ; return 0; } |
8372 | 8375 | EOF |
8373 | -if { (eval echo configure:8374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8376 | +if { (eval echo configure:8377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8374 | 8377 | rm -rf conftest* |
8375 | 8378 | eval "ac_cv_lib_$ac_lib_var=yes" |
8376 | 8379 | else |
@@ -8392,7 +8395,7 @@ | ||
8392 | 8395 | |
8393 | 8396 | |
8394 | 8397 | echo $ac_n "checking how to create tags""... $ac_c" 1>&6 |
8395 | -echo "configure:8396: checking how to create tags" >&5 | |
8398 | +echo "configure:8399: checking how to create tags" >&5 | |
8396 | 8399 | test -f tags && mv tags tags.save |
8397 | 8400 | if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then |
8398 | 8401 | TAGPRG="ctags" |
@@ -8409,7 +8412,7 @@ | ||
8409 | 8412 | echo "$ac_t""$TAGPRG" 1>&6 |
8410 | 8413 | |
8411 | 8414 | echo $ac_n "checking how to run man with a section nr""... $ac_c" 1>&6 |
8412 | -echo "configure:8413: checking how to run man with a section nr" >&5 | |
8415 | +echo "configure:8416: checking how to run man with a section nr" >&5 | |
8413 | 8416 | MANDEF="man" |
8414 | 8417 | (eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s" |
8415 | 8418 | echo "$ac_t""$MANDEF" 1>&6 |
@@ -8421,7 +8424,7 @@ | ||
8421 | 8424 | fi |
8422 | 8425 | |
8423 | 8426 | echo $ac_n "checking --disable-nls argument""... $ac_c" 1>&6 |
8424 | -echo "configure:8425: checking --disable-nls argument" >&5 | |
8427 | +echo "configure:8428: checking --disable-nls argument" >&5 | |
8425 | 8428 | # Check whether --enable-nls or --disable-nls was given. |
8426 | 8429 | if test "${enable_nls+set}" = set; then |
8427 | 8430 | enableval="$enable_nls" |
@@ -8436,7 +8439,7 @@ | ||
8436 | 8439 | # Extract the first word of "msgfmt", so it can be a program name with args. |
8437 | 8440 | set dummy msgfmt; ac_word=$2 |
8438 | 8441 | echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 |
8439 | -echo "configure:8440: checking for $ac_word" >&5 | |
8442 | +echo "configure:8443: checking for $ac_word" >&5 | |
8440 | 8443 | if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then |
8441 | 8444 | echo $ac_n "(cached) $ac_c" 1>&6 |
8442 | 8445 | else |
@@ -8463,19 +8466,19 @@ | ||
8463 | 8466 | fi |
8464 | 8467 | |
8465 | 8468 | echo $ac_n "checking for NLS""... $ac_c" 1>&6 |
8466 | -echo "configure:8467: checking for NLS" >&5 | |
8469 | +echo "configure:8470: checking for NLS" >&5 | |
8467 | 8470 | if test -f po/Makefile; then |
8468 | 8471 | have_gettext="no" |
8469 | 8472 | if test -n "$MSGFMT"; then |
8470 | 8473 | cat > conftest.$ac_ext <<EOF |
8471 | -#line 8472 "configure" | |
8474 | +#line 8475 "configure" | |
8472 | 8475 | #include "confdefs.h" |
8473 | 8476 | #include <libintl.h> |
8474 | 8477 | int main() { |
8475 | 8478 | gettext("Test"); |
8476 | 8479 | ; return 0; } |
8477 | 8480 | EOF |
8478 | -if { (eval echo configure:8479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8481 | +if { (eval echo configure:8482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8479 | 8482 | rm -rf conftest* |
8480 | 8483 | echo "$ac_t""gettext() works" 1>&6; have_gettext="yes" |
8481 | 8484 | else |
@@ -8485,14 +8488,14 @@ | ||
8485 | 8488 | olibs=$LIBS |
8486 | 8489 | LIBS="$LIBS -lintl" |
8487 | 8490 | cat > conftest.$ac_ext <<EOF |
8488 | -#line 8489 "configure" | |
8491 | +#line 8492 "configure" | |
8489 | 8492 | #include "confdefs.h" |
8490 | 8493 | #include <libintl.h> |
8491 | 8494 | int main() { |
8492 | 8495 | gettext("Test"); |
8493 | 8496 | ; return 0; } |
8494 | 8497 | EOF |
8495 | -if { (eval echo configure:8496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8498 | +if { (eval echo configure:8499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8496 | 8499 | rm -rf conftest* |
8497 | 8500 | echo "$ac_t""gettext() works with -lintl" 1>&6; have_gettext="yes" |
8498 | 8501 | else |
@@ -8518,12 +8521,12 @@ | ||
8518 | 8521 | for ac_func in bind_textdomain_codeset |
8519 | 8522 | do |
8520 | 8523 | echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 |
8521 | -echo "configure:8522: checking for $ac_func" >&5 | |
8524 | +echo "configure:8525: checking for $ac_func" >&5 | |
8522 | 8525 | if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then |
8523 | 8526 | echo $ac_n "(cached) $ac_c" 1>&6 |
8524 | 8527 | else |
8525 | 8528 | cat > conftest.$ac_ext <<EOF |
8526 | -#line 8527 "configure" | |
8529 | +#line 8530 "configure" | |
8527 | 8530 | #include "confdefs.h" |
8528 | 8531 | /* System header to define __stub macros and hopefully few prototypes, |
8529 | 8532 | which can conflict with char $ac_func(); below. */ |
@@ -8546,7 +8549,7 @@ | ||
8546 | 8549 | |
8547 | 8550 | ; return 0; } |
8548 | 8551 | EOF |
8549 | -if { (eval echo configure:8550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8552 | +if { (eval echo configure:8553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8550 | 8553 | rm -rf conftest* |
8551 | 8554 | eval "ac_cv_func_$ac_func=yes" |
8552 | 8555 | else |
@@ -8571,9 +8574,9 @@ | ||
8571 | 8574 | done |
8572 | 8575 | |
8573 | 8576 | echo $ac_n "checking for _nl_msg_cat_cntr""... $ac_c" 1>&6 |
8574 | -echo "configure:8575: checking for _nl_msg_cat_cntr" >&5 | |
8577 | +echo "configure:8578: checking for _nl_msg_cat_cntr" >&5 | |
8575 | 8578 | cat > conftest.$ac_ext <<EOF |
8576 | -#line 8577 "configure" | |
8579 | +#line 8580 "configure" | |
8577 | 8580 | #include "confdefs.h" |
8578 | 8581 | #include <libintl.h> |
8579 | 8582 | extern int _nl_msg_cat_cntr; |
@@ -8581,7 +8584,7 @@ | ||
8581 | 8584 | ++_nl_msg_cat_cntr; |
8582 | 8585 | ; return 0; } |
8583 | 8586 | EOF |
8584 | -if { (eval echo configure:8585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8587 | +if { (eval echo configure:8588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8585 | 8588 | rm -rf conftest* |
8586 | 8589 | echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF |
8587 | 8590 | #define HAVE_NL_MSG_CAT_CNTR 1 |
@@ -8604,17 +8607,17 @@ | ||
8604 | 8607 | |
8605 | 8608 | ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` |
8606 | 8609 | echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 |
8607 | -echo "configure:8608: checking for dlfcn.h" >&5 | |
8610 | +echo "configure:8611: checking for dlfcn.h" >&5 | |
8608 | 8611 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
8609 | 8612 | echo $ac_n "(cached) $ac_c" 1>&6 |
8610 | 8613 | else |
8611 | 8614 | cat > conftest.$ac_ext <<EOF |
8612 | -#line 8613 "configure" | |
8615 | +#line 8616 "configure" | |
8613 | 8616 | #include "confdefs.h" |
8614 | 8617 | #include <dlfcn.h> |
8615 | 8618 | EOF |
8616 | 8619 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
8617 | -{ (eval echo configure:8618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
8620 | +{ (eval echo configure:8621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
8618 | 8621 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
8619 | 8622 | if test -z "$ac_err"; then |
8620 | 8623 | rm -rf conftest* |
@@ -8635,17 +8638,17 @@ | ||
8635 | 8638 | echo "$ac_t""no" 1>&6 |
8636 | 8639 | ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'` |
8637 | 8640 | echo $ac_n "checking for dl.h""... $ac_c" 1>&6 |
8638 | -echo "configure:8639: checking for dl.h" >&5 | |
8641 | +echo "configure:8642: checking for dl.h" >&5 | |
8639 | 8642 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
8640 | 8643 | echo $ac_n "(cached) $ac_c" 1>&6 |
8641 | 8644 | else |
8642 | 8645 | cat > conftest.$ac_ext <<EOF |
8643 | -#line 8644 "configure" | |
8646 | +#line 8647 "configure" | |
8644 | 8647 | #include "confdefs.h" |
8645 | 8648 | #include <dl.h> |
8646 | 8649 | EOF |
8647 | 8650 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
8648 | -{ (eval echo configure:8649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
8651 | +{ (eval echo configure:8652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
8649 | 8652 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
8650 | 8653 | if test -z "$ac_err"; then |
8651 | 8654 | rm -rf conftest* |
@@ -8674,9 +8677,9 @@ | ||
8674 | 8677 | EOF |
8675 | 8678 | |
8676 | 8679 | echo $ac_n "checking for dlopen()""... $ac_c" 1>&6 |
8677 | -echo "configure:8678: checking for dlopen()" >&5 | |
8680 | +echo "configure:8681: checking for dlopen()" >&5 | |
8678 | 8681 | cat > conftest.$ac_ext <<EOF |
8679 | -#line 8680 "configure" | |
8682 | +#line 8683 "configure" | |
8680 | 8683 | #include "confdefs.h" |
8681 | 8684 | |
8682 | 8685 | int main() { |
@@ -8686,7 +8689,7 @@ | ||
8686 | 8689 | |
8687 | 8690 | ; return 0; } |
8688 | 8691 | EOF |
8689 | -if { (eval echo configure:8690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8692 | +if { (eval echo configure:8693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8690 | 8693 | rm -rf conftest* |
8691 | 8694 | echo "$ac_t""yes" 1>&6; |
8692 | 8695 | cat >> confdefs.h <<\EOF |
@@ -8699,11 +8702,11 @@ | ||
8699 | 8702 | rm -rf conftest* |
8700 | 8703 | echo "$ac_t""no" 1>&6; |
8701 | 8704 | echo $ac_n "checking for dlopen() in -ldl""... $ac_c" 1>&6 |
8702 | -echo "configure:8703: checking for dlopen() in -ldl" >&5 | |
8705 | +echo "configure:8706: checking for dlopen() in -ldl" >&5 | |
8703 | 8706 | olibs=$LIBS |
8704 | 8707 | LIBS="$LIBS -ldl" |
8705 | 8708 | cat > conftest.$ac_ext <<EOF |
8706 | -#line 8707 "configure" | |
8709 | +#line 8710 "configure" | |
8707 | 8710 | #include "confdefs.h" |
8708 | 8711 | |
8709 | 8712 | int main() { |
@@ -8713,7 +8716,7 @@ | ||
8713 | 8716 | |
8714 | 8717 | ; return 0; } |
8715 | 8718 | EOF |
8716 | -if { (eval echo configure:8717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8719 | +if { (eval echo configure:8720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8717 | 8720 | rm -rf conftest* |
8718 | 8721 | echo "$ac_t""yes" 1>&6; |
8719 | 8722 | cat >> confdefs.h <<\EOF |
@@ -8731,9 +8734,9 @@ | ||
8731 | 8734 | fi |
8732 | 8735 | rm -f conftest* |
8733 | 8736 | echo $ac_n "checking for dlsym()""... $ac_c" 1>&6 |
8734 | -echo "configure:8735: checking for dlsym()" >&5 | |
8737 | +echo "configure:8738: checking for dlsym()" >&5 | |
8735 | 8738 | cat > conftest.$ac_ext <<EOF |
8736 | -#line 8737 "configure" | |
8739 | +#line 8740 "configure" | |
8737 | 8740 | #include "confdefs.h" |
8738 | 8741 | |
8739 | 8742 | int main() { |
@@ -8743,7 +8746,7 @@ | ||
8743 | 8746 | |
8744 | 8747 | ; return 0; } |
8745 | 8748 | EOF |
8746 | -if { (eval echo configure:8747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8749 | +if { (eval echo configure:8750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8747 | 8750 | rm -rf conftest* |
8748 | 8751 | echo "$ac_t""yes" 1>&6; |
8749 | 8752 | cat >> confdefs.h <<\EOF |
@@ -8756,11 +8759,11 @@ | ||
8756 | 8759 | rm -rf conftest* |
8757 | 8760 | echo "$ac_t""no" 1>&6; |
8758 | 8761 | echo $ac_n "checking for dlsym() in -ldl""... $ac_c" 1>&6 |
8759 | -echo "configure:8760: checking for dlsym() in -ldl" >&5 | |
8762 | +echo "configure:8763: checking for dlsym() in -ldl" >&5 | |
8760 | 8763 | olibs=$LIBS |
8761 | 8764 | LIBS="$LIBS -ldl" |
8762 | 8765 | cat > conftest.$ac_ext <<EOF |
8763 | -#line 8764 "configure" | |
8766 | +#line 8767 "configure" | |
8764 | 8767 | #include "confdefs.h" |
8765 | 8768 | |
8766 | 8769 | int main() { |
@@ -8770,7 +8773,7 @@ | ||
8770 | 8773 | |
8771 | 8774 | ; return 0; } |
8772 | 8775 | EOF |
8773 | -if { (eval echo configure:8774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8776 | +if { (eval echo configure:8777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8774 | 8777 | rm -rf conftest* |
8775 | 8778 | echo "$ac_t""yes" 1>&6; |
8776 | 8779 | cat >> confdefs.h <<\EOF |
@@ -8793,9 +8796,9 @@ | ||
8793 | 8796 | EOF |
8794 | 8797 | |
8795 | 8798 | echo $ac_n "checking for shl_load()""... $ac_c" 1>&6 |
8796 | -echo "configure:8797: checking for shl_load()" >&5 | |
8799 | +echo "configure:8800: checking for shl_load()" >&5 | |
8797 | 8800 | cat > conftest.$ac_ext <<EOF |
8798 | -#line 8799 "configure" | |
8801 | +#line 8802 "configure" | |
8799 | 8802 | #include "confdefs.h" |
8800 | 8803 | |
8801 | 8804 | int main() { |
@@ -8805,7 +8808,7 @@ | ||
8805 | 8808 | |
8806 | 8809 | ; return 0; } |
8807 | 8810 | EOF |
8808 | -if { (eval echo configure:8809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8811 | +if { (eval echo configure:8812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8809 | 8812 | rm -rf conftest* |
8810 | 8813 | echo "$ac_t""yes" 1>&6; |
8811 | 8814 | cat >> confdefs.h <<\EOF |
@@ -8818,11 +8821,11 @@ | ||
8818 | 8821 | rm -rf conftest* |
8819 | 8822 | echo "$ac_t""no" 1>&6; |
8820 | 8823 | echo $ac_n "checking for shl_load() in -ldld""... $ac_c" 1>&6 |
8821 | -echo "configure:8822: checking for shl_load() in -ldld" >&5 | |
8824 | +echo "configure:8825: checking for shl_load() in -ldld" >&5 | |
8822 | 8825 | olibs=$LIBS |
8823 | 8826 | LIBS="$LIBS -ldld" |
8824 | 8827 | cat > conftest.$ac_ext <<EOF |
8825 | -#line 8826 "configure" | |
8828 | +#line 8829 "configure" | |
8826 | 8829 | #include "confdefs.h" |
8827 | 8830 | |
8828 | 8831 | int main() { |
@@ -8832,7 +8835,7 @@ | ||
8832 | 8835 | |
8833 | 8836 | ; return 0; } |
8834 | 8837 | EOF |
8835 | -if { (eval echo configure:8836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8838 | +if { (eval echo configure:8839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then | |
8836 | 8839 | rm -rf conftest* |
8837 | 8840 | echo "$ac_t""yes" 1>&6; |
8838 | 8841 | cat >> confdefs.h <<\EOF |
@@ -8854,17 +8857,17 @@ | ||
8854 | 8857 | do |
8855 | 8858 | ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` |
8856 | 8859 | echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 |
8857 | -echo "configure:8858: checking for $ac_hdr" >&5 | |
8860 | +echo "configure:8861: checking for $ac_hdr" >&5 | |
8858 | 8861 | if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then |
8859 | 8862 | echo $ac_n "(cached) $ac_c" 1>&6 |
8860 | 8863 | else |
8861 | 8864 | cat > conftest.$ac_ext <<EOF |
8862 | -#line 8863 "configure" | |
8865 | +#line 8866 "configure" | |
8863 | 8866 | #include "confdefs.h" |
8864 | 8867 | #include <$ac_hdr> |
8865 | 8868 | EOF |
8866 | 8869 | ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" |
8867 | -{ (eval echo configure:8868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
8870 | +{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } | |
8868 | 8871 | ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` |
8869 | 8872 | if test -z "$ac_err"; then |
8870 | 8873 | rm -rf conftest* |
@@ -8901,7 +8904,7 @@ | ||
8901 | 8904 | if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \ |
8902 | 8905 | && test "x$GUITYPE" != "xCARBONGUI"; then |
8903 | 8906 | echo $ac_n "checking whether we need -framework Carbon""... $ac_c" 1>&6 |
8904 | -echo "configure:8905: checking whether we need -framework Carbon" >&5 | |
8907 | +echo "configure:8908: checking whether we need -framework Carbon" >&5 | |
8905 | 8908 | if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \ |
8906 | 8909 | || test "x$features" = "xhuge"; then |
8907 | 8910 | LIBS="$LIBS -framework Carbon" |
@@ -364,6 +364,9 @@ | ||
364 | 364 | dnl Make Vim remember the path to the library. For when it's not in |
365 | 365 | dnl $LD_LIBRARY_PATH. |
366 | 366 | MZSCHEME_LIBS="$MZSCHEME_LIBS -Wl,-rpath -Wl,${vi_cv_path_mzscheme_pfx}/lib" |
367 | + elif test "`(uname) 2>/dev/null`" = SunOS && | |
368 | + uname -r | grep '^5' >/dev/null; then | |
369 | + MZSCHEME_LIBS="$MZSCHEME_LIBS -R ${vi_cv_path_mzscheme_pfx}/lib" | |
367 | 370 | fi |
368 | 371 | fi |
369 | 372 | MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \ |
@@ -3205,6 +3205,11 @@ | ||
3205 | 3205 | { |
3206 | 3206 | xp->xp_context = EXPAND_ENV_VARS; |
3207 | 3207 | ++xp->xp_pattern; |
3208 | +#if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL) | |
3209 | + /* Avoid that the assignment uses EXPAND_FILES again. */ | |
3210 | + if (compl != EXPAND_USER_DEFINED) | |
3211 | + compl = EXPAND_ENV_VARS; | |
3212 | +#endif | |
3208 | 3213 | } |
3209 | 3214 | } |
3210 | 3215 | } |
@@ -2720,6 +2720,7 @@ | ||
2720 | 2720 | int buf_fname_f = FALSE; |
2721 | 2721 | int buf_fname_s = FALSE; |
2722 | 2722 | int did_cmd = FALSE; |
2723 | + int nofile_err = FALSE; | |
2723 | 2724 | |
2724 | 2725 | /* |
2725 | 2726 | * Apply PRE aucocommands. |
@@ -2742,8 +2743,13 @@ | ||
2742 | 2743 | { |
2743 | 2744 | if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEAPPENDCMD, |
2744 | 2745 | sfname, sfname, FALSE, curbuf, eap))) |
2745 | - apply_autocmds_exarg(EVENT_FILEAPPENDPRE, | |
2746 | + { | |
2747 | + if (bt_nofile(curbuf)) | |
2748 | + nofile_err = TRUE; | |
2749 | + else | |
2750 | + apply_autocmds_exarg(EVENT_FILEAPPENDPRE, | |
2746 | 2751 | sfname, sfname, FALSE, curbuf, eap); |
2752 | + } | |
2747 | 2753 | } |
2748 | 2754 | else if (filtering) |
2749 | 2755 | { |
@@ -2754,15 +2760,25 @@ | ||
2754 | 2760 | { |
2755 | 2761 | if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD, |
2756 | 2762 | sfname, sfname, FALSE, curbuf, eap))) |
2757 | - apply_autocmds_exarg(EVENT_BUFWRITEPRE, | |
2763 | + { | |
2764 | + if (bt_nofile(curbuf)) | |
2765 | + nofile_err = TRUE; | |
2766 | + else | |
2767 | + apply_autocmds_exarg(EVENT_BUFWRITEPRE, | |
2758 | 2768 | sfname, sfname, FALSE, curbuf, eap); |
2769 | + } | |
2759 | 2770 | } |
2760 | 2771 | else |
2761 | 2772 | { |
2762 | 2773 | if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD, |
2763 | 2774 | sfname, sfname, FALSE, curbuf, eap))) |
2764 | - apply_autocmds_exarg(EVENT_FILEWRITEPRE, | |
2775 | + { | |
2776 | + if (bt_nofile(curbuf)) | |
2777 | + nofile_err = TRUE; | |
2778 | + else | |
2779 | + apply_autocmds_exarg(EVENT_FILEWRITEPRE, | |
2765 | 2780 | sfname, sfname, FALSE, curbuf, eap); |
2781 | + } | |
2766 | 2782 | } |
2767 | 2783 | |
2768 | 2784 | /* restore curwin/curbuf and a few other things */ |
@@ -2776,11 +2792,15 @@ | ||
2776 | 2792 | */ |
2777 | 2793 | if (!buf_valid(buf)) |
2778 | 2794 | buf = NULL; |
2779 | - if (buf == NULL || buf->b_ml.ml_mfp == NULL || did_cmd || aborting()) | |
2795 | + if (buf == NULL || buf->b_ml.ml_mfp == NULL | |
2796 | + || did_cmd || nofile_err || aborting()) | |
2780 | 2797 | { |
2781 | 2798 | --no_wait_return; |
2782 | 2799 | msg_scroll = msg_save; |
2783 | - if (aborting()) | |
2800 | + if (nofile_err) | |
2801 | + EMSG(_("E676: No matching autocommands for acwrite buffer")); | |
2802 | + | |
2803 | + if (aborting() || nofile_err) | |
2784 | 2804 | /* An aborting error, interrupt or exception in the |
2785 | 2805 | * autocommands. */ |
2786 | 2806 | return FAIL; |
@@ -992,24 +992,92 @@ | ||
992 | 992 | for (p = leader + lead_len - 1; p > leader |
993 | 993 | && vim_iswhite(*p); --p) |
994 | 994 | ; |
995 | - | |
996 | 995 | ++p; |
996 | + | |
997 | +#ifdef FEAT_MBYTE | |
998 | + /* Compute the length of the replaced characters in | |
999 | + * screen characters, not bytes. */ | |
1000 | + { | |
1001 | + int repl_size = vim_strnsize(lead_repl, | |
1002 | + lead_repl_len); | |
1003 | + int old_size = 0; | |
1004 | + char_u *endp = p; | |
1005 | + int l; | |
1006 | + | |
1007 | + while (old_size < repl_size && p > leader) | |
1008 | + { | |
1009 | + --p; | |
1010 | + p -= mb_head_off(leader, p); | |
1011 | + old_size += ptr2cells(p); | |
1012 | + } | |
1013 | + l = lead_repl_len - (endp - p); | |
1014 | + if (l != 0) | |
1015 | + mch_memmove(endp + l, endp, | |
1016 | + (size_t)((leader + lead_len) - endp)); | |
1017 | + lead_len += l; | |
1018 | + } | |
1019 | +#else | |
997 | 1020 | if (p < leader + lead_repl_len) |
998 | 1021 | p = leader; |
999 | 1022 | else |
1000 | 1023 | p -= lead_repl_len; |
1024 | +#endif | |
1001 | 1025 | mch_memmove(p, lead_repl, (size_t)lead_repl_len); |
1002 | 1026 | if (p + lead_repl_len > leader + lead_len) |
1003 | 1027 | p[lead_repl_len] = NUL; |
1004 | 1028 | |
1005 | 1029 | /* blank-out any other chars from the old leader. */ |
1006 | 1030 | while (--p >= leader) |
1031 | + { | |
1032 | +#ifdef FEAT_MBYTE | |
1033 | + int l = mb_head_off(leader, p); | |
1034 | + | |
1035 | + if (l > 1) | |
1036 | + { | |
1037 | + p -= l; | |
1038 | + if (ptr2cells(p) > 1) | |
1039 | + { | |
1040 | + p[1] = ' '; | |
1041 | + --l; | |
1042 | + } | |
1043 | + mch_memmove(p + 1, p + l + 1, | |
1044 | + (size_t)((leader + lead_len) - (p + l + 1))); | |
1045 | + lead_len -= l; | |
1046 | + *p = ' '; | |
1047 | + } | |
1048 | + else | |
1049 | +#endif | |
1007 | 1050 | if (!vim_iswhite(*p)) |
1008 | 1051 | *p = ' '; |
1052 | + } | |
1009 | 1053 | } |
1010 | 1054 | else /* left adjusted leader */ |
1011 | 1055 | { |
1012 | 1056 | p = skipwhite(leader); |
1057 | +#ifdef FEAT_MBYTE | |
1058 | + /* Compute the length of the replaced characters in | |
1059 | + * screen characters, not bytes. Move the part that is | |
1060 | + * not to be overwritten. */ | |
1061 | + { | |
1062 | + int repl_size = vim_strnsize(lead_repl, | |
1063 | + lead_repl_len); | |
1064 | + int i; | |
1065 | + int l; | |
1066 | + | |
1067 | + for (i = 0; p[i] != NUL && i < lead_len; i += l) | |
1068 | + { | |
1069 | + l = mb_ptr2len_check(p + i); | |
1070 | + if (vim_strnsize(p, i + l) > repl_size) | |
1071 | + break; | |
1072 | + } | |
1073 | + if (i != lead_repl_len) | |
1074 | + { | |
1075 | + mch_memmove(p + lead_repl_len, p + i, | |
1076 | + (size_t)(lead_len - i - (leader - p))); | |
1077 | + lead_len += lead_repl_len - i; | |
1078 | + } | |
1079 | + } | |
1080 | +#endif | |
1013 | 1081 | mch_memmove(p, lead_repl, (size_t)lead_repl_len); |
1014 | 1082 | |
1015 | 1083 | /* Replace any remaining non-white chars in the old |
@@ -1026,7 +1094,26 @@ | ||
1026 | 1094 | (leader + lead_len) - p); |
1027 | 1095 | } |
1028 | 1096 | else |
1097 | + { | |
1098 | +#ifdef FEAT_MBYTE | |
1099 | + int l = mb_ptr2len_check(p); | |
1100 | + | |
1101 | + if (l > 1) | |
1102 | + { | |
1103 | + if (ptr2cells(p) > 1) | |
1104 | + { | |
1105 | + /* Replace a double-wide char with | |
1106 | + * two spaces */ | |
1107 | + --l; | |
1108 | + *p++ = ' '; | |
1109 | + } | |
1110 | + mch_memmove(p + 1, p + l, | |
1111 | + (leader + lead_len) - p); | |
1112 | + lead_len -= l - 1; | |
1113 | + } | |
1114 | +#endif | |
1029 | 1115 | *p = ' '; |
1116 | + } | |
1030 | 1117 | } |
1031 | 1118 | *p = NUL; |
1032 | 1119 | } |
@@ -3789,7 +3876,8 @@ | ||
3789 | 3876 | /* Borland C++ 5.2 has this in a header file. */ |
3790 | 3877 | extern char **environ; |
3791 | 3878 | # endif |
3792 | - static char_u name[100]; | |
3879 | +# define ENVNAMELEN 100 | |
3880 | + static char_u name[ENVNAMELEN]; | |
3793 | 3881 | char_u *str; |
3794 | 3882 | int n; |
3795 | 3883 |
@@ -3797,7 +3885,7 @@ | ||
3797 | 3885 | if (str == NULL) |
3798 | 3886 | return NULL; |
3799 | 3887 | |
3800 | - for (n = 0; n < 99; ++n) | |
3888 | + for (n = 0; n < ENVNAMELEN - 1; ++n) | |
3801 | 3889 | { |
3802 | 3890 | if (str[n] == '=' || str[n] == NUL) |
3803 | 3891 | break; |
@@ -5064,7 +5152,10 @@ | ||
5064 | 5152 | |
5065 | 5153 | *col = 0; |
5066 | 5154 | |
5067 | - s = cin_skipcomment(line); | |
5155 | + s = skipwhite(line); | |
5156 | + if (*s == '#') /* skip #define FOO x ? (x) : x */ | |
5157 | + return FALSE; | |
5158 | + s = cin_skipcomment(s); | |
5068 | 5159 | if (*s == NUL) |
5069 | 5160 | return FALSE; |
5070 | 5161 |
@@ -5737,7 +5828,8 @@ | ||
5737 | 5828 | if (start_off != 0) |
5738 | 5829 | amount += start_off; |
5739 | 5830 | else if (start_align == COM_RIGHT) |
5740 | - amount += lead_start_len - lead_middle_len; | |
5831 | + amount += vim_strsize(lead_start) | |
5832 | + - vim_strsize(lead_middle); | |
5741 | 5833 | break; |
5742 | 5834 | } |
5743 | 5835 |
@@ -5751,7 +5843,8 @@ | ||
5751 | 5843 | if (off != 0) |
5752 | 5844 | amount += off; |
5753 | 5845 | else if (align == COM_RIGHT) |
5754 | - amount += lead_start_len - lead_middle_len; | |
5846 | + amount += vim_strsize(lead_start) | |
5847 | + - vim_strsize(lead_middle); | |
5755 | 5848 | done = TRUE; |
5756 | 5849 | break; |
5757 | 5850 | } |
@@ -2475,7 +2475,11 @@ | ||
2475 | 2475 | static char *(p_ead_values[]) = {"both", "ver", "hor", NULL}; |
2476 | 2476 | #endif |
2477 | 2477 | #if defined(FEAT_QUICKFIX) |
2478 | +# ifdef FEAT_AUTOCMD | |
2479 | +static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", "acwrite", NULL}; | |
2480 | +# else | |
2478 | 2481 | static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", NULL}; |
2482 | +# endif | |
2479 | 2483 | static char *(p_bufhidden_values[]) = {"hide", "unload", "delete", "wipe", NULL}; |
2480 | 2484 | #endif |
2481 | 2485 | static char *(p_bs_values[]) = {"indent", "eol", "start", NULL}; |
@@ -1972,13 +1972,15 @@ | ||
1972 | 1972 | } |
1973 | 1973 | |
1974 | 1974 | /* |
1975 | - * Return TRUE if "buf" is a "nofile" buffer. | |
1975 | + * Return TRUE if "buf" is a "nofile" or "acwrite" buffer. | |
1976 | + * This means the buffer name is not a file name. | |
1976 | 1977 | */ |
1977 | 1978 | int |
1978 | 1979 | bt_nofile(buf) |
1979 | 1980 | buf_T *buf; |
1980 | 1981 | { |
1981 | - return (buf->b_p_bt[0] == 'n' && buf->b_p_bt[2] == 'f'); | |
1982 | + return (buf->b_p_bt[0] == 'n' && buf->b_p_bt[2] == 'f') | |
1983 | + || buf->b_p_bt[0] == 'a'; | |
1982 | 1984 | } |
1983 | 1985 | |
1984 | 1986 | /* |