• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revision9be87deaeb527ef18daf09d6c75b21d1d7a65d78 (tree)
Time2004-07-17 05:18:37
Authorvimboss
Commitervimboss

Log Message

updated for version 7.0009

Change Summary

Incremental Difference

diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/cmdline.txt
--- a/runtime/doc/cmdline.txt Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/cmdline.txt Fri Jul 16 20:18:37 2004 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -164,6 +164,8 @@
164164 'path' as in |gf|
165165 CTRL-W the Word under the cursor
166166 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.
167169 {not in Vi}
168170 CTRL-F and CTRL-P: {only when +file_in_path feature is
169171 included}
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/options.txt
--- a/runtime/doc/options.txt Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/options.txt Fri Jul 16 20:18:37 2004 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1104,6 +1104,9 @@
11041104 nofile buffer which is not related to a file and will not be
11051105 written
11061106 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}
11071110 quickfix quickfix buffer, contains list of errors |:cwindow|
11081111 help help buffer (you are not supposed to set this
11091112 manually)
@@ -1128,6 +1131,12 @@
11281131 nofile only: The buffer name is fixed, it is not handled like a
11291132 file name. It is not modified in response to a |:cd|
11301133 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.
11311140
11321141 *'casemap'* *'cmp'*
11331142 'casemap' 'cmp' string (default: "internal,keepascii")
@@ -3422,14 +3431,16 @@
34223431 {not in Vi}
34233432 {not available when compiled without the
34243433 |+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'.
34333444 NOTE: This option is reset when 'compatible' is set.
34343445
34353446 *'indentexpr'* *'inde'*
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/starting.txt
--- a/runtime/doc/starting.txt Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/starting.txt Fri Jul 16 20:18:37 2004 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -746,7 +746,7 @@
746746 "home:.vimrc" (for Amiga) (*)
747747 "$VIM/.vimrc" (for OS/2 and Amiga) (*)
748748 "$HOME/_vimrc" (for MS-DOS and Win32) (*)
749- "$VIM\_vimrc" (for MS-DOS and Win32) (*)
749+ "$VIM/_vimrc" (for MS-DOS and Win32) (*)
750750 Note: For Unix, OS/2 and Amiga, when ".vimrc" does not exist,
751751 "_vimrc" is also tried, in case an MS-DOS compatible file
752752 system is used. For MS-DOS and Win32 ".vimrc" is checked
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/syntax.txt
--- a/runtime/doc/syntax.txt Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/syntax.txt Fri Jul 16 20:18:37 2004 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2089,6 +2089,14 @@
20892089 "$global_var", "@instance_var", "| iterator |", and ":symbol".
20902090
20912091
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+
20922100 SDL *sdl.vim* *sdl-syntax*
20932101
20942102 The SDL highlighting probably misses a few keywords, but SDL has so many
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/tags
--- a/runtime/doc/tags Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/tags Fri Jul 16 20:18:37 2004 +0000
@@ -1813,6 +1813,8 @@
18131813 :di change.txt /*:di*
18141814 :diffg diff.txt /*:diffg*
18151815 :diffget diff.txt /*:diffget*
1816+:diffo diff.txt /*:diffo*
1817+:diffoff diff.txt /*:diffoff*
18161818 :diffp diff.txt /*:diffp*
18171819 :diffpatch diff.txt /*:diffpatch*
18181820 :diffpu diff.txt /*:diffpu*
@@ -3527,6 +3529,7 @@
35273529 E673 print.txt /*E673*
35283530 E674 print.txt /*E674*
35293531 E675 print.txt /*E675*
3532+E676 options.txt /*E676*
35303533 E68 pattern.txt /*E68*
35313534 E69 pattern.txt /*E69*
35323535 E70 pattern.txt /*E70*
@@ -5424,8 +5427,12 @@
54245427 netrw pi_netrw.txt /*netrw*
54255428 netrw-- pi_netrw.txt /*netrw--*
54265429 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*
54275433 netrw-activate pi_netrw.txt /*netrw-activate*
54285434 netrw-browse pi_netrw.txt /*netrw-browse*
5435+netrw-browse-cmds pi_netrw.txt /*netrw-browse-cmds*
54295436 netrw-browse-var pi_netrw.txt /*netrw-browse-var*
54305437 netrw-c-l pi_netrw.txt /*netrw-c-l*
54315438 netrw-cadaver pi_netrw.txt /*netrw-cadaver*
@@ -5439,9 +5446,9 @@
54395446 netrw-file pi_netrw.txt /*netrw-file*
54405447 netrw-fixup pi_netrw.txt /*netrw-fixup*
54415448 netrw-ftp pi_netrw.txt /*netrw-ftp*
5442-netrw-h pi_netrw.txt /*netrw-h*
54435449 netrw-help pi_netrw.txt /*netrw-help*
54445450 netrw-history pi_netrw.txt /*netrw-history*
5451+netrw-i pi_netrw.txt /*netrw-i*
54455452 netrw-list pi_netrw.txt /*netrw-list*
54465453 netrw-list-hack pi_netrw.txt /*netrw-list-hack*
54475454 netrw-move pi_netrw.txt /*netrw-move*
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/todo.txt
--- a/runtime/doc/todo.txt Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/todo.txt Fri Jul 16 20:18:37 2004 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -30,13 +30,15 @@
3030 *known-bugs*
3131 -------------------- Known bugs and current work -----------------------
3232
33-Make aap build script work again. Also with mzscheme
33+When switching between Aap script and make Vim won't always run.
3434
3535 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)
3737
38-Mac: "make install" doesn't install.
38+Mac: "make install" doesn't install. Patch from RAF.
3939
40+UTF-8 in 'comments' causes wrong indent. Counting bytes instead of char
41+width? (Nikolai Weibull)
4042
4143 For version 7.0:
4244 - Include many PATCHES:
@@ -282,6 +284,9 @@
282284 line.
283285 7 Make ":startinsert" command work directly for functions and scripts?
284286 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.
285290
286291 Vi incompatibility:
287292 8 With undo/redo only marks in the changed lines should be changed. Other
@@ -1995,6 +2000,8 @@
19952000 CmdEnter - Entering Cmdline mode
19962001 VisualEnter - Entering Visual mode
19972002 *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.
19982005 CmdUndefined - Like FuncUndefined but for user commands.
19992006 SearchPost - After doing a search command (e.g. to do "M")
20002007 PreDirChanged/PostDirChanged
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/doc/version7.txt
--- a/runtime/doc/version7.txt Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/doc/version7.txt Fri Jul 16 20:18:37 2004 +0000
@@ -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
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -170,6 +170,10 @@
170170
171171 Added "nbsp" in 'listchars'. (David Blanchet)
172172
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+
173177 For lisp indenting and matching parenthesis: (Sergey Khorev)
174178 - square brackets are recognized properly
175179 - #\(, #\), #\[ and #\] are recognized as character literals
@@ -241,4 +245,14 @@
241245 Using "@:" to repeat a command line didn't work when it contains control
242246 characters.
243247
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+
244258 vim:tw=78:ts=8:ft=help:norl:
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/syntax/d.vim
--- a/runtime/syntax/d.vim Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/syntax/d.vim Fri Jul 16 20:18:37 2004 +0000
@@ -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).
22 "
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
87 "
98 " Options:
109 " d_comment_strings - set to highlight strings and numbers in comments
@@ -30,39 +29,40 @@
3029
3130 " Keyword definitions
3231 "
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
4342 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
5252 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
6666
6767
6868 " Assert is a statement and a module name.
@@ -81,34 +81,34 @@
8181 " Labels
8282 "
8383 " 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
8686
8787 " Comments
8888 "
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*+$"
9494 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
101101 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
105105 endif
106106
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
112112
113113 syn sync minlines=25
114114
@@ -118,54 +118,54 @@
118118
119119 " Escape sequences (oct,specal char,hex,wchar). These are not contained
120120 " 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 "'[^\\]'"
125125
126126 " Unicode characters
127127 "
128-syn match dUnicode "\\u\d\{4\}"
128+syn match dUnicode "\\u\d\{4\}"
129129
130130 " String.
131131 "
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=+"+
136136
137137 " Numbers
138138 "
139139 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\=\)\>"
141141 " 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\=\)\>"
144144 " 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"
147147
148148 "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\)\>"
150150 "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\="
152152 "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\=\>"
154154 "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]\=\>"
157157
158158 "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\)\>"
160160 "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\="
162162 "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]\=\>"
164164
165165 " binary numbers
166-syn match dBinary display "\<0b[01_]\+\>"
166+syn match dBinary display "\<0b[01_]\+\>"
167167 " 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*"
169169 syn case match
170170
171171 " Pragma (preprocessor) support
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/syntax/iss.vim
--- a/runtime/syntax/iss.vim Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/syntax/iss.vim Fri Jul 16 20:18:37 2004 +0000
@@ -1,7 +1,8 @@
11 " 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
56
67 " For version 5.x: Clear all syntax items
78 " For version 6.x: Quit when a syntax file was already loaded
@@ -14,37 +15,40 @@
1415 " shut case off
1516 syn case ignore
1617
18+" Preprocessor
19+syn region issPreProc start="^\s*#" end="$"
20+
1721 " Section
18-syn region issHeader start="\[" end="\]"
22+syn region issHeader start="\[" end="\]"
1923
2024 " Label in the [Setup] Section
21-syn match issLabel "^[^=]\+="
25+syn match issLabel "^[^=]\+="
2226
2327 " URL
24-syn match issURL "http[s]\=:\/\/.*$"
28+syn match issURL "http[s]\=:\/\/.*$"
2529
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:"
4044
41-syn match issComment "^;.*$"
45+syn match issComment "^;.*$"
4246
4347 " folder constant
44-syn match issFolder "{[^{]*}"
48+syn match issFolder "{[^{]*}"
4549
4650 " string
47-syn region issString start=+"+ end=+"+ contains=issFolder
51+syn region issString start=+"+ end=+"+ contains=issFolder
4852
4953 " [Dirs]
5054 syn keyword issDirsFlags deleteafterinstall uninsalwaysuninstall uninsneveruninstall
@@ -104,31 +108,30 @@
104108 endif
105109
106110 " 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
115120
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
132135
133136 delcommand HiLink
134137 endif
diff -r 3ba373b54370 -r 9be87deaeb52 runtime/syntax/scheme.vim
--- a/runtime/syntax/scheme.vim Mon Jul 12 15:53:54 2004 +0000
+++ b/runtime/syntax/scheme.vim Fri Jul 16 20:18:37 2004 +0000
@@ -1,11 +1,14 @@
11 " Vim syntax file
22 " 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>
56
67 " This script incorrectly recognizes some junk input as numerals:
78 " parsing the complete system of Scheme numerals using the pattern
89 " language is practically impossible: I did a lax approximation.
10+
11+" MzScheme extensions can be activated with setting is_mzscheme variable
912
1013 " Suggestions and bug reports are solicited by the author.
1114
@@ -23,12 +26,12 @@
2326
2427 " Fascist highlighting: everything that doesn't fit the rules is an error...
2528
26-syn match schemeError oneline ![^ \t()";]*!
29+syn match schemeError oneline ![^ \t()\[\]";]*!
2730 syn match schemeError oneline ")"
2831
2932 " Quoted and backquoted stuff
3033
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
3235
3336 syn region schemeQuoted matchgroup=Delimiter start="['`](" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
3437 syn region schemeQuoted matchgroup=Delimiter start="['`]#(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
@@ -36,15 +39,26 @@
3639 syn region schemeStrucRestricted matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
3740 syn region schemeStrucRestricted matchgroup=Delimiter start="#(" matchgroup=Delimiter end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
3841
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
4146
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
4452
4553 syn region schemeUnquote matchgroup=Delimiter start=",#(" end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
4654 syn region schemeUnquote matchgroup=Delimiter start=",@#(" end=")" contains=ALLBUT,schemeStruc,schemeSyntax,schemeFunc
4755
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+
4862 " R5RS Scheme Functions and Syntax:
4963
5064 if version < 600
@@ -96,63 +110,126 @@
96110 syn keyword schemeFunc scheme-report-environment null-environment
97111 syn keyword schemeFunc interaction-environment
98112
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 ![+-]$!
108113 " ... so that a single + or -, inside a quoted context, would not be
109114 " interpreted as a number (outside such contexts, it's a schemeFunc)
110115
111-syn match schemeDelimiter oneline !\.[ \t()";]!me=e-1
116+syn match schemeDelimiter oneline !\.[ \t\[\]()";]!me=e-1
112117 syn match schemeDelimiter oneline !\.$!
113118 " ... and a single dot is not a number but a delimiter
114119
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-
128120 " This keeps all other stuff unhighlighted, except *stuff* and <stuff>:
129121
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\[\]()";]*,
132124
133125 syn match schemeOther oneline "\.\.\."
134-syn match schemeError oneline !\.\.\.[^ \t()";]\+!
126+syn match schemeError oneline !\.\.\.[^ \t\[\]()";]\+!
135127 " ... a special identifier
136128
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
138130 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\[\]()";]*,
140132
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
142134 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\[\]()";]*,
144136
145137 " Non-quoted lists, and strings:
146138
147139 syn region schemeStruc matchgroup=Delimiter start="(" matchgroup=Delimiter end=")" contains=ALL
148140 syn region schemeStruc matchgroup=Delimiter start="#(" matchgroup=Delimiter end=")" contains=ALL
149141
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:
150146 syn region schemeString start=+"+ skip=+\\[\\"]+ end=+"+
151147
152148 " Comments:
153149
154150 syn match schemeComment ";.*$"
155151
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+
156233 " Synchronization and the wrapping up...
157234
158235 syn sync match matchPlace grouphere NONE "^[^ \t]"
@@ -181,6 +258,7 @@
181258 HiLink schemeConstant Constant
182259
183260 HiLink schemeComment Comment
261+ HiLink schemeMultilineComment Comment
184262 HiLink schemeError Error
185263
186264 delcommand HiLink
diff -r 3ba373b54370 -r 9be87deaeb52 src/auto/configure
--- a/src/auto/configure Mon Jul 12 15:53:54 2004 +0000
+++ b/src/auto/configure Fri Jul 16 20:18:37 2004 +0000
@@ -1661,6 +1661,9 @@
16611661 MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzgc -lmzscheme"
16621662 if test "$GCC" = yes; then
16631663 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"
16641667 fi
16651668 fi
16661669 MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \
@@ -1682,7 +1685,7 @@
16821685
16831686
16841687 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
16861689 # Check whether --enable-perlinterp or --disable-perlinterp was given.
16871690 if test "${enable_perlinterp+set}" = set; then
16881691 enableval="$enable_perlinterp"
@@ -1697,7 +1700,7 @@
16971700 # Extract the first word of "perl", so it can be a program name with args.
16981701 set dummy perl; ac_word=$2
16991702 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
17011704 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_perl'+set}'`\" = set"; then
17021705 echo $ac_n "(cached) $ac_c" 1>&6
17031706 else
@@ -1731,7 +1734,7 @@
17311734
17321735 if test "X$vi_cv_path_perl" != "X"; then
17331736 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
17351738 if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then
17361739 eval `$vi_cv_path_perl -V:usethreads`
17371740 if test "X$usethreads" = "XUNKNOWN" -o "X$usethreads" = "Xundef"; then
@@ -1767,7 +1770,7 @@
17671770 -e 'ccdlflags' | sed -e 's/-bE:perl.exp//'`
17681771
17691772 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
17711774 cflags_save=$CFLAGS
17721775 libs_save=$LIBS
17731776 ldflags_save=$LDFLAGS
@@ -1775,14 +1778,14 @@
17751778 LIBS="$LIBS $perllibs"
17761779 LDFLAGS="$perlldflags $LDFLAGS"
17771780 cat > conftest.$ac_ext <<EOF
1778-#line 1779 "configure"
1781+#line 1782 "configure"
17791782 #include "confdefs.h"
17801783
17811784 int main() {
17821785
17831786 ; return 0; }
17841787 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
17861789 rm -rf conftest*
17871790 echo "$ac_t""yes" 1>&6; perl_ok=yes
17881791 else
@@ -1845,7 +1848,7 @@
18451848
18461849
18471850 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
18491852 # Check whether --enable-pythoninterp or --disable-pythoninterp was given.
18501853 if test "${enable_pythoninterp+set}" = set; then
18511854 enableval="$enable_pythoninterp"
@@ -1859,7 +1862,7 @@
18591862 # Extract the first word of "python", so it can be a program name with args.
18601863 set dummy python; ac_word=$2
18611864 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
18631866 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_python'+set}'`\" = set"; then
18641867 echo $ac_n "(cached) $ac_c" 1>&6
18651868 else
@@ -1894,7 +1897,7 @@
18941897 if test "X$vi_cv_path_python" != "X"; then
18951898
18961899 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
18981901 if eval "test \"`echo '$''{'vi_cv_var_python_version'+set}'`\" = set"; then
18991902 echo $ac_n "(cached) $ac_c" 1>&6
19001903 else
@@ -1906,14 +1909,14 @@
19061909 echo "$ac_t""$vi_cv_var_python_version" 1>&6
19071910
19081911 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
19101913 if ${vi_cv_path_python} -c \
19111914 "import sys; sys.exit(${vi_cv_var_python_version} < 1.4)"
19121915 then
19131916 echo "$ac_t""yep" 1>&6
19141917
19151918 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
19171920 if eval "test \"`echo '$''{'vi_cv_path_python_pfx'+set}'`\" = set"; then
19181921 echo $ac_n "(cached) $ac_c" 1>&6
19191922 else
@@ -1925,7 +1928,7 @@
19251928 echo "$ac_t""$vi_cv_path_python_pfx" 1>&6
19261929
19271930 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
19291932 if eval "test \"`echo '$''{'vi_cv_path_python_epfx'+set}'`\" = set"; then
19301933 echo $ac_n "(cached) $ac_c" 1>&6
19311934 else
@@ -1956,7 +1959,7 @@
19561959
19571960
19581961 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
19601963 if eval "test \"`echo '$''{'vi_cv_path_python_conf'+set}'`\" = set"; then
19611964 echo $ac_n "(cached) $ac_c" 1>&6
19621965 else
@@ -2029,7 +2032,7 @@
20292032 PYTHON_GETPATH_CFLAGS="-DPYTHONPATH='\"${vi_cv_path_pythonpath}\"' -DPREFIX='\"${vi_cv_path_python_pfx}\"' -DEXEC_PREFIX='\"${vi_cv_path_python_epfx}\"'"
20302033
20312034 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
20332036 threadsafe_flag=
20342037 thread_lib=
20352038 if test "x$MACOSX" != "xyes"; then
@@ -2045,14 +2048,14 @@
20452048 CFLAGS="$CFLAGS $threadsafe_flag"
20462049 LIBS="$LIBS $thread_lib"
20472050 cat > conftest.$ac_ext <<EOF
2048-#line 2049 "configure"
2051+#line 2052 "configure"
20492052 #include "confdefs.h"
20502053
20512054 int main() {
20522055
20532056 ; return 0; }
20542057 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
20562059 rm -rf conftest*
20572060 echo "$ac_t""yes" 1>&6; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag"
20582061 else
@@ -2069,20 +2072,20 @@
20692072 fi
20702073
20712074 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
20732076 cflags_save=$CFLAGS
20742077 libs_save=$LIBS
20752078 CFLAGS="$CFLAGS $PYTHON_CFLAGS"
20762079 LIBS="$LIBS $PYTHON_LIBS"
20772080 cat > conftest.$ac_ext <<EOF
2078-#line 2079 "configure"
2081+#line 2082 "configure"
20792082 #include "confdefs.h"
20802083
20812084 int main() {
20822085
20832086 ; return 0; }
20842087 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
20862089 rm -rf conftest*
20872090 echo "$ac_t""yes" 1>&6; python_ok=yes
20882091 else
@@ -2121,7 +2124,7 @@
21212124
21222125
21232126 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
21252128 # Check whether --enable-tclinterp or --disable-tclinterp was given.
21262129 if test "${enable_tclinterp+set}" = set; then
21272130 enableval="$enable_tclinterp"
@@ -2135,7 +2138,7 @@
21352138 if test "$enable_tclinterp" = "yes"; then
21362139
21372140 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
21392142 # Check whether --with-tclsh or --without-tclsh was given.
21402143 if test "${with_tclsh+set}" = set; then
21412144 withval="$with_tclsh"
@@ -2147,7 +2150,7 @@
21472150 # Extract the first word of "$tclsh_name", so it can be a program name with args.
21482151 set dummy $tclsh_name; ac_word=$2
21492152 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
21512154 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
21522155 echo $ac_n "(cached) $ac_c" 1>&6
21532156 else
@@ -2186,7 +2189,7 @@
21862189 # Extract the first word of "$tclsh_name", so it can be a program name with args.
21872190 set dummy $tclsh_name; ac_word=$2
21882191 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
21902193 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
21912194 echo $ac_n "(cached) $ac_c" 1>&6
21922195 else
@@ -2224,7 +2227,7 @@
22242227 # Extract the first word of "$tclsh_name", so it can be a program name with args.
22252228 set dummy $tclsh_name; ac_word=$2
22262229 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
22282231 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_tcl'+set}'`\" = set"; then
22292232 echo $ac_n "(cached) $ac_c" 1>&6
22302233 else
@@ -2259,14 +2262,14 @@
22592262 fi
22602263 if test "X$vi_cv_path_tcl" != "X"; then
22612264 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
22632266 if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then
22642267 tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
22652268 echo "$ac_t""$tclver - OK" 1>&6;
22662269 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 -`
22672270
22682271 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
22702273 if test "x$MACOSX" != "xyes"; then
22712274 tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include"
22722275 else
@@ -2285,7 +2288,7 @@
22852288 fi
22862289 if test -z "$SKIP_TCL"; then
22872290 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
22892292 if test "x$MACOSX" != "xyes"; then
22902293 tclcnf=`echo $tclinc | sed s/include/lib/g`
22912294 else
@@ -2303,7 +2306,7 @@
23032306 if test -z "$TCL_LIBS"; then
23042307 echo "$ac_t""<not found>" 1>&6
23052308 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
23072310 tcllib=`echo $tclinc | sed s/include/lib/g`
23082311 for ext in .so .a ; do
23092312 for ver in "" $tclver ; do
@@ -2349,7 +2352,7 @@
23492352
23502353
23512354 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
23532356 # Check whether --enable-rubyinterp or --disable-rubyinterp was given.
23542357 if test "${enable_rubyinterp+set}" = set; then
23552358 enableval="$enable_rubyinterp"
@@ -2364,7 +2367,7 @@
23642367 # Extract the first word of "ruby", so it can be a program name with args.
23652368 set dummy ruby; ac_word=$2
23662369 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
23682371 if eval "test \"`echo '$''{'ac_cv_path_vi_cv_path_ruby'+set}'`\" = set"; then
23692372 echo $ac_n "(cached) $ac_c" 1>&6
23702373 else
@@ -2398,11 +2401,11 @@
23982401
23992402 if test "X$vi_cv_path_ruby" != "X"; then
24002403 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
24022405 if $vi_cv_path_ruby -e 'VERSION >= "1.6.0" or exit 1' >/dev/null 2>/dev/null; then
24032406 echo "$ac_t""OK" 1>&6
24042407 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
24062409 rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e 'print Config::CONFIG["archdir"] || $hdrdir' 2>/dev/null`
24072410 if test "X$rubyhdrdir" != "X"; then
24082411 echo "$ac_t""$rubyhdrdir" 1>&6
@@ -2454,7 +2457,7 @@
24542457
24552458
24562459 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
24582461 # Check whether --enable-cscope or --disable-cscope was given.
24592462 if test "${enable_cscope+set}" = set; then
24602463 enableval="$enable_cscope"
@@ -2472,7 +2475,7 @@
24722475 fi
24732476
24742477 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
24762479 # Check whether --enable-workshop or --disable-workshop was given.
24772480 if test "${enable_workshop+set}" = set; then
24782481 enableval="$enable_workshop"
@@ -2497,7 +2500,7 @@
24972500 fi
24982501
24992502 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
25012504 # Check whether --enable-netbeans or --disable-netbeans was given.
25022505 if test "${enable_netbeans+set}" = set; then
25032506 enableval="$enable_netbeans"
@@ -2509,7 +2512,7 @@
25092512 if test "$enable_netbeans" = "yes"; then
25102513 echo "$ac_t""no" 1>&6
25112514 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
25132516 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
25142517 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
25152518 echo $ac_n "(cached) $ac_c" 1>&6
@@ -2517,7 +2520,7 @@
25172520 ac_save_LIBS="$LIBS"
25182521 LIBS="-lsocket $LIBS"
25192522 cat > conftest.$ac_ext <<EOF
2520-#line 2521 "configure"
2523+#line 2524 "configure"
25212524 #include "confdefs.h"
25222525 /* Override any gcc2 internal prototype to avoid an error. */
25232526 /* We use char because int might match the return type of a gcc2
@@ -2528,7 +2531,7 @@
25282531 socket()
25292532 ; return 0; }
25302533 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
25322535 rm -rf conftest*
25332536 eval "ac_cv_lib_$ac_lib_var=yes"
25342537 else
@@ -2556,7 +2559,7 @@
25562559 fi
25572560
25582561 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
25602563 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
25612564 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
25622565 echo $ac_n "(cached) $ac_c" 1>&6
@@ -2564,7 +2567,7 @@
25642567 ac_save_LIBS="$LIBS"
25652568 LIBS="-lnsl $LIBS"
25662569 cat > conftest.$ac_ext <<EOF
2567-#line 2568 "configure"
2570+#line 2571 "configure"
25682571 #include "confdefs.h"
25692572 /* Override any gcc2 internal prototype to avoid an error. */
25702573 /* We use char because int might match the return type of a gcc2
@@ -2575,7 +2578,7 @@
25752578 gethostbyname()
25762579 ; return 0; }
25772580 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
25792582 rm -rf conftest*
25802583 eval "ac_cv_lib_$ac_lib_var=yes"
25812584 else
@@ -2603,9 +2606,9 @@
26032606 fi
26042607
26052608 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
26072610 cat > conftest.$ac_ext <<EOF
2608-#line 2609 "configure"
2611+#line 2612 "configure"
26092612 #include "confdefs.h"
26102613
26112614 #include <stdio.h>
@@ -2635,7 +2638,7 @@
26352638
26362639 ; return 0; }
26372640 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
26392642 rm -rf conftest*
26402643 echo "$ac_t""yes" 1>&6
26412644 else
@@ -2660,7 +2663,7 @@
26602663 fi
26612664
26622665 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
26642667 # Check whether --enable-sniff or --disable-sniff was given.
26652668 if test "${enable_sniff+set}" = set; then
26662669 enableval="$enable_sniff"
@@ -2682,7 +2685,7 @@
26822685 fi
26832686
26842687 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
26862689 # Check whether --enable-multibyte or --disable-multibyte was given.
26872690 if test "${enable_multibyte+set}" = set; then
26882691 enableval="$enable_multibyte"
@@ -2700,7 +2703,7 @@
27002703 fi
27012704
27022705 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
27042707 # Check whether --enable-hangulinput or --disable-hangulinput was given.
27052708 if test "${enable_hangulinput+set}" = set; then
27062709 enableval="$enable_hangulinput"
@@ -2712,7 +2715,7 @@
27122715 echo "$ac_t""$enable_hangulinput" 1>&6
27132716
27142717 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
27162719 # Check whether --enable-xim or --disable-xim was given.
27172720 if test "${enable_xim+set}" = set; then
27182721 enableval="$enable_xim"
@@ -2723,7 +2726,7 @@
27232726
27242727
27252728 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
27272730 # Check whether --enable-fontset or --disable-fontset was given.
27282731 if test "${enable_fontset+set}" = set; then
27292732 enableval="$enable_fontset"
@@ -2743,7 +2746,7 @@
27432746 # Extract the first word of "xmkmf", so it can be a program name with args.
27442747 set dummy xmkmf; ac_word=$2
27452748 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
27472750 if eval "test \"`echo '$''{'ac_cv_path_xmkmfpath'+set}'`\" = set"; then
27482751 echo $ac_n "(cached) $ac_c" 1>&6
27492752 else
@@ -2781,7 +2784,7 @@
27812784 # Uses ac_ vars as temps to allow command line to override cache and checks.
27822785 # --without-x overrides everything else, but does not touch the cache.
27832786 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
27852788
27862789 # Check whether --with-x or --without-x was given.
27872790 if test "${with_x+set}" = set; then
@@ -2843,12 +2846,12 @@
28432846
28442847 # First, try using that file with no special directory specified.
28452848 cat > conftest.$ac_ext <<EOF
2846-#line 2847 "configure"
2849+#line 2850 "configure"
28472850 #include "confdefs.h"
28482851 #include <$x_direct_test_include>
28492852 EOF
28502853 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; }
28522855 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
28532856 if test -z "$ac_err"; then
28542857 rm -rf conftest*
@@ -2917,14 +2920,14 @@
29172920 ac_save_LIBS="$LIBS"
29182921 LIBS="-l$x_direct_test_library $LIBS"
29192922 cat > conftest.$ac_ext <<EOF
2920-#line 2921 "configure"
2923+#line 2924 "configure"
29212924 #include "confdefs.h"
29222925
29232926 int main() {
29242927 ${x_direct_test_function}()
29252928 ; return 0; }
29262929 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
29282931 rm -rf conftest*
29292932 LIBS="$ac_save_LIBS"
29302933 # We can link X programs with no special library path.
@@ -3030,17 +3033,17 @@
30303033 case "`(uname -sr) 2>/dev/null`" in
30313034 "SunOS 5"*)
30323035 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
30343037 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
30353038 cat > conftest.$ac_ext <<EOF
3036-#line 3037 "configure"
3039+#line 3040 "configure"
30373040 #include "confdefs.h"
30383041
30393042 int main() {
30403043
30413044 ; return 0; }
30423045 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
30443047 rm -rf conftest*
30453048 ac_R_nospace=yes
30463049 else
@@ -3056,14 +3059,14 @@
30563059 else
30573060 LIBS="$ac_xsave_LIBS -R $x_libraries"
30583061 cat > conftest.$ac_ext <<EOF
3059-#line 3060 "configure"
3062+#line 3063 "configure"
30603063 #include "confdefs.h"
30613064
30623065 int main() {
30633066
30643067 ; return 0; }
30653068 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
30673070 rm -rf conftest*
30683071 ac_R_space=yes
30693072 else
@@ -3095,7 +3098,7 @@
30953098 # libraries were built with DECnet support. And karl@cs.umb.edu says
30963099 # the Alpha needs dnet_stub (dnet does not exist).
30973100 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
30993102 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
31003103 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
31013104 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3103,7 +3106,7 @@
31033106 ac_save_LIBS="$LIBS"
31043107 LIBS="-ldnet $LIBS"
31053108 cat > conftest.$ac_ext <<EOF
3106-#line 3107 "configure"
3109+#line 3110 "configure"
31073110 #include "confdefs.h"
31083111 /* Override any gcc2 internal prototype to avoid an error. */
31093112 /* We use char because int might match the return type of a gcc2
@@ -3114,7 +3117,7 @@
31143117 dnet_ntoa()
31153118 ; return 0; }
31163119 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
31183121 rm -rf conftest*
31193122 eval "ac_cv_lib_$ac_lib_var=yes"
31203123 else
@@ -3136,7 +3139,7 @@
31363139
31373140 if test $ac_cv_lib_dnet_dnet_ntoa = no; then
31383141 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
31403143 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
31413144 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
31423145 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3144,7 +3147,7 @@
31443147 ac_save_LIBS="$LIBS"
31453148 LIBS="-ldnet_stub $LIBS"
31463149 cat > conftest.$ac_ext <<EOF
3147-#line 3148 "configure"
3150+#line 3151 "configure"
31483151 #include "confdefs.h"
31493152 /* Override any gcc2 internal prototype to avoid an error. */
31503153 /* We use char because int might match the return type of a gcc2
@@ -3155,7 +3158,7 @@
31553158 dnet_ntoa()
31563159 ; return 0; }
31573160 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
31593162 rm -rf conftest*
31603163 eval "ac_cv_lib_$ac_lib_var=yes"
31613164 else
@@ -3184,12 +3187,12 @@
31843187 # The nsl library prevents programs from opening the X display
31853188 # on Irix 5.2, according to dickey@clark.net.
31863189 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
31883191 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
31893192 echo $ac_n "(cached) $ac_c" 1>&6
31903193 else
31913194 cat > conftest.$ac_ext <<EOF
3192-#line 3193 "configure"
3195+#line 3196 "configure"
31933196 #include "confdefs.h"
31943197 /* System header to define __stub macros and hopefully few prototypes,
31953198 which can conflict with char gethostbyname(); below. */
@@ -3212,7 +3215,7 @@
32123215
32133216 ; return 0; }
32143217 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
32163219 rm -rf conftest*
32173220 eval "ac_cv_func_gethostbyname=yes"
32183221 else
@@ -3233,7 +3236,7 @@
32333236
32343237 if test $ac_cv_func_gethostbyname = no; then
32353238 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
32373240 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
32383241 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
32393242 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3241,7 +3244,7 @@
32413244 ac_save_LIBS="$LIBS"
32423245 LIBS="-lnsl $LIBS"
32433246 cat > conftest.$ac_ext <<EOF
3244-#line 3245 "configure"
3247+#line 3248 "configure"
32453248 #include "confdefs.h"
32463249 /* Override any gcc2 internal prototype to avoid an error. */
32473250 /* We use char because int might match the return type of a gcc2
@@ -3252,7 +3255,7 @@
32523255 gethostbyname()
32533256 ; return 0; }
32543257 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
32563259 rm -rf conftest*
32573260 eval "ac_cv_lib_$ac_lib_var=yes"
32583261 else
@@ -3282,12 +3285,12 @@
32823285 # -lsocket must be given before -lnsl if both are needed.
32833286 # We assume that if connect needs -lnsl, so does gethostbyname.
32843287 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
32863289 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
32873290 echo $ac_n "(cached) $ac_c" 1>&6
32883291 else
32893292 cat > conftest.$ac_ext <<EOF
3290-#line 3291 "configure"
3293+#line 3294 "configure"
32913294 #include "confdefs.h"
32923295 /* System header to define __stub macros and hopefully few prototypes,
32933296 which can conflict with char connect(); below. */
@@ -3310,7 +3313,7 @@
33103313
33113314 ; return 0; }
33123315 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
33143317 rm -rf conftest*
33153318 eval "ac_cv_func_connect=yes"
33163319 else
@@ -3331,7 +3334,7 @@
33313334
33323335 if test $ac_cv_func_connect = no; then
33333336 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
33353338 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
33363339 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
33373340 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3339,7 +3342,7 @@
33393342 ac_save_LIBS="$LIBS"
33403343 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
33413344 cat > conftest.$ac_ext <<EOF
3342-#line 3343 "configure"
3345+#line 3346 "configure"
33433346 #include "confdefs.h"
33443347 /* Override any gcc2 internal prototype to avoid an error. */
33453348 /* We use char because int might match the return type of a gcc2
@@ -3350,7 +3353,7 @@
33503353 connect()
33513354 ; return 0; }
33523355 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
33543357 rm -rf conftest*
33553358 eval "ac_cv_lib_$ac_lib_var=yes"
33563359 else
@@ -3374,12 +3377,12 @@
33743377
33753378 # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
33763379 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
33783381 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
33793382 echo $ac_n "(cached) $ac_c" 1>&6
33803383 else
33813384 cat > conftest.$ac_ext <<EOF
3382-#line 3383 "configure"
3385+#line 3386 "configure"
33833386 #include "confdefs.h"
33843387 /* System header to define __stub macros and hopefully few prototypes,
33853388 which can conflict with char remove(); below. */
@@ -3402,7 +3405,7 @@
34023405
34033406 ; return 0; }
34043407 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
34063409 rm -rf conftest*
34073410 eval "ac_cv_func_remove=yes"
34083411 else
@@ -3423,7 +3426,7 @@
34233426
34243427 if test $ac_cv_func_remove = no; then
34253428 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
34273430 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
34283431 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
34293432 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3431,7 +3434,7 @@
34313434 ac_save_LIBS="$LIBS"
34323435 LIBS="-lposix $LIBS"
34333436 cat > conftest.$ac_ext <<EOF
3434-#line 3435 "configure"
3437+#line 3438 "configure"
34353438 #include "confdefs.h"
34363439 /* Override any gcc2 internal prototype to avoid an error. */
34373440 /* We use char because int might match the return type of a gcc2
@@ -3442,7 +3445,7 @@
34423445 remove()
34433446 ; return 0; }
34443447 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
34463449 rm -rf conftest*
34473450 eval "ac_cv_lib_$ac_lib_var=yes"
34483451 else
@@ -3466,12 +3469,12 @@
34663469
34673470 # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
34683471 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
34703473 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
34713474 echo $ac_n "(cached) $ac_c" 1>&6
34723475 else
34733476 cat > conftest.$ac_ext <<EOF
3474-#line 3475 "configure"
3477+#line 3478 "configure"
34753478 #include "confdefs.h"
34763479 /* System header to define __stub macros and hopefully few prototypes,
34773480 which can conflict with char shmat(); below. */
@@ -3494,7 +3497,7 @@
34943497
34953498 ; return 0; }
34963499 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
34983501 rm -rf conftest*
34993502 eval "ac_cv_func_shmat=yes"
35003503 else
@@ -3515,7 +3518,7 @@
35153518
35163519 if test $ac_cv_func_shmat = no; then
35173520 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
35193522 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
35203523 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35213524 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3523,7 +3526,7 @@
35233526 ac_save_LIBS="$LIBS"
35243527 LIBS="-lipc $LIBS"
35253528 cat > conftest.$ac_ext <<EOF
3526-#line 3527 "configure"
3529+#line 3530 "configure"
35273530 #include "confdefs.h"
35283531 /* Override any gcc2 internal prototype to avoid an error. */
35293532 /* We use char because int might match the return type of a gcc2
@@ -3534,7 +3537,7 @@
35343537 shmat()
35353538 ; return 0; }
35363539 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
35383541 rm -rf conftest*
35393542 eval "ac_cv_lib_$ac_lib_var=yes"
35403543 else
@@ -3567,7 +3570,7 @@
35673570 # libraries we check for below, so use a different variable.
35683571 # --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
35693572 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
35713574 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
35723575 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
35733576 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3575,7 +3578,7 @@
35753578 ac_save_LIBS="$LIBS"
35763579 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
35773580 cat > conftest.$ac_ext <<EOF
3578-#line 3579 "configure"
3581+#line 3582 "configure"
35793582 #include "confdefs.h"
35803583 /* Override any gcc2 internal prototype to avoid an error. */
35813584 /* We use char because int might match the return type of a gcc2
@@ -3586,7 +3589,7 @@
35863589 IceConnectionNumber()
35873590 ; return 0; }
35883591 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
35903593 rm -rf conftest*
35913594 eval "ac_cv_lib_$ac_lib_var=yes"
35923595 else
@@ -3640,18 +3643,18 @@
36403643
36413644
36423645 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
36443647 cflags_save=$CFLAGS
36453648 CFLAGS="$CFLAGS $X_CFLAGS"
36463649 cat > conftest.$ac_ext <<EOF
3647-#line 3648 "configure"
3650+#line 3651 "configure"
36483651 #include "confdefs.h"
36493652 #include <X11/Xlib.h>
36503653 int main() {
36513654
36523655 ; return 0; }
36533656 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
36553658 rm -rf conftest*
36563659 echo "$ac_t""yes" 1>&6
36573660 else
@@ -3677,7 +3680,7 @@
36773680 LDFLAGS="-L$x_libraries $LDFLAGS"
36783681
36793682 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
36813684 ac_lib_var=`echo Xdmcp'_'_XdmcpAuthDoIt | sed 'y%./+-%__p_%'`
36823685 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
36833686 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3685,7 +3688,7 @@
36853688 ac_save_LIBS="$LIBS"
36863689 LIBS="-lXdmcp -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lXdmcp $LIBS"
36873690 cat > conftest.$ac_ext <<EOF
3688-#line 3689 "configure"
3691+#line 3692 "configure"
36893692 #include "confdefs.h"
36903693 /* Override any gcc2 internal prototype to avoid an error. */
36913694 /* We use char because int might match the return type of a gcc2
@@ -3696,7 +3699,7 @@
36963699 _XdmcpAuthDoIt()
36973700 ; return 0; }
36983701 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
37003703 rm -rf conftest*
37013704 eval "ac_cv_lib_$ac_lib_var=yes"
37023705 else
@@ -3718,7 +3721,7 @@
37183721
37193722
37203723 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
37223725 ac_lib_var=`echo ICE'_'IceOpenConnection | sed 'y%./+-%__p_%'`
37233726 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37243727 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3726,7 +3729,7 @@
37263729 ac_save_LIBS="$LIBS"
37273730 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
37283731 cat > conftest.$ac_ext <<EOF
3729-#line 3730 "configure"
3732+#line 3733 "configure"
37303733 #include "confdefs.h"
37313734 /* Override any gcc2 internal prototype to avoid an error. */
37323735 /* We use char because int might match the return type of a gcc2
@@ -3737,7 +3740,7 @@
37373740 IceOpenConnection()
37383741 ; return 0; }
37393742 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
37413744 rm -rf conftest*
37423745 eval "ac_cv_lib_$ac_lib_var=yes"
37433746 else
@@ -3760,7 +3763,7 @@
37603763
37613764 LDFLAGS="$X_LIBS $ac_save_LDFLAGS"
37623765 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
37643767 ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
37653768 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
37663769 echo $ac_n "(cached) $ac_c" 1>&6
@@ -3768,7 +3771,7 @@
37683771 ac_save_LIBS="$LIBS"
37693772 LIBS="-lXpm -lXt $X_PRE_LIBS -lXpm -lX11 $X_EXTRA_LIBS $LIBS"
37703773 cat > conftest.$ac_ext <<EOF
3771-#line 3772 "configure"
3774+#line 3775 "configure"
37723775 #include "confdefs.h"
37733776 /* Override any gcc2 internal prototype to avoid an error. */
37743777 /* We use char because int might match the return type of a gcc2
@@ -3779,7 +3782,7 @@
37793782 XpmCreatePixmapFromData()
37803783 ; return 0; }
37813784 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
37833786 rm -rf conftest*
37843787 eval "ac_cv_lib_$ac_lib_var=yes"
37853788 else
@@ -3801,18 +3804,18 @@
38013804
38023805
38033806 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
38053808 cflags_save=$CFLAGS
38063809 CFLAGS="$CFLAGS $X_CFLAGS -Werror"
38073810 cat > conftest.$ac_ext <<EOF
3808-#line 3809 "configure"
3811+#line 3812 "configure"
38093812 #include "confdefs.h"
38103813 #include <X11/Xlib.h>
38113814 int main() {
38123815
38133816 ; return 0; }
38143817 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
38163819 rm -rf conftest*
38173820 echo "$ac_t""no" 1>&6
38183821 else
@@ -3821,14 +3824,14 @@
38213824 rm -rf conftest*
38223825 CFLAGS="$CFLAGS -Wno-implicit-int"
38233826 cat > conftest.$ac_ext <<EOF
3824-#line 3825 "configure"
3827+#line 3828 "configure"
38253828 #include "confdefs.h"
38263829 #include <X11/Xlib.h>
38273830 int main() {
38283831
38293832 ; return 0; }
38303833 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
38323835 rm -rf conftest*
38333836 echo "$ac_t""yes" 1>&6; cflags_save="$cflags_save -Wno-implicit-int"
38343837 else
@@ -3852,7 +3855,7 @@
38523855 test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
38533856
38543857 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
38563859 # Check whether --enable-gui or --disable-gui was given.
38573860 if test "${enable_gui+set}" = set; then
38583861 enableval="$enable_gui"
@@ -3952,7 +3955,7 @@
39523955
39533956 if test "x$SKIP_KDE" != "xYES" -a "$enable_gui_canon" != "kde"; then
39543957 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
39563959 # Check whether --enable-kde-check or --disable-kde-check was given.
39573960 if test "${enable_kde_check+set}" = set; then
39583961 enableval="$enable_kde_check"
@@ -3969,7 +3972,7 @@
39693972
39703973 if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a "$enable_gui_canon" != "gtk2"; then
39713974 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
39733976 # Check whether --enable-gtk-check or --disable-gtk-check was given.
39743977 if test "${enable_gtk_check+set}" = set; then
39753978 enableval="$enable_gtk_check"
@@ -3988,7 +3991,7 @@
39883991 if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \
39893992 -a "$enable_gui_canon" != "gnome2"; then
39903993 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
39923995 # Check whether --enable-gtk2-check or --disable-gtk2-check was given.
39933996 if test "${enable_gtk2_check+set}" = set; then
39943997 enableval="$enable_gtk2_check"
@@ -4006,7 +4009,7 @@
40064009 if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome" \
40074010 -a "$enable_gui_canon" != "gnome2"; then
40084011 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
40104013 # Check whether --enable-gnome-check or --disable-gnome-check was given.
40114014 if test "${enable_gnome_check+set}" = set; then
40124015 enableval="$enable_gnome_check"
@@ -4023,7 +4026,7 @@
40234026
40244027 if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then
40254028 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
40274030 # Check whether --enable-motif-check or --disable-motif-check was given.
40284031 if test "${enable_motif_check+set}" = set; then
40294032 enableval="$enable_motif_check"
@@ -4040,7 +4043,7 @@
40404043
40414044 if test "x$SKIP_ATHENA" != "xYES" -a "$enable_gui_canon" != "athena"; then
40424045 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
40444047 # Check whether --enable-athena-check or --disable-athena-check was given.
40454048 if test "${enable_athena_check+set}" = set; then
40464049 enableval="$enable_athena_check"
@@ -4057,7 +4060,7 @@
40574060
40584061 if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
40594062 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
40614064 # Check whether --enable-nextaw-check or --disable-nextaw-check was given.
40624065 if test "${enable_nextaw_check+set}" = set; then
40634066 enableval="$enable_nextaw_check"
@@ -4074,7 +4077,7 @@
40744077
40754078 if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
40764079 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
40784081 # Check whether --enable-carbon-check or --disable-carbon-check was given.
40794082 if test "${enable_carbon_check+set}" = set; then
40804083 enableval="$enable_carbon_check"
@@ -4108,7 +4111,7 @@
41084111 # Extract the first word of "moc", so it can be a program name with args.
41094112 set dummy moc; ac_word=$2
41104113 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
41124115 if eval "test \"`echo '$''{'ac_cv_path_MOC'+set}'`\" = set"; then
41134116 echo $ac_n "(cached) $ac_c" 1>&6
41144117 else
@@ -4178,7 +4181,7 @@
41784181 fi
41794182
41804183 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
41824185 # Check whether --enable-kde-toolbar or --disable-kde-toolbar was given.
41834186 if test "${enable_kde_toolbar+set}" = set; then
41844187 enableval="$enable_kde_toolbar"
@@ -4203,7 +4206,7 @@
42034206
42044207
42054208 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
42074210 # Check whether --enable-rpath or --disable-rpath was given.
42084211 if test "${enable_rpath+set}" = set; then
42094212 enableval="$enable_rpath"
@@ -4219,7 +4222,7 @@
42194222 fi
42204223
42214224 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
42234226 # Check whether --with-kde-prefix or --without-kde-prefix was given.
42244227 if test "${with_kde_prefix+set}" = set; then
42254228 withval="$with_kde_prefix"
@@ -4247,7 +4250,7 @@
42474250
42484251
42494252 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
42514254 # Check whether --enable-kdetest or --disable-kdetest was given.
42524255 if test "${enable_kdetest+set}" = set; then
42534256 enableval="$enable_kdetest"
@@ -4269,7 +4272,7 @@
42694272 # Extract the first word of "kde-config", so it can be a program name with args.
42704273 set dummy kde-config; ac_word=$2
42714274 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
42734276 if eval "test \"`echo '$''{'ac_cv_path_KDE_CONFIG'+set}'`\" = set"; then
42744277 echo $ac_n "(cached) $ac_c" 1>&6
42754278 else
@@ -4311,7 +4314,7 @@
43114314 if test "X$KDE_CONFIG" != "X"; then
43124315 min_kde_version=2.0.0
43134316 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
43154318 no_kde=""
43164319 if test "$KDE_CONFIG" = "no" ; then
43174320 no_kde=yes
@@ -4344,7 +4347,7 @@
43444347 echo $ac_n "cross compiling KDE ? ? how can i remove that ? :)"
43454348 else
43464349 cat > conftest.$ac_ext <<EOF
4347-#line 4348 "configure"
4350+#line 4351 "configure"
43484351 #include "confdefs.h"
43494352
43504353 #include <stdio.h>
@@ -4353,7 +4356,7 @@
43534356 { return 0; }
43544357
43554358 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
43574360 then
43584361 :
43594362 else
@@ -4390,7 +4393,7 @@
43904393
43914394 if test "x$KDE_PREFIX" != "x"; then
43924395 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
43944397 if test "x$ROOTQT" != "x" ; then
43954398 GUI_INC_LOC="-I$QT_INCLUDES $GUI_INC_LOC"
43964399 if test $qt_major_version -lt 2; then
@@ -4429,7 +4432,7 @@
44294432 do
44304433 for j in qstyle.h;
44314434 do
4432- echo "configure: 4433: $i/$j" >&5
4435+ echo "configure: 4436: $i/$j" >&5
44334436 if test -r "$i/$j"; then
44344437 echo "taking that" >&5
44354438 qt_incdir=$i
@@ -4447,7 +4450,7 @@
44474450 do
44484451 for j in kapplication.h;
44494452 do
4450- echo "configure: 4451: $i/$j" >&5
4453+ echo "configure: 4454: $i/$j" >&5
44514454 if test -r "$i/$j"; then
44524455 echo "taking that" >&5
44534456 kde_incdir=$i
@@ -4473,9 +4476,9 @@
44734476 ac_save_CXXFLAGS="$CXXFLAGS"
44744477 CXXFLAGS="$CXXFLAGS $GUI_INC_LOC"
44754478 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
44774480 cat > conftest.$ac_ext <<EOF
4478-#line 4479 "configure"
4481+#line 4482 "configure"
44794482 #include "confdefs.h"
44804483 #include <qapplication.h>
44814484 int main() {
@@ -4486,7 +4489,7 @@
44864489
44874490 ; return 0; }
44884491 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
44904493 rm -rf conftest*
44914494 echo "$ac_t""yes" 1>&6
44924495 else
@@ -4498,9 +4501,9 @@
44984501 rm -f conftest*
44994502
45004503 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
45024505 cat > conftest.$ac_ext <<EOF
4503-#line 4504 "configure"
4506+#line 4507 "configure"
45044507 #include "confdefs.h"
45054508 #include <kapplication.h>
45064509 int main() {
@@ -4511,7 +4514,7 @@
45114514
45124515 ; return 0; }
45134516 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
45154518 rm -rf conftest*
45164519 echo "$ac_t""yes" 1>&6
45174520 else
@@ -4557,7 +4560,7 @@
45574560
45584561 if test "x$MACOSX" = "xyes" -a -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then
45594562 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
45614564 echo "$ac_t""yes" 1>&6;
45624565 GUITYPE=CARBONGUI
45634566 SKIP_GTK=YES;
@@ -4582,7 +4585,7 @@
45824585 if test -z "$SKIP_GTK"; then
45834586
45844587 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
45864589 # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
45874590 if test "${with_gtk_prefix+set}" = set; then
45884591 withval="$with_gtk_prefix"
@@ -4593,7 +4596,7 @@
45934596
45944597
45954598 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
45974600 # Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
45984601 if test "${with_gtk_exec_prefix+set}" = set; then
45994602 withval="$with_gtk_exec_prefix"
@@ -4604,7 +4607,7 @@
46044607
46054608
46064609 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
46084611 # Check whether --enable-gtktest or --disable-gtktest was given.
46094612 if test "${enable_gtktest+set}" = set; then
46104613 enableval="$enable_gtktest"
@@ -4631,7 +4634,7 @@
46314634 # Extract the first word of "gtk-config", so it can be a program name with args.
46324635 set dummy gtk-config; ac_word=$2
46334636 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
46354638 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
46364639 echo $ac_n "(cached) $ac_c" 1>&6
46374640 else
@@ -4668,7 +4671,7 @@
46684671 # Extract the first word of "gtk12-config", so it can be a program name with args.
46694672 set dummy gtk12-config; ac_word=$2
46704673 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
46724675 if eval "test \"`echo '$''{'ac_cv_path_GTK12_CONFIG'+set}'`\" = set"; then
46734676 echo $ac_n "(cached) $ac_c" 1>&6
46744677 else
@@ -4710,7 +4713,7 @@
47104713 # Extract the first word of "pkg-config", so it can be a program name with args.
47114714 set dummy pkg-config; ac_word=$2
47124715 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
47144717 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
47154718 echo $ac_n "(cached) $ac_c" 1>&6
47164719 else
@@ -4752,7 +4755,7 @@
47524755 {
47534756 min_gtk_version=2.2.0
47544757 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
47564759 no_gtk=""
47574760 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
47584761 && $PKG_CONFIG --exists gtk+-2.0; then
@@ -4793,7 +4796,7 @@
47934796 echo $ac_n "cross compiling; assumed OK... $ac_c"
47944797 else
47954798 cat > conftest.$ac_ext <<EOF
4796-#line 4797 "configure"
4799+#line 4800 "configure"
47974800 #include "confdefs.h"
47984801
47994802 #include <gtk/gtk.h>
@@ -4825,7 +4828,7 @@
48254828 }
48264829
48274830 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
48294832 then
48304833 :
48314834 else
@@ -4883,7 +4886,7 @@
48834886 {
48844887 min_gtk_version=1.1.16
48854888 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
48874890 no_gtk=""
48884891 if (test "X$SKIP_GTK2" != "XYES" -a "X$PKG_CONFIG" != "Xno") \
48894892 && $PKG_CONFIG --exists gtk+-2.0; then
@@ -4924,7 +4927,7 @@
49244927 echo $ac_n "cross compiling; assumed OK... $ac_c"
49254928 else
49264929 cat > conftest.$ac_ext <<EOF
4927-#line 4928 "configure"
4930+#line 4931 "configure"
49284931 #include "confdefs.h"
49294932
49304933 #include <gtk/gtk.h>
@@ -4956,7 +4959,7 @@
49564959 }
49574960
49584961 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
49604963 then
49614964 :
49624965 else
@@ -5074,7 +5077,7 @@
50745077 if test "x$want_gnome" = xyes -a "0$gtk_major_version" -ge 2; then
50755078 {
50765079 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
50785081 if $PKG_CONFIG --exists libgnomeui-2.0; then
50795082 echo "$ac_t""yes" 1>&6
50805083 GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0`
@@ -5093,7 +5096,7 @@
50935096 # Extract the first word of "gnome-config", so it can be a program name with args.
50945097 set dummy gnome-config; ac_word=$2
50955098 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
50975100 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
50985101 echo $ac_n "(cached) $ac_c" 1>&6
50995102 else
@@ -5130,7 +5133,7 @@
51305133 no_gnome_config="yes"
51315134 else
51325135 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
51345137 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
51355138 echo "$ac_t""yes" 1>&6
51365139 GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome gnomeui`"
@@ -5155,7 +5158,7 @@
51555158
51565159 if test "$no_gnome_config" = "yes"; then
51575160 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
51595162 if test -f $gnome_prefix/gnomeConf.sh; then
51605163 echo "$ac_t""found" 1>&6
51615164 echo "loading gnome configuration from" \
@@ -5193,7 +5196,7 @@
51935196 GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`"
51945197
51955198 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
51975200 gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC"
51985201 GUI_INC_LOC=
51995202 for try in $gui_includes; do
@@ -5217,7 +5220,7 @@
52175220
52185221 if test -z "$SKIP_MOTIF"; then
52195222 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
52215224 # Check whether --with-motif-lib or --without-motif-lib was given.
52225225 if test "${with_motif_lib+set}" = set; then
52235226 withval="$with_motif_lib"
@@ -5234,7 +5237,7 @@
52345237 GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`"
52355238
52365239 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
52385241 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"
52395242 GUI_LIB_LOC=
52405243 for try in $gui_libs; do
@@ -5277,11 +5280,11 @@
52775280
52785281 if test -z "$SKIP_ATHENA"; then
52795282 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
52815284 cflags_save=$CFLAGS
52825285 CFLAGS="$CFLAGS $X_CFLAGS"
52835286 cat > conftest.$ac_ext <<EOF
5284-#line 5285 "configure"
5287+#line 5288 "configure"
52855288 #include "confdefs.h"
52865289
52875290 #include <X11/Intrinsic.h>
@@ -5290,7 +5293,7 @@
52905293
52915294 ; return 0; }
52925295 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
52945297 rm -rf conftest*
52955298 echo "$ac_t""yes" 1>&6
52965299 else
@@ -5309,11 +5312,11 @@
53095312
53105313 if test -z "$SKIP_NEXTAW"; then
53115314 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
53135316 cflags_save=$CFLAGS
53145317 CFLAGS="$CFLAGS $X_CFLAGS"
53155318 cat > conftest.$ac_ext <<EOF
5316-#line 5317 "configure"
5319+#line 5320 "configure"
53175320 #include "confdefs.h"
53185321
53195322 #include <X11/Intrinsic.h>
@@ -5322,7 +5325,7 @@
53225325
53235326 ; return 0; }
53245327 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
53265329 rm -rf conftest*
53275330 echo "$ac_t""yes" 1>&6
53285331 else
@@ -5350,7 +5353,7 @@
53505353 ldflags_save=$LDFLAGS
53515354 LDFLAGS="$X_LIBS $LDFLAGS"
53525355 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
53545357 ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
53555358 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53565359 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5358,7 +5361,7 @@
53585361 ac_save_LIBS="$LIBS"
53595362 LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
53605363 cat > conftest.$ac_ext <<EOF
5361-#line 5362 "configure"
5364+#line 5365 "configure"
53625365 #include "confdefs.h"
53635366 /* Override any gcc2 internal prototype to avoid an error. */
53645367 /* We use char because int might match the return type of a gcc2
@@ -5369,7 +5372,7 @@
53695372 XShapeQueryExtension()
53705373 ; return 0; }
53715374 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
53735376 rm -rf conftest*
53745377 eval "ac_cv_lib_$ac_lib_var=yes"
53755378 else
@@ -5390,7 +5393,7 @@
53905393 fi
53915394
53925395 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
53945397 ac_lib_var=`echo w'_'wslen | sed 'y%./+-%__p_%'`
53955398 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
53965399 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5398,7 +5401,7 @@
53985401 ac_save_LIBS="$LIBS"
53995402 LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
54005403 cat > conftest.$ac_ext <<EOF
5401-#line 5402 "configure"
5404+#line 5405 "configure"
54025405 #include "confdefs.h"
54035406 /* Override any gcc2 internal prototype to avoid an error. */
54045407 /* We use char because int might match the return type of a gcc2
@@ -5409,7 +5412,7 @@
54095412 wslen()
54105413 ; return 0; }
54115414 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
54135416 rm -rf conftest*
54145417 eval "ac_cv_lib_$ac_lib_var=yes"
54155418 else
@@ -5430,7 +5433,7 @@
54305433 fi
54315434
54325435 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
54345437 ac_lib_var=`echo dl'_'dlsym | sed 'y%./+-%__p_%'`
54355438 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
54365439 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5438,7 +5441,7 @@
54385441 ac_save_LIBS="$LIBS"
54395442 LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
54405443 cat > conftest.$ac_ext <<EOF
5441-#line 5442 "configure"
5444+#line 5445 "configure"
54425445 #include "confdefs.h"
54435446 /* Override any gcc2 internal prototype to avoid an error. */
54445447 /* We use char because int might match the return type of a gcc2
@@ -5449,7 +5452,7 @@
54495452 dlsym()
54505453 ; return 0; }
54515454 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
54535456 rm -rf conftest*
54545457 eval "ac_cv_lib_$ac_lib_var=yes"
54555458 else
@@ -5470,7 +5473,7 @@
54705473 fi
54715474
54725475 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
54745477 ac_lib_var=`echo Xmu'_'XmuCreateStippledPixmap | sed 'y%./+-%__p_%'`
54755478 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
54765479 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5478,7 +5481,7 @@
54785481 ac_save_LIBS="$LIBS"
54795482 LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
54805483 cat > conftest.$ac_ext <<EOF
5481-#line 5482 "configure"
5484+#line 5485 "configure"
54825485 #include "confdefs.h"
54835486 /* Override any gcc2 internal prototype to avoid an error. */
54845487 /* We use char because int might match the return type of a gcc2
@@ -5489,7 +5492,7 @@
54895492 XmuCreateStippledPixmap()
54905493 ; return 0; }
54915494 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
54935496 rm -rf conftest*
54945497 eval "ac_cv_lib_$ac_lib_var=yes"
54955498 else
@@ -5511,7 +5514,7 @@
55115514
55125515 if test -z "$SKIP_MOTIF"; then
55135516 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
55155518 ac_lib_var=`echo Xp'_'XpEndJob | sed 'y%./+-%__p_%'`
55165519 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
55175520 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5519,7 +5522,7 @@
55195522 ac_save_LIBS="$LIBS"
55205523 LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
55215524 cat > conftest.$ac_ext <<EOF
5522-#line 5523 "configure"
5525+#line 5526 "configure"
55235526 #include "confdefs.h"
55245527 /* Override any gcc2 internal prototype to avoid an error. */
55255528 /* We use char because int might match the return type of a gcc2
@@ -5530,7 +5533,7 @@
55305533 XpEndJob()
55315534 ; return 0; }
55325535 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
55345537 rm -rf conftest*
55355538 eval "ac_cv_lib_$ac_lib_var=yes"
55365539 else
@@ -5554,7 +5557,7 @@
55545557 LDFLAGS=$ldflags_save
55555558
55565559 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
55585561 NARROW_PROTO=
55595562 rm -fr conftestdir
55605563 if mkdir conftestdir; then
@@ -5584,17 +5587,17 @@
55845587 do
55855588 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
55865589 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
55885591 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
55895592 echo $ac_n "(cached) $ac_c" 1>&6
55905593 else
55915594 cat > conftest.$ac_ext <<EOF
5592-#line 5593 "configure"
5595+#line 5596 "configure"
55935596 #include "confdefs.h"
55945597 #include <$ac_hdr>
55955598 EOF
55965599 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; }
55985601 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
55995602 if test -z "$ac_err"; then
56005603 rm -rf conftest*
@@ -5631,17 +5634,17 @@
56315634 do
56325635 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
56335636 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
56355638 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
56365639 echo $ac_n "(cached) $ac_c" 1>&6
56375640 else
56385641 cat > conftest.$ac_ext <<EOF
5639-#line 5640 "configure"
5642+#line 5643 "configure"
56405643 #include "confdefs.h"
56415644 #include <$ac_hdr>
56425645 EOF
56435646 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; }
56455648 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
56465649 if test -z "$ac_err"; then
56475650 rm -rf conftest*
@@ -5670,9 +5673,9 @@
56705673
56715674 if test ! "$enable_xim" = "no"; then
56725675 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
56745677 cat > conftest.$ac_ext <<EOF
5675-#line 5676 "configure"
5678+#line 5679 "configure"
56765679 #include "confdefs.h"
56775680 #include <X11/Xlib.h>
56785681 EOF
@@ -5703,17 +5706,17 @@
57035706 do
57045707 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
57055708 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
57075710 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
57085711 echo $ac_n "(cached) $ac_c" 1>&6
57095712 else
57105713 cat > conftest.$ac_ext <<EOF
5711-#line 5712 "configure"
5714+#line 5715 "configure"
57125715 #include "confdefs.h"
57135716 #include <$ac_hdr>
57145717 EOF
57155718 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; }
57175720 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57185721 if test -z "$ac_err"; then
57195722 rm -rf conftest*
@@ -5749,17 +5752,17 @@
57495752 do
57505753 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
57515754 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
57535756 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
57545757 echo $ac_n "(cached) $ac_c" 1>&6
57555758 else
57565759 cat > conftest.$ac_ext <<EOF
5757-#line 5758 "configure"
5760+#line 5761 "configure"
57585761 #include "confdefs.h"
57595762 #include <$ac_hdr>
57605763 EOF
57615764 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; }
57635766 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
57645767 if test -z "$ac_err"; then
57655768 rm -rf conftest*
@@ -5852,17 +5855,17 @@
58525855
58535856
58545857 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
58565859 if test "$cross_compiling" = yes; then
58575860 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
58585861 else
58595862 cat > conftest.$ac_ext <<EOF
5860-#line 5861 "configure"
5863+#line 5864 "configure"
58615864 #include "confdefs.h"
58625865 #include <ctype.h>
58635866 main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); }
58645867 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
58665869 then
58675870 cat >> confdefs.h <<\EOF
58685871 #define BROKEN_TOUPPER 1
@@ -5879,16 +5882,16 @@
58795882
58805883
58815884 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
58835886 cat > conftest.$ac_ext <<EOF
5884-#line 5885 "configure"
5887+#line 5888 "configure"
58855888 #include "confdefs.h"
58865889
58875890 int main() {
58885891 printf("(" __DATE__ " " __TIME__ ")");
58895892 ; return 0; }
58905893 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
58925895 rm -rf conftest*
58935896 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
58945897 #define HAVE_DATE_TIME 1
@@ -5904,17 +5907,17 @@
59045907
59055908 ac_safe=`echo "elf.h" | sed 'y%./+-%__p_%'`
59065909 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
59085911 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
59095912 echo $ac_n "(cached) $ac_c" 1>&6
59105913 else
59115914 cat > conftest.$ac_ext <<EOF
5912-#line 5913 "configure"
5915+#line 5916 "configure"
59135916 #include "confdefs.h"
59145917 #include <elf.h>
59155918 EOF
59165919 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; }
59185921 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
59195922 if test -z "$ac_err"; then
59205923 rm -rf conftest*
@@ -5937,7 +5940,7 @@
59375940
59385941 if test "$HAS_ELF" = 1; then
59395942 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
59415944 ac_lib_var=`echo elf'_'main | sed 'y%./+-%__p_%'`
59425945 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
59435946 echo $ac_n "(cached) $ac_c" 1>&6
@@ -5945,14 +5948,14 @@
59455948 ac_save_LIBS="$LIBS"
59465949 LIBS="-lelf $LIBS"
59475950 cat > conftest.$ac_ext <<EOF
5948-#line 5949 "configure"
5951+#line 5952 "configure"
59495952 #include "confdefs.h"
59505953
59515954 int main() {
59525955 main()
59535956 ; return 0; }
59545957 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
59565959 rm -rf conftest*
59575960 eval "ac_cv_lib_$ac_lib_var=yes"
59585961 else
@@ -5986,12 +5989,12 @@
59865989 do
59875990 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
59885991 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
59905993 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
59915994 echo $ac_n "(cached) $ac_c" 1>&6
59925995 else
59935996 cat > conftest.$ac_ext <<EOF
5994-#line 5995 "configure"
5997+#line 5998 "configure"
59955998 #include "confdefs.h"
59965999 #include <sys/types.h>
59976000 #include <$ac_hdr>
@@ -5999,7 +6002,7 @@
59996002 DIR *dirp = 0;
60006003 ; return 0; }
60016004 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
60036006 rm -rf conftest*
60046007 eval "ac_cv_header_dirent_$ac_safe=yes"
60056008 else
@@ -6024,7 +6027,7 @@
60246027 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
60256028 if test $ac_header_dirent = dirent.h; then
60266029 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
60286031 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
60296032 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60306033 echo $ac_n "(cached) $ac_c" 1>&6
@@ -6032,7 +6035,7 @@
60326035 ac_save_LIBS="$LIBS"
60336036 LIBS="-ldir $LIBS"
60346037 cat > conftest.$ac_ext <<EOF
6035-#line 6036 "configure"
6038+#line 6039 "configure"
60366039 #include "confdefs.h"
60376040 /* Override any gcc2 internal prototype to avoid an error. */
60386041 /* We use char because int might match the return type of a gcc2
@@ -6043,7 +6046,7 @@
60436046 opendir()
60446047 ; return 0; }
60456048 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
60476050 rm -rf conftest*
60486051 eval "ac_cv_lib_$ac_lib_var=yes"
60496052 else
@@ -6065,7 +6068,7 @@
60656068
60666069 else
60676070 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
60696072 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
60706073 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
60716074 echo $ac_n "(cached) $ac_c" 1>&6
@@ -6073,7 +6076,7 @@
60736076 ac_save_LIBS="$LIBS"
60746077 LIBS="-lx $LIBS"
60756078 cat > conftest.$ac_ext <<EOF
6076-#line 6077 "configure"
6079+#line 6080 "configure"
60776080 #include "confdefs.h"
60786081 /* Override any gcc2 internal prototype to avoid an error. */
60796082 /* We use char because int might match the return type of a gcc2
@@ -6084,7 +6087,7 @@
60846087 opendir()
60856088 ; return 0; }
60866089 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
60886091 rm -rf conftest*
60896092 eval "ac_cv_lib_$ac_lib_var=yes"
60906093 else
@@ -6108,12 +6111,12 @@
61086111
61096112
61106113 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
61126115 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
61136116 echo $ac_n "(cached) $ac_c" 1>&6
61146117 else
61156118 cat > conftest.$ac_ext <<EOF
6116-#line 6117 "configure"
6119+#line 6120 "configure"
61176120 #include "confdefs.h"
61186121 #include <stdlib.h>
61196122 #include <stdarg.h>
@@ -6121,7 +6124,7 @@
61216124 #include <float.h>
61226125 EOF
61236126 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; }
61256128 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
61266129 if test -z "$ac_err"; then
61276130 rm -rf conftest*
@@ -6138,7 +6141,7 @@
61386141 if test $ac_cv_header_stdc = yes; then
61396142 # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
61406143 cat > conftest.$ac_ext <<EOF
6141-#line 6142 "configure"
6144+#line 6145 "configure"
61426145 #include "confdefs.h"
61436146 #include <string.h>
61446147 EOF
@@ -6156,7 +6159,7 @@
61566159 if test $ac_cv_header_stdc = yes; then
61576160 # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
61586161 cat > conftest.$ac_ext <<EOF
6159-#line 6160 "configure"
6162+#line 6163 "configure"
61606163 #include "confdefs.h"
61616164 #include <stdlib.h>
61626165 EOF
@@ -6177,7 +6180,7 @@
61776180 :
61786181 else
61796182 cat > conftest.$ac_ext <<EOF
6180-#line 6181 "configure"
6183+#line 6184 "configure"
61816184 #include "confdefs.h"
61826185 #include <ctype.h>
61836186 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -6188,7 +6191,7 @@
61886191 exit (0); }
61896192
61906193 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
61926195 then
61936196 :
61946197 else
@@ -6212,12 +6215,12 @@
62126215 fi
62136216
62146217 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
62166219 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
62176220 echo $ac_n "(cached) $ac_c" 1>&6
62186221 else
62196222 cat > conftest.$ac_ext <<EOF
6220-#line 6221 "configure"
6223+#line 6224 "configure"
62216224 #include "confdefs.h"
62226225 #include <sys/types.h>
62236226 #include <sys/wait.h>
@@ -6233,7 +6236,7 @@
62336236 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
62346237 ; return 0; }
62356238 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
62376240 rm -rf conftest*
62386241 ac_cv_header_sys_wait_h=yes
62396242 else
@@ -6256,16 +6259,16 @@
62566259
62576260 if test $ac_cv_header_sys_wait_h = no; then
62586261 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
62606263 cat > conftest.$ac_ext <<EOF
6261-#line 6262 "configure"
6264+#line 6265 "configure"
62626265 #include "confdefs.h"
62636266 #include <sys/wait.h>
62646267 int main() {
62656268 union wait xx, yy; xx = yy
62666269 ; return 0; }
62676270 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
62696272 rm -rf conftest*
62706273 echo "$ac_t""yes" 1>&6
62716274 cat >> confdefs.h <<\EOF
@@ -6296,17 +6299,17 @@
62966299 do
62976300 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
62986301 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
63006303 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63016304 echo $ac_n "(cached) $ac_c" 1>&6
63026305 else
63036306 cat > conftest.$ac_ext <<EOF
6304-#line 6305 "configure"
6307+#line 6308 "configure"
63056308 #include "confdefs.h"
63066309 #include <$ac_hdr>
63076310 EOF
63086311 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; }
63106313 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63116314 if test -z "$ac_err"; then
63126315 rm -rf conftest*
@@ -6338,17 +6341,17 @@
63386341 do
63396342 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
63406343 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
63426345 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
63436346 echo $ac_n "(cached) $ac_c" 1>&6
63446347 else
63456348 cat > conftest.$ac_ext <<EOF
6346-#line 6347 "configure"
6349+#line 6350 "configure"
63476350 #include "confdefs.h"
63486351 #include <$ac_hdr>
63496352 EOF
63506353 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; }
63526355 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
63536356 if test -z "$ac_err"; then
63546357 rm -rf conftest*
@@ -6377,11 +6380,11 @@
63776380 fi
63786381
63796382 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
63816384 cppflags_save=$CPPFLAGS
63826385 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
63836386 cat > conftest.$ac_ext <<EOF
6384-#line 6385 "configure"
6387+#line 6388 "configure"
63856388 #include "confdefs.h"
63866389
63876390 #if defined(_AIX) && !defined(_AIX51) && !defined(_NO_PROTO)
@@ -6402,7 +6405,7 @@
64026405 int i; i = 0;
64036406 ; return 0; }
64046407 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
64066409 rm -rf conftest*
64076410 echo "$ac_t""yes" 1>&6
64086411 else
@@ -6420,13 +6423,13 @@
64206423
64216424 if test $ac_cv_prog_gcc = yes; then
64226425 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
64246427 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
64256428 echo $ac_n "(cached) $ac_c" 1>&6
64266429 else
64276430 ac_pattern="Autoconf.*'x'"
64286431 cat > conftest.$ac_ext <<EOF
6429-#line 6430 "configure"
6432+#line 6433 "configure"
64306433 #include "confdefs.h"
64316434 #include <sgtty.h>
64326435 Autoconf TIOCGETP
@@ -6444,7 +6447,7 @@
64446447
64456448 if test $ac_cv_prog_gcc_traditional = no; then
64466449 cat > conftest.$ac_ext <<EOF
6447-#line 6448 "configure"
6450+#line 6451 "configure"
64486451 #include "confdefs.h"
64496452 #include <termio.h>
64506453 Autoconf TCGETA
@@ -6466,12 +6469,12 @@
64666469 fi
64676470
64686471 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
64706473 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
64716474 echo $ac_n "(cached) $ac_c" 1>&6
64726475 else
64736476 cat > conftest.$ac_ext <<EOF
6474-#line 6475 "configure"
6477+#line 6478 "configure"
64756478 #include "confdefs.h"
64766479
64776480 int main() {
@@ -6520,7 +6523,7 @@
65206523
65216524 ; return 0; }
65226525 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
65246527 rm -rf conftest*
65256528 ac_cv_c_const=yes
65266529 else
@@ -6541,12 +6544,12 @@
65416544 fi
65426545
65436546 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
65456548 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
65466549 echo $ac_n "(cached) $ac_c" 1>&6
65476550 else
65486551 cat > conftest.$ac_ext <<EOF
6549-#line 6550 "configure"
6552+#line 6553 "configure"
65506553 #include "confdefs.h"
65516554 #include <sys/types.h>
65526555 #if STDC_HEADERS
@@ -6574,12 +6577,12 @@
65746577 fi
65756578
65766579 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
65786581 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
65796582 echo $ac_n "(cached) $ac_c" 1>&6
65806583 else
65816584 cat > conftest.$ac_ext <<EOF
6582-#line 6583 "configure"
6585+#line 6586 "configure"
65836586 #include "confdefs.h"
65846587 #include <sys/types.h>
65856588 #if STDC_HEADERS
@@ -6607,12 +6610,12 @@
66076610 fi
66086611
66096612 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
66116614 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
66126615 echo $ac_n "(cached) $ac_c" 1>&6
66136616 else
66146617 cat > conftest.$ac_ext <<EOF
6615-#line 6616 "configure"
6618+#line 6619 "configure"
66166619 #include "confdefs.h"
66176620 #include <sys/types.h>
66186621 #if STDC_HEADERS
@@ -6640,12 +6643,12 @@
66406643 fi
66416644
66426645 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
66446647 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
66456648 echo $ac_n "(cached) $ac_c" 1>&6
66466649 else
66476650 cat > conftest.$ac_ext <<EOF
6648-#line 6649 "configure"
6651+#line 6652 "configure"
66496652 #include "confdefs.h"
66506653 #include <sys/types.h>
66516654 #if STDC_HEADERS
@@ -6673,12 +6676,12 @@
66736676 fi
66746677
66756678 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
66776680 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
66786681 echo $ac_n "(cached) $ac_c" 1>&6
66796682 else
66806683 cat > conftest.$ac_ext <<EOF
6681-#line 6682 "configure"
6684+#line 6685 "configure"
66826685 #include "confdefs.h"
66836686 #include <sys/types.h>
66846687 EOF
@@ -6707,12 +6710,12 @@
67076710 fi
67086711
67096712 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
67116714 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
67126715 echo $ac_n "(cached) $ac_c" 1>&6
67136716 else
67146717 cat > conftest.$ac_ext <<EOF
6715-#line 6716 "configure"
6718+#line 6719 "configure"
67166719 #include "confdefs.h"
67176720 #include <sys/types.h>
67186721 #include <sys/time.h>
@@ -6721,7 +6724,7 @@
67216724 struct tm *tp;
67226725 ; return 0; }
67236726 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
67256728 rm -rf conftest*
67266729 ac_cv_header_time=yes
67276730 else
@@ -6742,12 +6745,12 @@
67426745 fi
67436746
67446747 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
67466749 if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
67476750 echo $ac_n "(cached) $ac_c" 1>&6
67486751 else
67496752 cat > conftest.$ac_ext <<EOF
6750-#line 6751 "configure"
6753+#line 6754 "configure"
67516754 #include "confdefs.h"
67526755 #include <sys/types.h>
67536756 #if STDC_HEADERS
@@ -6775,12 +6778,12 @@
67756778 fi
67766779
67776780 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
67796782 if eval "test \"`echo '$''{'ac_cv_type_dev_t'+set}'`\" = set"; then
67806783 echo $ac_n "(cached) $ac_c" 1>&6
67816784 else
67826785 cat > conftest.$ac_ext <<EOF
6783-#line 6784 "configure"
6786+#line 6787 "configure"
67846787 #include "confdefs.h"
67856788 #include <sys/types.h>
67866789 #if STDC_HEADERS
@@ -6809,12 +6812,12 @@
68096812
68106813
68116814 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
68136816 if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then
68146817 echo "$ac_t""(cached) $ac_cv_type_rlim_t" 1>&6
68156818 else
68166819 cat > conftest.$ac_ext <<EOF
6817-#line 6818 "configure"
6820+#line 6821 "configure"
68186821 #include "confdefs.h"
68196822
68206823 #include <sys/types.h>
@@ -6846,12 +6849,12 @@
68466849 fi
68476850
68486851 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
68506853 if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then
68516854 echo "$ac_t""(cached) $ac_cv_type_stack_t" 1>&6
68526855 else
68536856 cat > conftest.$ac_ext <<EOF
6854-#line 6855 "configure"
6857+#line 6858 "configure"
68556858 #include "confdefs.h"
68566859
68576860 #include <sys/types.h>
@@ -6881,9 +6884,9 @@
68816884 fi
68826885
68836886 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
68856888 cat > conftest.$ac_ext <<EOF
6886-#line 6887 "configure"
6889+#line 6890 "configure"
68876890 #include "confdefs.h"
68886891
68896892 #include <sys/types.h>
@@ -6898,7 +6901,7 @@
68986901 stack_t sigstk; sigstk.ss_base = 0;
68996902 ; return 0; }
69006903 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
69026905 rm -rf conftest*
69036906 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
69046907 #define HAVE_SS_BASE 1
@@ -6914,7 +6917,7 @@
69146917
69156918 olibs="$LIBS"
69166919 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
69186921 # Check whether --with-tlib or --without-tlib was given.
69196922 if test "${with_tlib+set}" = set; then
69206923 withval="$with_tlib"
@@ -6932,7 +6935,7 @@
69326935 esac
69336936 for libname in $tlibs; do
69346937 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
69366939 ac_lib_var=`echo ${libname}'_'tgetent | sed 'y%./+-%__p_%'`
69376940 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
69386941 echo $ac_n "(cached) $ac_c" 1>&6
@@ -6940,7 +6943,7 @@
69406943 ac_save_LIBS="$LIBS"
69416944 LIBS="-l${libname} $LIBS"
69426945 cat > conftest.$ac_ext <<EOF
6943-#line 6944 "configure"
6946+#line 6947 "configure"
69446947 #include "confdefs.h"
69456948 /* Override any gcc2 internal prototype to avoid an error. */
69466949 /* We use char because int might match the return type of a gcc2
@@ -6951,7 +6954,7 @@
69516954 tgetent()
69526955 ; return 0; }
69536956 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
69556958 rm -rf conftest*
69566959 eval "ac_cv_lib_$ac_lib_var=yes"
69576960 else
@@ -6983,7 +6986,7 @@
69836986 res="FAIL"
69846987 else
69856988 cat > conftest.$ac_ext <<EOF
6986-#line 6987 "configure"
6989+#line 6990 "configure"
69876990 #include "confdefs.h"
69886991
69896992 #ifdef HAVE_TERMCAP_H
@@ -6991,7 +6994,7 @@
69916994 #endif
69926995 main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }
69936996 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
69956998 then
69966999 res="OK"
69977000 else
@@ -7013,12 +7016,12 @@
70137016 fi
70147017 if test "x$olibs" != "x$LIBS"; then
70157018 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
70177020 if test "$cross_compiling" = yes; then
70187021 { echo "configure: error: failed to compile test program." 1>&2; exit 1; }
70197022 else
70207023 cat > conftest.$ac_ext <<EOF
7021-#line 7022 "configure"
7024+#line 7025 "configure"
70227025 #include "confdefs.h"
70237026
70247027 #ifdef HAVE_TERMCAP_H
@@ -7027,7 +7030,7 @@
70277030 main()
70287031 {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); }
70297032 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
70317034 then
70327035 echo "$ac_t""no -- we are in termcap land" 1>&6
70337036 else
@@ -7048,12 +7051,12 @@
70487051
70497052 if test "x$olibs" != "x$LIBS"; then
70507053 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
70527055 if test "$cross_compiling" = yes; then
70537056 { echo "configure: error: failed to compile test program." 1>&2; exit 1; }
70547057 else
70557058 cat > conftest.$ac_ext <<EOF
7056-#line 7057 "configure"
7059+#line 7060 "configure"
70577060 #include "confdefs.h"
70587061
70597062 #ifdef HAVE_TERMCAP_H
@@ -7062,7 +7065,7 @@
70627065 main()
70637066 {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); }
70647067 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
70667069 then
70677070 echo "$ac_t""zero" 1>&6; cat >> confdefs.h <<\EOF
70687071 #define TGETENT_ZERO_ERR 0
@@ -7080,9 +7083,9 @@
70807083 fi
70817084
70827085 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
70847087 cat > conftest.$ac_ext <<EOF
7085-#line 7086 "configure"
7088+#line 7089 "configure"
70867089 #include "confdefs.h"
70877090
70887091 #ifdef HAVE_TERMCAP_H
@@ -7093,7 +7096,7 @@
70937096 ospeed = 20000
70947097 ; return 0; }
70957098 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
70977100 rm -rf conftest*
70987101 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
70997102 #define HAVE_OSPEED 1
@@ -7105,9 +7108,9 @@
71057108 rm -rf conftest*
71067109 echo "$ac_t""no" 1>&6
71077110 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
71097112 cat > conftest.$ac_ext <<EOF
7110-#line 7111 "configure"
7113+#line 7114 "configure"
71117114 #include "confdefs.h"
71127115
71137116 #ifdef HAVE_TERMCAP_H
@@ -7119,7 +7122,7 @@
71197122 ospeed = 20000
71207123 ; return 0; }
71217124 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
71237126 rm -rf conftest*
71247127 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
71257128 #define OSPEED_EXTERN 1
@@ -7137,9 +7140,9 @@
71377140 rm -f conftest*
71387141
71397142 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
71417144 cat > conftest.$ac_ext <<EOF
7142-#line 7143 "configure"
7145+#line 7146 "configure"
71437146 #include "confdefs.h"
71447147
71457148 #ifdef HAVE_TERMCAP_H
@@ -7150,7 +7153,7 @@
71507153 if (UP == 0 && BC == 0) PC = 1
71517154 ; return 0; }
71527155 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
71547157 rm -rf conftest*
71557158 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
71567159 #define HAVE_UP_BC_PC 1
@@ -7162,9 +7165,9 @@
71627165 rm -rf conftest*
71637166 echo "$ac_t""no" 1>&6
71647167 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
71667169 cat > conftest.$ac_ext <<EOF
7167-#line 7168 "configure"
7170+#line 7171 "configure"
71687171 #include "confdefs.h"
71697172
71707173 #ifdef HAVE_TERMCAP_H
@@ -7176,7 +7179,7 @@
71767179 if (UP == 0 && BC == 0) PC = 1
71777180 ; return 0; }
71787181 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
71807183 rm -rf conftest*
71817184 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
71827185 #define UP_BC_PC_EXTERN 1
@@ -7194,9 +7197,9 @@
71947197 rm -f conftest*
71957198
71967199 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
71987201 cat > conftest.$ac_ext <<EOF
7199-#line 7200 "configure"
7202+#line 7203 "configure"
72007203 #include "confdefs.h"
72017204
72027205 #ifdef HAVE_TERMCAP_H
@@ -7207,7 +7210,7 @@
72077210 extern int xx(); tputs("test", 1, (outfuntype)xx)
72087211 ; return 0; }
72097212 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
72117214 rm -rf conftest*
72127215 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
72137216 #define HAVE_OUTFUNTYPE 1
@@ -7222,9 +7225,9 @@
72227225 rm -f conftest*
72237226
72247227 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
72267229 cat > conftest.$ac_ext <<EOF
7227-#line 7228 "configure"
7230+#line 7231 "configure"
72287231 #include "confdefs.h"
72297232
72307233 #include <sys/types.h>
@@ -7234,7 +7237,7 @@
72347237
72357238 ; return 0; }
72367239 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
72387241 rm -rf conftest*
72397242 echo "$ac_t""yes" 1>&6
72407243 cat >> confdefs.h <<\EOF
@@ -7251,7 +7254,7 @@
72517254
72527255
72537256 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
72557258 if test -r /dev/ptc; then
72567259 cat >> confdefs.h <<\EOF
72577260 #define HAVE_DEV_PTC 1
@@ -7263,17 +7266,17 @@
72637266 fi
72647267
72657268 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
72677270 if test -c /dev/ptmx ; then
72687271 cat > conftest.$ac_ext <<EOF
7269-#line 7270 "configure"
7272+#line 7273 "configure"
72707273 #include "confdefs.h"
72717274
72727275 int main() {
72737276 ptsname(0);grantpt(0);unlockpt(0);
72747277 ; return 0; }
72757278 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
72777280 rm -rf conftest*
72787281 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
72797282 #define HAVE_SVR4_PTYS 1
@@ -7291,14 +7294,14 @@
72917294 fi
72927295
72937296 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
72957298 if test -d /dev/ptym ; then
72967299 pdir='/dev/ptym'
72977300 else
72987301 pdir='/dev'
72997302 fi
73007303 cat > conftest.$ac_ext <<EOF
7301-#line 7302 "configure"
7304+#line 7305 "configure"
73027305 #include "confdefs.h"
73037306 #ifdef M_UNIX
73047307 yes;
@@ -7332,13 +7335,13 @@
73327335 fi
73337336
73347337 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
73367339 rm -f conftest_grp
73377340 if test "$cross_compiling" = yes; then
73387341 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
73397342 else
73407343 cat > conftest.$ac_ext <<EOF
7341-#line 7342 "configure"
7344+#line 7345 "configure"
73427345 #include "confdefs.h"
73437346
73447347 #include <sys/types.h>
@@ -7370,7 +7373,7 @@
73707373 }
73717374
73727375 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
73747377 then
73757378
73767379 if test -f conftest_grp; then
@@ -7401,12 +7404,12 @@
74017404
74027405
74037406 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
74057408 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
74067409 echo $ac_n "(cached) $ac_c" 1>&6
74077410 else
74087411 cat > conftest.$ac_ext <<EOF
7409-#line 7410 "configure"
7412+#line 7413 "configure"
74107413 #include "confdefs.h"
74117414 #include <sys/types.h>
74127415 #include <signal.h>
@@ -7423,7 +7426,7 @@
74237426 int i;
74247427 ; return 0; }
74257428 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
74277430 rm -rf conftest*
74287431 ac_cv_type_signal=void
74297432 else
@@ -7455,9 +7458,9 @@
74557458 fi
74567459
74577460 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
74597462 cat > conftest.$ac_ext <<EOF
7460-#line 7461 "configure"
7463+#line 7464 "configure"
74617464 #include "confdefs.h"
74627465
74637466 #include <signal.h>
@@ -7471,7 +7474,7 @@
74717474
74727475 ; return 0; }
74737476 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
74757478 rm -rf conftest*
74767479 echo "$ac_t""yes" 1>&6
74777480 cat >> confdefs.h <<\EOF
@@ -7487,12 +7490,12 @@
74877490 rm -f conftest*
74887491
74897492 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
74917494 if test "$cross_compiling" = yes; then
74927495 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
74937496 else
74947497 cat > conftest.$ac_ext <<EOF
7495-#line 7496 "configure"
7498+#line 7499 "configure"
74967499 #include "confdefs.h"
74977500
74987501 char *dagger[] = { "IFS=pwd", 0 };
@@ -7504,7 +7507,7 @@
75047507 return getcwd(buffer, 500) ? 0 : 1;
75057508 }
75067509 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
75087511 then
75097512 echo "$ac_t""it is usable" 1>&6
75107513 else
@@ -7529,12 +7532,12 @@
75297532 strnicmp strpbrk strtol tgetent towlower towupper usleep utime utimes
75307533 do
75317534 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
75337536 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
75347537 echo $ac_n "(cached) $ac_c" 1>&6
75357538 else
75367539 cat > conftest.$ac_ext <<EOF
7537-#line 7538 "configure"
7540+#line 7541 "configure"
75387541 #include "confdefs.h"
75397542 /* System header to define __stub macros and hopefully few prototypes,
75407543 which can conflict with char $ac_func(); below. */
@@ -7557,7 +7560,7 @@
75577560
75587561 ; return 0; }
75597562 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
75617564 rm -rf conftest*
75627565 eval "ac_cv_func_$ac_func=yes"
75637566 else
@@ -7583,9 +7586,9 @@
75837586
75847587
75857588 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
75877590 cat > conftest.$ac_ext <<EOF
7588-#line 7589 "configure"
7591+#line 7592 "configure"
75897592 #include "confdefs.h"
75907593 #include <sys/types.h>
75917594 #include <sys/stat.h>
@@ -7597,7 +7600,7 @@
75977600 n = (int)st.st_blksize;
75987601 ; return 0; }
75997602 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
76017604 rm -rf conftest*
76027605 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
76037606 #define HAVE_ST_BLKSIZE 1
@@ -7612,18 +7615,18 @@
76127615 rm -f conftest*
76137616
76147617 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
76167619 if test "$cross_compiling" = yes; then
76177620 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
76187621 else
76197622 cat > conftest.$ac_ext <<EOF
7620-#line 7621 "configure"
7623+#line 7624 "configure"
76217624 #include "confdefs.h"
76227625 #include <sys/types.h>
76237626 #include <sys/stat.h>
76247627 main() {struct stat st; exit(stat("configure/", &st) != 0); }
76257628 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
76277630 then
76287631 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
76297632 #define STAT_IGNORES_SLASH 1
@@ -7640,11 +7643,11 @@
76407643
76417644
76427645 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
76447647 save_LIBS="$LIBS"
76457648 LIBS="$LIBS -liconv"
76467649 cat > conftest.$ac_ext <<EOF
7647-#line 7648 "configure"
7650+#line 7651 "configure"
76487651 #include "confdefs.h"
76497652
76507653 #ifdef HAVE_ICONV_H
@@ -7655,7 +7658,7 @@
76557658 iconv_open("fr", "to");
76567659 ; return 0; }
76577660 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
76597662 rm -rf conftest*
76607663 echo "$ac_t""yes; with -liconv" 1>&6; cat >> confdefs.h <<\EOF
76617664 #define HAVE_ICONV 1
@@ -7667,7 +7670,7 @@
76677670 rm -rf conftest*
76687671 LIBS="$save_LIBS"
76697672 cat > conftest.$ac_ext <<EOF
7670-#line 7671 "configure"
7673+#line 7674 "configure"
76717674 #include "confdefs.h"
76727675
76737676 #ifdef HAVE_ICONV_H
@@ -7678,7 +7681,7 @@
76787681 iconv_open("fr", "to");
76797682 ; return 0; }
76807683 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
76827685 rm -rf conftest*
76837686 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
76847687 #define HAVE_ICONV 1
@@ -7696,9 +7699,9 @@
76967699
76977700
76987701 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
77007703 cat > conftest.$ac_ext <<EOF
7701-#line 7702 "configure"
7704+#line 7705 "configure"
77027705 #include "confdefs.h"
77037706
77047707 #ifdef HAVE_LANGINFO_H
@@ -7709,7 +7712,7 @@
77097712 char *cs = nl_langinfo(CODESET);
77107713 ; return 0; }
77117714 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
77137716 rm -rf conftest*
77147717 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
77157718 #define HAVE_NL_LANGINFO_CODESET 1
@@ -7724,7 +7727,7 @@
77247727 rm -f conftest*
77257728
77267729 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
77287731 # Check whether --enable-acl or --disable-acl was given.
77297732 if test "${enable_acl+set}" = set; then
77307733 enableval="$enable_acl"
@@ -7736,7 +7739,7 @@
77367739 if test "$enable_acl" = "yes"; then
77377740 echo "$ac_t""no" 1>&6
77387741 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
77407743 ac_lib_var=`echo posix1e'_'acl_get_file | sed 'y%./+-%__p_%'`
77417744 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
77427745 echo $ac_n "(cached) $ac_c" 1>&6
@@ -7744,7 +7747,7 @@
77447747 ac_save_LIBS="$LIBS"
77457748 LIBS="-lposix1e $LIBS"
77467749 cat > conftest.$ac_ext <<EOF
7747-#line 7748 "configure"
7750+#line 7751 "configure"
77487751 #include "confdefs.h"
77497752 /* Override any gcc2 internal prototype to avoid an error. */
77507753 /* We use char because int might match the return type of a gcc2
@@ -7755,7 +7758,7 @@
77557758 acl_get_file()
77567759 ; return 0; }
77577760 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
77597762 rm -rf conftest*
77607763 eval "ac_cv_lib_$ac_lib_var=yes"
77617764 else
@@ -7774,7 +7777,7 @@
77747777 else
77757778 echo "$ac_t""no" 1>&6
77767779 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
77787781 ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'`
77797782 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
77807783 echo $ac_n "(cached) $ac_c" 1>&6
@@ -7782,7 +7785,7 @@
77827785 ac_save_LIBS="$LIBS"
77837786 LIBS="-lacl $LIBS"
77847787 cat > conftest.$ac_ext <<EOF
7785-#line 7786 "configure"
7788+#line 7789 "configure"
77867789 #include "confdefs.h"
77877790 /* Override any gcc2 internal prototype to avoid an error. */
77887791 /* We use char because int might match the return type of a gcc2
@@ -7793,7 +7796,7 @@
77937796 acl_get_file()
77947797 ; return 0; }
77957798 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
77977800 rm -rf conftest*
77987801 eval "ac_cv_lib_$ac_lib_var=yes"
77997802 else
@@ -7810,7 +7813,7 @@
78107813 echo "$ac_t""yes" 1>&6
78117814 LIBS="$LIBS -lacl"
78127815 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
78147817 ac_lib_var=`echo attr'_'fgetxattr | sed 'y%./+-%__p_%'`
78157818 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
78167819 echo $ac_n "(cached) $ac_c" 1>&6
@@ -7818,7 +7821,7 @@
78187821 ac_save_LIBS="$LIBS"
78197822 LIBS="-lattr $LIBS"
78207823 cat > conftest.$ac_ext <<EOF
7821-#line 7822 "configure"
7824+#line 7825 "configure"
78227825 #include "confdefs.h"
78237826 /* Override any gcc2 internal prototype to avoid an error. */
78247827 /* We use char because int might match the return type of a gcc2
@@ -7829,7 +7832,7 @@
78297832 fgetxattr()
78307833 ; return 0; }
78317834 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
78337836 rm -rf conftest*
78347837 eval "ac_cv_lib_$ac_lib_var=yes"
78357838 else
@@ -7857,9 +7860,9 @@
78577860
78587861
78597862 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
78617864 cat > conftest.$ac_ext <<EOF
7862-#line 7863 "configure"
7865+#line 7866 "configure"
78637866 #include "confdefs.h"
78647867
78657868 #include <sys/types.h>
@@ -7873,7 +7876,7 @@
78737876 acl_free(acl);
78747877 ; return 0; }
78757878 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
78777880 rm -rf conftest*
78787881 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
78797882 #define HAVE_POSIX_ACL 1
@@ -7888,9 +7891,9 @@
78887891 rm -f conftest*
78897892
78907893 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
78927895 cat > conftest.$ac_ext <<EOF
7893-#line 7894 "configure"
7896+#line 7897 "configure"
78947897 #include "confdefs.h"
78957898
78967899 #ifdef HAVE_SYS_ACL_H
@@ -7901,7 +7904,7 @@
79017904
79027905 ; return 0; }
79037906 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
79057908 rm -rf conftest*
79067909 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
79077910 #define HAVE_SOLARIS_ACL 1
@@ -7916,9 +7919,9 @@
79167919 rm -f conftest*
79177920
79187921 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
79207923 cat > conftest.$ac_ext <<EOF
7921-#line 7922 "configure"
7924+#line 7925 "configure"
79227925 #include "confdefs.h"
79237926
79247927 #ifdef HAVE_SYS_ACL_H
@@ -7940,7 +7943,7 @@
79407943
79417944 ; return 0; }
79427945 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
79447947 rm -rf conftest*
79457948 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
79467949 #define HAVE_AIX_ACL 1
@@ -7958,7 +7961,7 @@
79587961 fi
79597962
79607963 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
79627965 # Check whether --enable-gpm or --disable-gpm was given.
79637966 if test "${enable_gpm+set}" = set; then
79647967 enableval="$enable_gpm"
@@ -7971,13 +7974,13 @@
79717974 if test "$enable_gpm" = "yes"; then
79727975 echo "$ac_t""no" 1>&6
79737976 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
79757978 if eval "test \"`echo '$''{'vi_cv_have_gpm'+set}'`\" = set"; then
79767979 echo $ac_n "(cached) $ac_c" 1>&6
79777980 else
79787981 olibs="$LIBS" ; LIBS="-lgpm"
79797982 cat > conftest.$ac_ext <<EOF
7980-#line 7981 "configure"
7983+#line 7984 "configure"
79817984 #include "confdefs.h"
79827985 #include <gpm.h>
79837986 #include <linux/keyboard.h>
@@ -7985,7 +7988,7 @@
79857988 Gpm_GetLibVersion(NULL);
79867989 ; return 0; }
79877990 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
79897992 rm -rf conftest*
79907993 vi_cv_have_gpm=yes
79917994 else
@@ -8012,12 +8015,12 @@
80128015 fi
80138016
80148017 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
80168019 if test "$cross_compiling" = yes; then
80178020 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
80188021 else
80198022 cat > conftest.$ac_ext <<EOF
8020-#line 8021 "configure"
8023+#line 8024 "configure"
80218024 #include "confdefs.h"
80228025
80238026 #include <stdio.h>
@@ -8038,7 +8041,7 @@
80388041 }
80398042
80408043 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
80428045 then
80438046 cat >> confdefs.h <<\EOF
80448047 #define HAVE_VSNPRINTF 1
@@ -8056,16 +8059,16 @@
80568059
80578060
80588061 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
80608063 cat > conftest.$ac_ext <<EOF
8061-#line 8062 "configure"
8064+#line 8065 "configure"
80628065 #include "confdefs.h"
80638066 #include <stdio.h>
80648067 int main() {
80658068 rename("this", "that")
80668069 ; return 0; }
80678070 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
80698072 rm -rf conftest*
80708073 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
80718074 #define HAVE_RENAME 1
@@ -8080,9 +8083,9 @@
80808083 rm -f conftest*
80818084
80828085 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
80848087 cat > conftest.$ac_ext <<EOF
8085-#line 8086 "configure"
8088+#line 8089 "configure"
80868089 #include "confdefs.h"
80878090 #include <sys/types.h>
80888091 #include <sys/sysctl.h>
@@ -8097,7 +8100,7 @@
80978100
80988101 ; return 0; }
80998102 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
81018104 rm -rf conftest*
81028105 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
81038106 #define HAVE_SYSCTL 1
@@ -8112,9 +8115,9 @@
81128115 rm -f conftest*
81138116
81148117 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
81168119 cat > conftest.$ac_ext <<EOF
8117-#line 8118 "configure"
8120+#line 8121 "configure"
81188121 #include "confdefs.h"
81198122 #include <sys/types.h>
81208123 #include <sys/sysinfo.h>
@@ -8127,7 +8130,7 @@
81278130
81288131 ; return 0; }
81298132 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
81318134 rm -rf conftest*
81328135 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
81338136 #define HAVE_SYSINFO 1
@@ -8142,9 +8145,9 @@
81428145 rm -f conftest*
81438146
81448147 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
81468149 cat > conftest.$ac_ext <<EOF
8147-#line 8148 "configure"
8150+#line 8151 "configure"
81488151 #include "confdefs.h"
81498152 #include <unistd.h>
81508153 int main() {
@@ -8153,7 +8156,7 @@
81538156
81548157 ; return 0; }
81558158 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
81578160 rm -rf conftest*
81588161 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
81598162 #define HAVE_SYSCONF 1
@@ -8169,7 +8172,7 @@
81698172
81708173
81718174 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
81738176 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
81748177 echo $ac_n "(cached) $ac_c" 1>&6
81758178 else
@@ -8177,7 +8180,7 @@
81778180 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
81788181 else
81798182 cat > conftest.$ac_ext <<EOF
8180-#line 8181 "configure"
8183+#line 8184 "configure"
81818184 #include "confdefs.h"
81828185 #include <stdio.h>
81838186 main()
@@ -8188,7 +8191,7 @@
81888191 exit(0);
81898192 }
81908193 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
81928195 then
81938196 ac_cv_sizeof_int=`cat conftestval`
81948197 else
@@ -8209,7 +8212,7 @@
82098212
82108213
82118214 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
82138216 bcopy_test_prog='
82148217 main() {
82158218 char buf[10];
@@ -8229,11 +8232,11 @@
82298232 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
82308233 else
82318234 cat > conftest.$ac_ext <<EOF
8232-#line 8233 "configure"
8235+#line 8236 "configure"
82338236 #include "confdefs.h"
82348237 #define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog
82358238 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
82378240 then
82388241 cat >> confdefs.h <<\EOF
82398242 #define USEMEMMOVE 1
@@ -8247,11 +8250,11 @@
82478250 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
82488251 else
82498252 cat > conftest.$ac_ext <<EOF
8250-#line 8251 "configure"
8253+#line 8254 "configure"
82518254 #include "confdefs.h"
82528255 #define mch_memmove(s,d,l) bcopy(d,s,l) $bcopy_test_prog
82538256 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
82558258 then
82568259 cat >> confdefs.h <<\EOF
82578260 #define USEBCOPY 1
@@ -8265,11 +8268,11 @@
82658268 { echo "configure: error: failed to compile test program" 1>&2; exit 1; }
82668269 else
82678270 cat > conftest.$ac_ext <<EOF
8268-#line 8269 "configure"
8271+#line 8272 "configure"
82698272 #include "confdefs.h"
82708273 #define mch_memmove(s,d,l) memcpy(d,s,l) $bcopy_test_prog
82718274 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
82738276 then
82748277 cat >> confdefs.h <<\EOF
82758278 #define USEMEMCPY 1
@@ -8301,19 +8304,19 @@
83018304 CFLAGS="$CFLAGS -I$x_includes"
83028305 LDFLAGS="$X_LIBS $LDFLAGS -lX11"
83038306 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
83058308 cat > conftest.$ac_ext <<EOF
8306-#line 8307 "configure"
8309+#line 8310 "configure"
83078310 #include "confdefs.h"
83088311 #include <X11/Xlocale.h>
83098312 int main() {
83108313
83118314 ; return 0; }
83128315 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
83148317 rm -rf conftest*
83158318 cat > conftest.$ac_ext <<EOF
8316-#line 8317 "configure"
8319+#line 8320 "configure"
83178320 #include "confdefs.h"
83188321 /* Override any gcc2 internal prototype to avoid an error. */
83198322 /* We use char because int might match the return type of a gcc2
@@ -8324,7 +8327,7 @@
83248327 _Xsetlocale()
83258328 ; return 0; }
83268329 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
83288331 rm -rf conftest*
83298332 echo "$ac_t""yes" 1>&6
83308333 cat >> confdefs.h <<\EOF
@@ -8351,7 +8354,7 @@
83518354 fi
83528355
83538356 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
83558358 ac_lib_var=`echo xpg4'_'_xpg4_setrunelocale | sed 'y%./+-%__p_%'`
83568359 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
83578360 echo $ac_n "(cached) $ac_c" 1>&6
@@ -8359,7 +8362,7 @@
83598362 ac_save_LIBS="$LIBS"
83608363 LIBS="-lxpg4 $LIBS"
83618364 cat > conftest.$ac_ext <<EOF
8362-#line 8363 "configure"
8365+#line 8366 "configure"
83638366 #include "confdefs.h"
83648367 /* Override any gcc2 internal prototype to avoid an error. */
83658368 /* We use char because int might match the return type of a gcc2
@@ -8370,7 +8373,7 @@
83708373 _xpg4_setrunelocale()
83718374 ; return 0; }
83728375 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
83748377 rm -rf conftest*
83758378 eval "ac_cv_lib_$ac_lib_var=yes"
83768379 else
@@ -8392,7 +8395,7 @@
83928395
83938396
83948397 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
83968399 test -f tags && mv tags tags.save
83978400 if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then
83988401 TAGPRG="ctags"
@@ -8409,7 +8412,7 @@
84098412 echo "$ac_t""$TAGPRG" 1>&6
84108413
84118414 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
84138416 MANDEF="man"
84148417 (eval man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s"
84158418 echo "$ac_t""$MANDEF" 1>&6
@@ -8421,7 +8424,7 @@
84218424 fi
84228425
84238426 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
84258428 # Check whether --enable-nls or --disable-nls was given.
84268429 if test "${enable_nls+set}" = set; then
84278430 enableval="$enable_nls"
@@ -8436,7 +8439,7 @@
84368439 # Extract the first word of "msgfmt", so it can be a program name with args.
84378440 set dummy msgfmt; ac_word=$2
84388441 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
84408443 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
84418444 echo $ac_n "(cached) $ac_c" 1>&6
84428445 else
@@ -8463,19 +8466,19 @@
84638466 fi
84648467
84658468 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
84678470 if test -f po/Makefile; then
84688471 have_gettext="no"
84698472 if test -n "$MSGFMT"; then
84708473 cat > conftest.$ac_ext <<EOF
8471-#line 8472 "configure"
8474+#line 8475 "configure"
84728475 #include "confdefs.h"
84738476 #include <libintl.h>
84748477 int main() {
84758478 gettext("Test");
84768479 ; return 0; }
84778480 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
84798482 rm -rf conftest*
84808483 echo "$ac_t""gettext() works" 1>&6; have_gettext="yes"
84818484 else
@@ -8485,14 +8488,14 @@
84858488 olibs=$LIBS
84868489 LIBS="$LIBS -lintl"
84878490 cat > conftest.$ac_ext <<EOF
8488-#line 8489 "configure"
8491+#line 8492 "configure"
84898492 #include "confdefs.h"
84908493 #include <libintl.h>
84918494 int main() {
84928495 gettext("Test");
84938496 ; return 0; }
84948497 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
84968499 rm -rf conftest*
84978500 echo "$ac_t""gettext() works with -lintl" 1>&6; have_gettext="yes"
84988501 else
@@ -8518,12 +8521,12 @@
85188521 for ac_func in bind_textdomain_codeset
85198522 do
85208523 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
85228525 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
85238526 echo $ac_n "(cached) $ac_c" 1>&6
85248527 else
85258528 cat > conftest.$ac_ext <<EOF
8526-#line 8527 "configure"
8529+#line 8530 "configure"
85278530 #include "confdefs.h"
85288531 /* System header to define __stub macros and hopefully few prototypes,
85298532 which can conflict with char $ac_func(); below. */
@@ -8546,7 +8549,7 @@
85468549
85478550 ; return 0; }
85488551 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
85508553 rm -rf conftest*
85518554 eval "ac_cv_func_$ac_func=yes"
85528555 else
@@ -8571,9 +8574,9 @@
85718574 done
85728575
85738576 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
85758578 cat > conftest.$ac_ext <<EOF
8576-#line 8577 "configure"
8579+#line 8580 "configure"
85778580 #include "confdefs.h"
85788581 #include <libintl.h>
85798582 extern int _nl_msg_cat_cntr;
@@ -8581,7 +8584,7 @@
85818584 ++_nl_msg_cat_cntr;
85828585 ; return 0; }
85838586 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
85858588 rm -rf conftest*
85868589 echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF
85878590 #define HAVE_NL_MSG_CAT_CNTR 1
@@ -8604,17 +8607,17 @@
86048607
86058608 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
86068609 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
86088611 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
86098612 echo $ac_n "(cached) $ac_c" 1>&6
86108613 else
86118614 cat > conftest.$ac_ext <<EOF
8612-#line 8613 "configure"
8615+#line 8616 "configure"
86138616 #include "confdefs.h"
86148617 #include <dlfcn.h>
86158618 EOF
86168619 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; }
86188621 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
86198622 if test -z "$ac_err"; then
86208623 rm -rf conftest*
@@ -8635,17 +8638,17 @@
86358638 echo "$ac_t""no" 1>&6
86368639 ac_safe=`echo "dl.h" | sed 'y%./+-%__p_%'`
86378640 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
86398642 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
86408643 echo $ac_n "(cached) $ac_c" 1>&6
86418644 else
86428645 cat > conftest.$ac_ext <<EOF
8643-#line 8644 "configure"
8646+#line 8647 "configure"
86448647 #include "confdefs.h"
86458648 #include <dl.h>
86468649 EOF
86478650 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; }
86498652 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
86508653 if test -z "$ac_err"; then
86518654 rm -rf conftest*
@@ -8674,9 +8677,9 @@
86748677 EOF
86758678
86768679 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
86788681 cat > conftest.$ac_ext <<EOF
8679-#line 8680 "configure"
8682+#line 8683 "configure"
86808683 #include "confdefs.h"
86818684
86828685 int main() {
@@ -8686,7 +8689,7 @@
86868689
86878690 ; return 0; }
86888691 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
86908693 rm -rf conftest*
86918694 echo "$ac_t""yes" 1>&6;
86928695 cat >> confdefs.h <<\EOF
@@ -8699,11 +8702,11 @@
86998702 rm -rf conftest*
87008703 echo "$ac_t""no" 1>&6;
87018704 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
87038706 olibs=$LIBS
87048707 LIBS="$LIBS -ldl"
87058708 cat > conftest.$ac_ext <<EOF
8706-#line 8707 "configure"
8709+#line 8710 "configure"
87078710 #include "confdefs.h"
87088711
87098712 int main() {
@@ -8713,7 +8716,7 @@
87138716
87148717 ; return 0; }
87158718 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
87178720 rm -rf conftest*
87188721 echo "$ac_t""yes" 1>&6;
87198722 cat >> confdefs.h <<\EOF
@@ -8731,9 +8734,9 @@
87318734 fi
87328735 rm -f conftest*
87338736 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
87358738 cat > conftest.$ac_ext <<EOF
8736-#line 8737 "configure"
8739+#line 8740 "configure"
87378740 #include "confdefs.h"
87388741
87398742 int main() {
@@ -8743,7 +8746,7 @@
87438746
87448747 ; return 0; }
87458748 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
87478750 rm -rf conftest*
87488751 echo "$ac_t""yes" 1>&6;
87498752 cat >> confdefs.h <<\EOF
@@ -8756,11 +8759,11 @@
87568759 rm -rf conftest*
87578760 echo "$ac_t""no" 1>&6;
87588761 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
87608763 olibs=$LIBS
87618764 LIBS="$LIBS -ldl"
87628765 cat > conftest.$ac_ext <<EOF
8763-#line 8764 "configure"
8766+#line 8767 "configure"
87648767 #include "confdefs.h"
87658768
87668769 int main() {
@@ -8770,7 +8773,7 @@
87708773
87718774 ; return 0; }
87728775 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
87748777 rm -rf conftest*
87758778 echo "$ac_t""yes" 1>&6;
87768779 cat >> confdefs.h <<\EOF
@@ -8793,9 +8796,9 @@
87938796 EOF
87948797
87958798 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
87978800 cat > conftest.$ac_ext <<EOF
8798-#line 8799 "configure"
8801+#line 8802 "configure"
87998802 #include "confdefs.h"
88008803
88018804 int main() {
@@ -8805,7 +8808,7 @@
88058808
88068809 ; return 0; }
88078810 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
88098812 rm -rf conftest*
88108813 echo "$ac_t""yes" 1>&6;
88118814 cat >> confdefs.h <<\EOF
@@ -8818,11 +8821,11 @@
88188821 rm -rf conftest*
88198822 echo "$ac_t""no" 1>&6;
88208823 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
88228825 olibs=$LIBS
88238826 LIBS="$LIBS -ldld"
88248827 cat > conftest.$ac_ext <<EOF
8825-#line 8826 "configure"
8828+#line 8829 "configure"
88268829 #include "confdefs.h"
88278830
88288831 int main() {
@@ -8832,7 +8835,7 @@
88328835
88338836 ; return 0; }
88348837 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
88368839 rm -rf conftest*
88378840 echo "$ac_t""yes" 1>&6;
88388841 cat >> confdefs.h <<\EOF
@@ -8854,17 +8857,17 @@
88548857 do
88558858 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
88568859 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
88588861 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
88598862 echo $ac_n "(cached) $ac_c" 1>&6
88608863 else
88618864 cat > conftest.$ac_ext <<EOF
8862-#line 8863 "configure"
8865+#line 8866 "configure"
88638866 #include "confdefs.h"
88648867 #include <$ac_hdr>
88658868 EOF
88668869 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; }
88688871 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
88698872 if test -z "$ac_err"; then
88708873 rm -rf conftest*
@@ -8901,7 +8904,7 @@
89018904 if test "x$MACOSX" = "xyes" && test "x$CARBON" = "xyes" \
89028905 && test "x$GUITYPE" != "xCARBONGUI"; then
89038906 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
89058908 if test "x$enable_multibyte" = "xyes" || test "x$features" == "xbig" \
89068909 || test "x$features" = "xhuge"; then
89078910 LIBS="$LIBS -framework Carbon"
diff -r 3ba373b54370 -r 9be87deaeb52 src/configure.in
--- a/src/configure.in Mon Jul 12 15:53:54 2004 +0000
+++ b/src/configure.in Fri Jul 16 20:18:37 2004 +0000
@@ -364,6 +364,9 @@
364364 dnl Make Vim remember the path to the library. For when it's not in
365365 dnl $LD_LIBRARY_PATH.
366366 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"
367370 fi
368371 fi
369372 MZSCHEME_CFLAGS="-I${vi_cv_path_mzscheme_pfx}/include \
diff -r 3ba373b54370 -r 9be87deaeb52 src/ex_docmd.c
--- a/src/ex_docmd.c Mon Jul 12 15:53:54 2004 +0000
+++ b/src/ex_docmd.c Fri Jul 16 20:18:37 2004 +0000
@@ -3205,6 +3205,11 @@
32053205 {
32063206 xp->xp_context = EXPAND_ENV_VARS;
32073207 ++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
32083213 }
32093214 }
32103215 }
diff -r 3ba373b54370 -r 9be87deaeb52 src/fileio.c
--- a/src/fileio.c Mon Jul 12 15:53:54 2004 +0000
+++ b/src/fileio.c Fri Jul 16 20:18:37 2004 +0000
@@ -2720,6 +2720,7 @@
27202720 int buf_fname_f = FALSE;
27212721 int buf_fname_s = FALSE;
27222722 int did_cmd = FALSE;
2723+ int nofile_err = FALSE;
27232724
27242725 /*
27252726 * Apply PRE aucocommands.
@@ -2742,8 +2743,13 @@
27422743 {
27432744 if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEAPPENDCMD,
27442745 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,
27462751 sfname, sfname, FALSE, curbuf, eap);
2752+ }
27472753 }
27482754 else if (filtering)
27492755 {
@@ -2754,15 +2760,25 @@
27542760 {
27552761 if (!(did_cmd = apply_autocmds_exarg(EVENT_BUFWRITECMD,
27562762 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,
27582768 sfname, sfname, FALSE, curbuf, eap);
2769+ }
27592770 }
27602771 else
27612772 {
27622773 if (!(did_cmd = apply_autocmds_exarg(EVENT_FILEWRITECMD,
27632774 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,
27652780 sfname, sfname, FALSE, curbuf, eap);
2781+ }
27662782 }
27672783
27682784 /* restore curwin/curbuf and a few other things */
@@ -2776,11 +2792,15 @@
27762792 */
27772793 if (!buf_valid(buf))
27782794 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())
27802797 {
27812798 --no_wait_return;
27822799 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)
27842804 /* An aborting error, interrupt or exception in the
27852805 * autocommands. */
27862806 return FAIL;
diff -r 3ba373b54370 -r 9be87deaeb52 src/misc1.c
--- a/src/misc1.c Mon Jul 12 15:53:54 2004 +0000
+++ b/src/misc1.c Fri Jul 16 20:18:37 2004 +0000
@@ -992,24 +992,92 @@
992992 for (p = leader + lead_len - 1; p > leader
993993 && vim_iswhite(*p); --p)
994994 ;
995-
996995 ++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
9971020 if (p < leader + lead_repl_len)
9981021 p = leader;
9991022 else
10001023 p -= lead_repl_len;
1024+#endif
10011025 mch_memmove(p, lead_repl, (size_t)lead_repl_len);
10021026 if (p + lead_repl_len > leader + lead_len)
10031027 p[lead_repl_len] = NUL;
10041028
10051029 /* blank-out any other chars from the old leader. */
10061030 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
10071050 if (!vim_iswhite(*p))
10081051 *p = ' ';
1052+ }
10091053 }
10101054 else /* left adjusted leader */
10111055 {
10121056 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
10131081 mch_memmove(p, lead_repl, (size_t)lead_repl_len);
10141082
10151083 /* Replace any remaining non-white chars in the old
@@ -1026,7 +1094,26 @@
10261094 (leader + lead_len) - p);
10271095 }
10281096 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
10291115 *p = ' ';
1116+ }
10301117 }
10311118 *p = NUL;
10321119 }
@@ -3789,7 +3876,8 @@
37893876 /* Borland C++ 5.2 has this in a header file. */
37903877 extern char **environ;
37913878 # endif
3792- static char_u name[100];
3879+# define ENVNAMELEN 100
3880+ static char_u name[ENVNAMELEN];
37933881 char_u *str;
37943882 int n;
37953883
@@ -3797,7 +3885,7 @@
37973885 if (str == NULL)
37983886 return NULL;
37993887
3800- for (n = 0; n < 99; ++n)
3888+ for (n = 0; n < ENVNAMELEN - 1; ++n)
38013889 {
38023890 if (str[n] == '=' || str[n] == NUL)
38033891 break;
@@ -5064,7 +5152,10 @@
50645152
50655153 *col = 0;
50665154
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);
50685159 if (*s == NUL)
50695160 return FALSE;
50705161
@@ -5737,7 +5828,8 @@
57375828 if (start_off != 0)
57385829 amount += start_off;
57395830 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);
57415833 break;
57425834 }
57435835
@@ -5751,7 +5843,8 @@
57515843 if (off != 0)
57525844 amount += off;
57535845 else if (align == COM_RIGHT)
5754- amount += lead_start_len - lead_middle_len;
5846+ amount += vim_strsize(lead_start)
5847+ - vim_strsize(lead_middle);
57555848 done = TRUE;
57565849 break;
57575850 }
diff -r 3ba373b54370 -r 9be87deaeb52 src/option.c
--- a/src/option.c Mon Jul 12 15:53:54 2004 +0000
+++ b/src/option.c Fri Jul 16 20:18:37 2004 +0000
@@ -2475,7 +2475,11 @@
24752475 static char *(p_ead_values[]) = {"both", "ver", "hor", NULL};
24762476 #endif
24772477 #if defined(FEAT_QUICKFIX)
2478+# ifdef FEAT_AUTOCMD
2479+static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", "acwrite", NULL};
2480+# else
24782481 static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", NULL};
2482+# endif
24792483 static char *(p_bufhidden_values[]) = {"hide", "unload", "delete", "wipe", NULL};
24802484 #endif
24812485 static char *(p_bs_values[]) = {"indent", "eol", "start", NULL};
diff -r 3ba373b54370 -r 9be87deaeb52 src/quickfix.c
--- a/src/quickfix.c Mon Jul 12 15:53:54 2004 +0000
+++ b/src/quickfix.c Fri Jul 16 20:18:37 2004 +0000
@@ -1972,13 +1972,15 @@
19721972 }
19731973
19741974 /*
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.
19761977 */
19771978 int
19781979 bt_nofile(buf)
19791980 buf_T *buf;
19801981 {
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';
19821984 }
19831985
19841986 /*
Show on old repository browser