diff --git a/.github/CODEOWNERS_vim b/.github/CODEOWNERS_vim index 03c269cf14..0cde2772c5 100644 --- a/.github/CODEOWNERS_vim +++ b/.github/CODEOWNERS_vim @@ -133,6 +133,7 @@ runtime/ftplugin/eruby.vim @tpope @dkearns runtime/ftplugin/expect.vim @dkearns runtime/ftplugin/fennel.vim @gpanders runtime/ftplugin/fetchmail.vim @dkearns +runtime/ftplugin/forth.vim @jkotlinski runtime/ftplugin/fpcmake.vim @dkearns runtime/ftplugin/freebasic.vim @dkearns runtime/ftplugin/fstab.vim @rid9 @@ -158,6 +159,7 @@ runtime/ftplugin/html.vim @dkearns runtime/ftplugin/i3config.vim @hiqua runtime/ftplugin/icon.vim @dkearns runtime/ftplugin/indent.vim @dkearns +runtime/ftplugin/ishd.vim @dkearns runtime/ftplugin/j.vim @glts runtime/ftplugin/javascript.vim @dkearns runtime/ftplugin/javascriptreact.vim @dkearns @@ -210,6 +212,7 @@ runtime/ftplugin/scss.vim @tpope runtime/ftplugin/sdoc.vim @gpanders runtime/ftplugin/sed.vim @dkearns runtime/ftplugin/sh.vim @dkearns +runtime/ftplugin/solidity.vim @cothi runtime/ftplugin/solution.vim @dkearns runtime/ftplugin/spec.vim @ignatenkobrain runtime/ftplugin/ssa.vim @ObserverOfTime @@ -299,6 +302,7 @@ runtime/indent/sass.vim @tpope runtime/indent/scala.vim @derekwyatt runtime/indent/scss.vim @tpope runtime/indent/sh.vim @chrisbra +runtime/indent/solidity.vim @cothi runtime/indent/systemverilog.vim @Kocha runtime/indent/tcl.vim @dkearns runtime/indent/tcsh.vim @dkearns @@ -382,6 +386,7 @@ runtime/syntax/gitolite.vim @sitaramc runtime/syntax/gitrebase.vim @tpope runtime/syntax/go.vim @bhcleek runtime/syntax/godoc.vim @dbarnett +runtime/syntax/gp.vim @KBelabas runtime/syntax/gprof.vim @dpelle runtime/syntax/groff.vim @jmarshall runtime/syntax/gyp.vim @ObserverOfTime @@ -470,6 +475,7 @@ runtime/syntax/sdoc.vim @gpanders runtime/syntax/sed.vim @dkearns runtime/syntax/sh.vim @cecamp runtime/syntax/sm.vim @cecamp +runtime/syntax/solidity.vim @cothi runtime/syntax/spec.vim @ignatenkobrain runtime/syntax/sqloracle.vim @chrisbra runtime/syntax/squirrel.vim @zenmatic diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index ba73390f68..2a713fc058 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -13,7 +13,6 @@ jobs: env: CC: gcc - CFLAGS: -Wno-deprecated-declarations DEBIAN_FRONTEND: noninteractive TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} diff --git a/ci/config.mk.sed b/ci/config.mk.sed index f672edd9e4..06b6f73635 100644 --- a/ci/config.mk.sed +++ b/ci/config.mk.sed @@ -1,3 +1,3 @@ -/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror/ +/^CFLAGS[[:blank:]]*=/s/$/ -Wall -Wextra -Wshadow -Werror -Wno-deprecated-declarations/ /^PERL_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-function -Wno-shadow/ /^RUBY_CFLAGS_EXTRA[[:blank:]]*=/s/$/ -Wno-error=unused-parameter/ diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index bc2125754a..2958f45d0a 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -62,7 +62,7 @@ export def FTasmsyntax() endif enddef -var ft_visual_basic_content = '\cVB_Name\|Begin VB\.\(Form\|MDIForm\|UserControl\)' +var ft_visual_basic_content = '\c^\s*\%(Attribute\s\+VB_Name\|Begin\s\+\%(VB\.\|{\%(\x\+-\)\+\x\+}\)\)' # See FTfrm() for Visual Basic form file detection export def FTbas() @@ -146,12 +146,20 @@ export def FTcls() return endif - if getline(1) =~ '^\v%(\%|\\)' - setf tex - elseif getline(1)[0] == '#' && getline(1) =~ 'rexx' + var line1 = getline(1) + if line1 =~ '^#!.*\<\%(rexx\|regina\)\>' setf rexx - elseif getline(1) == 'VERSION 1.0 CLASS' + return + elseif line1 == 'VERSION 1.0 CLASS' setf vb + return + endif + + var nonblank1 = getline(nextnonblank(1)) + if nonblank1 =~ '^\v%(\%|\\)' + setf tex + elseif nonblank1 =~ '^\s*\%(/\*\|::\w\)' + setf rexx else setf st endif @@ -324,6 +332,11 @@ export def FTfrm() return endif + if getline(1) == "VERSION 5.00" + setf vb + return + endif + var lines = getline(1, min([line("$"), 5])) if match(lines, ft_visual_basic_content) > -1 @@ -1197,5 +1210,13 @@ export def FTv() setf v enddef +export def FTvba() + if getline(1) =~ '^["#] Vimball Archiver' + setf vim + else + setf vb + endif +enddef + # Uncomment this line to check for compilation errors early # defcompile diff --git a/runtime/autoload/dist/script.vim b/runtime/autoload/dist/script.vim index 5f3ae4aecc..fca5dcdbe6 100644 --- a/runtime/autoload/dist/script.vim +++ b/runtime/autoload/dist/script.vim @@ -209,6 +209,14 @@ export def Exe2filetype(name: string, line1: string): string elseif name =~ 'nix-shell' return 'nix' + # Crystal + elseif name =~ '^crystal\>' + return 'crystal' + + # Rexx + elseif name =~ '^\%(rexx\|regina\)\>' + return 'rexx' + endif return '' diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim index 95dd906794..ac9e37bf85 100644 --- a/runtime/autoload/gzip.vim +++ b/runtime/autoload/gzip.vim @@ -10,12 +10,17 @@ fun s:check(cmd) let name = substitute(a:cmd, '\(\S*\).*', '\1', '') if !exists("s:have_" . name) + " safety check, don't execute anything from the current directory + let f = fnamemodify(exepath(name), ":p:h") !=# getcwd() + if !f + echoerr "Warning: NOT executing " .. name .. " from current directory!" + endif let e = executable(name) if e < 0 let r = system(name . " --version") let e = (r !~ "not found" && r != "") endif - exe "let s:have_" . name . "=" . e + exe "let s:have_" . name . "=" . (e && f) endif exe "return s:have_" . name endfun diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 8dda30c418..0331a542ac 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -57,6 +57,10 @@ if !exists("g:zip_extractcmd") let g:zip_extractcmd= g:zip_unzipcmd endif +if fnamemodify(exepath(g:zip_unzipcmd), ":p:h") ==# getcwd() + echoerr "Warning: NOT executing " .. g:zip_unzipcmd .. " from current directory!" + finish +endif " ---------------- " Functions: {{{1 " ---------------- diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index a0f2f145be..dfa95e5aa4 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -310,6 +310,7 @@ inputrestore() Number restore typeahead inputsave() Number save and clear typeahead inputsecret({prompt} [, {text}]) String like input() but hiding the text insert({object}, {item} [, {idx}]) List insert {item} in {object} [before {idx}] +instanceof({object}, {class}) Number |TRUE| if {object} is an instance of {class} interrupt() none interrupt script execution invert({expr}) Number bitwise invert isabsolutepath({path}) Number |TRUE| if {path} is an absolute path @@ -5054,6 +5055,17 @@ insert({object}, {item} [, {idx}]) *insert()* Can also be used as a |method|: > mylist->insert(item) +instanceof({object}, {class}) *instanceof()* + The result is a Number, which is |TRUE| when the {object} argument is a + direct or indirect instance of a |Class| specified by {class}. + When {class} is a |List| the function returns |TRUE| when {object} is an + instance of any of the specified classes. + Example: > + instanceof(animal, [Dog, Cat]) + +< Can also be used as a |method|: > + myobj->instanceof(mytype) + interrupt() *interrupt()* Interrupt script execution. It works more or less like the user typing CTRL-C, most commands won't execute and control diff --git a/runtime/doc/evim-it.1 b/runtime/doc/evim-it.1 index 1e98a2d3f7..75be4e87cc 100644 --- a/runtime/doc/evim-it.1 +++ b/runtime/doc/evim-it.1 @@ -1,8 +1,6 @@ .TH EVIM 1 "16 febbraio 2002 " .SH NOME -evim \- Vim "facile", Vim impostato in modo da poter essere usato -facilmente per modificare file, anche da chi non abbia familiarit -con i comandi. +evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale .SH SINTASSI .br .B evim @@ -13,42 +11,39 @@ con i comandi. .B evim Inizia .B Vim -e imposta le opzioni per farlo comportare come un editore "modeless". -State sempre usando Vim, ma come un editore "posizionati-e-clicca". -Simile all'uso di Notepad in MS-Windows. -.B evim -richiede la presenza della GUI, per avere a disposizione men e barra -strumenti. +e imposta le opzioni per farlo comportare come un editore non-modale. +Si tratta sempre di Vim, ma usato nello stile "posizionati-e-clicca". +Rammenta molto l'utilizzo di Notepad in MS-Windows. +.B eVim +necessita della disponibilit della GUI, per utilizzare men e barra strumenti. .PP -Da usarsi soltanto se non si in grado di lavorare con Vim nella -maniera usuale. -La modifica file sar molto meno efficiente. +Va a usato soltanto se non si in grado di lavorare con Vim nella maniera usuale. +L'edit dei file sar molto meno efficiente. .PP .B eview -come sopra, ma parte in modalit "Sola Lettura". Funziona come evim \-R. +come sopra, ma si parte in modalit "Sola Lettura". Funziona come evim \-R. .PP Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc. .PP -L'opzione 'insertmode' impostata per poter immettere del testo direttamente. +L'opzione 'insertmode' impostata in modo da consentire l'immissione diretta di testo fin dall'inizio. .br -Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i -familiari tasti usati sotto MS-Windows. +Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i familiari tasti usati sotto MS-Windows. CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo. -Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo. +Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo. .SH OPZIONI Vedere vim(1). .SH FILE .TP 15 /usr/local/lib/vim/evim.vim Lo script caricato per inizializzare eVim. -.SH NAC [NOTO ANCHE COME] -Noto Anche Come "Vim per semplici". -Quando usate evim si suppone che prendiate un fazzoletto, -facciate un nodo ad ogni angolo e ve lo mettiate in testa. +.SH AKA +[Also Known As] noto anche come "Vim per semplici". +Quando is usa evim si suppone che si prenda un fazzoletto, +si faccia un nodo ad ogni angolo e lo si metta in testa. .SH VEDERE ANCHE vim(1) .SH AUTORE Buona parte di .B Vim - stato scritto da Bram Moolenaar, con molto aiuto da altri. + stato scritto da Bram Moolenaar, con molto aiuto da parte di altri. Vedere il men "Aiuto/Crediti". diff --git a/runtime/doc/evim-it.UTF-8.1 b/runtime/doc/evim-it.UTF-8.1 index f96d0cb42c..04bec41ffb 100644 --- a/runtime/doc/evim-it.UTF-8.1 +++ b/runtime/doc/evim-it.UTF-8.1 @@ -1,8 +1,6 @@ .TH EVIM 1 "16 febbraio 2002 " .SH NOME -evim \- Vim "facile", Vim impostato in modo da poter essere usato -facilmente per modificare file, anche da chi non abbia familiarità -con i comandi. +evim \- Vim "facile", impostato in modo da poter essere usato come editore non-modale .SH SINTASSI .br .B evim @@ -13,42 +11,39 @@ con i comandi. .B evim Inizia .B Vim -e imposta le opzioni per farlo comportare come un editore "modeless". -State sempre usando Vim, ma come un editore "posizionati-e-clicca". -Simile all'uso di Notepad in MS-Windows. -.B evim -richiede la presenza della GUI, per avere a disposizione menù e barra -strumenti. +e imposta le opzioni per farlo comportare come un editore non-modale. +Si tratta sempre di Vim, ma usato nello stile "posizionati-e-clicca". +Rammenta molto l'utilizzo di Notepad in MS-Windows. +.B eVim +necessita della disponibilità della GUI, per utilizzare menù e barra strumenti. .PP -Da usarsi soltanto se non si è in grado di lavorare con Vim nella -maniera usuale. -La modifica file sarà molto meno efficiente. +Va a usato soltanto se non si è in grado di lavorare con Vim nella maniera usuale. +L'edit dei file sarà molto meno efficiente. .PP .B eview -come sopra, ma parte in modalità "Sola Lettura". Funziona come evim \-R. +come sopra, ma si parte in modalità "Sola Lettura". Funziona come evim \-R. .PP Vedere vim(1) per dettagli riguardo a Vim, opzioni, etc. .PP -L'opzione 'insertmode' è impostata per poter immettere del testo direttamente. +L'opzione 'insertmode' è impostata in modo da consentire l'immissione diretta di testo fin dall'inizio. .br -Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i -familiari tasti usati sotto MS-Windows. +Sono definite delle mappature che consentono di usare COPIA e INCOLLA con i familiari tasti usati sotto MS-Windows. CTRL-X taglia testo, CTRL-C copia testo e CTRL-V incolla testo. -Usate CTRL-Q per ottenere quello che si otterrebbe con CTRL-V in Vim nativo. +Occorre usare CTRL-Q per ottenere il comportamenti di CTRL-V in Vim nativo. .SH OPZIONI Vedere vim(1). .SH FILE .TP 15 /usr/local/lib/vim/evim.vim Lo script caricato per inizializzare eVim. -.SH NAC [NOTO ANCHE COME] -Noto Anche Come "Vim per semplici". -Quando usate evim si suppone che prendiate un fazzoletto, -facciate un nodo ad ogni angolo e ve lo mettiate in testa. +.SH AKA +[Also Known As] noto anche come "Vim per semplici". +Quando is usa evim si suppone che si prenda un fazzoletto, +si faccia un nodo ad ogni angolo e lo si metta in testa. .SH VEDERE ANCHE vim(1) .SH AUTORE Buona parte di .B Vim -è stato scritto da Bram Moolenaar, con molto aiuto da altri. +è stato scritto da Bram Moolenaar, con molto aiuto da parte di altri. Vedere il menù "Aiuto/Crediti". diff --git a/runtime/doc/if_perl.txt b/runtime/doc/if_perl.txt index 7949e91732..5cc992d0d2 100644 --- a/runtime/doc/if_perl.txt +++ b/runtime/doc/if_perl.txt @@ -297,5 +297,11 @@ instead of DYNAMIC_PERL_DLL file what was specified at compile time. The version of the shared library must match the Perl version Vim was compiled with. +Note: If you are building Perl locally, you have to use a version compiled +with threading support for it for Vim to successfully link against it. You can +use the `-Dusethreads` flags when configuring Perl, and check that a Perl +binary has it enabled by running `perl -V` and verify that `USE_ITHREADS` is +under "Compile-time options". + ============================================================================== vim:tw=78:ts=8:noet:ft=help:norl: diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index ccf5178a8a..6248f742f7 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -127,7 +127,11 @@ CTRL-R {register} *i_CTRL-R* '/' the last search pattern ':' the last command-line '.' the last inserted text + *i_CTRL-R_-* '-' the last small (less than a line) delete + register. This is repeatable using |.| since + it remembers the register to put instead of + the literal text to insert. *i_CTRL-R_=* '=' the expression register: you are prompted to enter an expression (see |expression|) diff --git a/runtime/doc/tags b/runtime/doc/tags index 56cfc05878..4b8793eabd 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -2108,10 +2108,12 @@ $quote eval.txt /*$quote* :Continue terminal.txt /*:Continue* :DiffOrig diff.txt /*:DiffOrig* :DoMatchParen pi_paren.txt /*:DoMatchParen* +:Down terminal.txt /*:Down* :Evaluate terminal.txt /*:Evaluate* :Explore pi_netrw.txt /*:Explore* :Finish terminal.txt /*:Finish* :FixBeginfigs ft_mp.txt /*:FixBeginfigs* +:Frame terminal.txt /*:Frame* :GLVS pi_getscript.txt /*:GLVS* :Gdb terminal.txt /*:Gdb* :GetLatestVimScripts_dat pi_getscript.txt /*:GetLatestVimScripts_dat* @@ -2164,7 +2166,9 @@ $quote eval.txt /*$quote* :TermdebugCommand terminal.txt /*:TermdebugCommand* :Texplore pi_netrw.txt /*:Texplore* :Until terminal.txt /*:Until* +:Up terminal.txt /*:Up* :UseVimball pi_vimball.txt /*:UseVimball* +:Var terminal.txt /*:Var* :Vexplore pi_netrw.txt /*:Vexplore* :VimballList pi_vimball.txt /*:VimballList* :Vimuntar pi_tar.txt /*:Vimuntar* @@ -4495,6 +4499,12 @@ E137 starting.txt /*E137* E138 starting.txt /*E138* E139 message.txt /*E139* E140 message.txt /*E140* +E1400 builtin.txt /*E1400* +E1401 builtin.txt /*E1401* +E1402 builtin.txt /*E1402* +E1403 builtin.txt /*E1403* +E1404 builtin.txt /*E1404* +E1405 builtin.txt /*E1405* E141 message.txt /*E141* E142 message.txt /*E142* E143 autocmd.txt /*E143* @@ -6853,6 +6863,7 @@ err_mode channel.txt /*err_mode* err_modifiable channel.txt /*err_modifiable* err_msg channel.txt /*err_msg* err_name channel.txt /*err_name* +err_teapot() builtin.txt /*err_teapot()* err_timeout channel.txt /*err_timeout* errmsg-variable eval.txt /*errmsg-variable* error-file-format quickfix.txt /*error-file-format* @@ -7637,6 +7648,7 @@ g tagsrch.txt /*g* g tagsrch.txt /*g* g tabpage.txt /*g* g motion.txt /*g* +g motion.txt /*g* g? change.txt /*g?* g?? change.txt /*g??* g?g? change.txt /*g?g?* @@ -8261,6 +8273,7 @@ insertmode-variable eval.txt /*insertmode-variable* install usr_90.txt /*install* install-home usr_90.txt /*install-home* install-registry gui_w32.txt /*install-registry* +instanceof() builtin.txt /*instanceof()* intel-itanium syntax.txt /*intel-itanium* intellimouse-wheel-problems gui_w32.txt /*intellimouse-wheel-problems* interactive-functions usr_41.txt /*interactive-functions* @@ -9372,6 +9385,7 @@ print-intro print.txt /*print-intro* print-options print.txt /*print-options* print.txt print.txt /*print.txt* printf() builtin.txt /*printf()* +printf-$ builtin.txt /*printf-$* printf-% builtin.txt /*printf-%* printf-B builtin.txt /*printf-B* printf-E builtin.txt /*printf-E* @@ -10489,15 +10503,20 @@ termdebug-communication terminal.txt /*termdebug-communication* termdebug-customizing terminal.txt /*termdebug-customizing* termdebug-events terminal.txt /*termdebug-events* termdebug-example terminal.txt /*termdebug-example* +termdebug-frames terminal.txt /*termdebug-frames* termdebug-prompt terminal.txt /*termdebug-prompt* termdebug-starting terminal.txt /*termdebug-starting* termdebug-stepping terminal.txt /*termdebug-stepping* termdebug-variables terminal.txt /*termdebug-variables* termdebug_disasm_window terminal.txt /*termdebug_disasm_window* termdebug_map_K terminal.txt /*termdebug_map_K* +termdebug_map_minus terminal.txt /*termdebug_map_minus* +termdebug_map_plus terminal.txt /*termdebug_map_plus* termdebug_popup terminal.txt /*termdebug_popup* termdebug_shortcuts terminal.txt /*termdebug_shortcuts* +termdebug_signs terminal.txt /*termdebug_signs* termdebug_use_prompt terminal.txt /*termdebug_use_prompt* +termdebug_variables_window terminal.txt /*termdebug_variables_window* termdebug_wide terminal.txt /*termdebug_wide* termdebug_winbar terminal.txt /*termdebug_winbar* terminal terminal.txt /*terminal* diff --git a/runtime/doc/terminal.txt b/runtime/doc/terminal.txt index 5e4ad1fcfe..c02a885c27 100644 --- a/runtime/doc/terminal.txt +++ b/runtime/doc/terminal.txt @@ -1,4 +1,4 @@ -*terminal.txt* For Vim version 9.0. Last change: 2023 Jun 28 +*terminal.txt* For Vim version 9.0. Last change: 2023 Aug 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -38,6 +38,7 @@ If the result is "1" you have it. Example session |termdebug-example| Stepping through code |termdebug-stepping| Inspecting variables |termdebug-variables| + Navigating stack frames |termdebug-frames| Other commands |termdebug-commands| Events |termdebug-events| Prompt mode |termdebug-prompt| @@ -1376,6 +1377,18 @@ This is similar to using "print" in the gdb window. You can usually shorten `:Evaluate` to `:Ev`. +Navigating stack frames ~ + *termdebug-frames* *:Frame* *:Up* *:Down* + `:Frame` [frame] select frame [frame], which is a frame number, + address, or function name (default: current frame) + `:Up` [count] go up [count] frames (default: 1; the frame that + called the current) + `+` same (see |termdebug_map_plus| to disable) + `:Down` [count] go down [count] frames (default: 1; the frame called + by the current) + `-` same (see |termdebug_map_minus| to disable) + + Other commands ~ *termdebug-commands* *:Gdb* jump to the gdb window @@ -1449,10 +1462,18 @@ If there is no g:termdebug_config you can use: > let g:termdebug_use_prompt = 1 < *termdebug_map_K* -The K key is normally mapped to :Evaluate. If you do not want this use: > +The K key is normally mapped to |:Evaluate|. If you do not want this use: > let g:termdebug_config['map_K'] = 0 If there is no g:termdebug_config you can use: > let g:termdebug_map_K = 0 +< + *termdebug_map_minus* +The - key is normally mapped to |:Down|. If you do not want this use: > + let g:termdebug_config['map_minus'] = 0 +< + *termdebug_map_plus* +The + key is normally mapped to |:Up|. If you do not want this use: > + let g:termdebug_config['map_plus'] = 0 < *termdebug_disasm_window* If you want the Asm window shown by default, set the "disasm_window" flag to diff --git a/runtime/doc/textprop.txt b/runtime/doc/textprop.txt index 0d830f6645..14fe2977a4 100644 --- a/runtime/doc/textprop.txt +++ b/runtime/doc/textprop.txt @@ -338,6 +338,8 @@ prop_list({lnum} [, {props}]) *prop_list()* text text to be displayed before {col}. Only present for |virtual-text| properties. text_align alignment property of |virtual-text|. + text_padding_left + left padding used for virtual text. text_wrap specifies whether |virtual-text| is wrapped. type name of the property type, omitted if the type was deleted diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 93c19b5140..db1d771fd1 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -61,8 +61,6 @@ without all the help files. SpellCap highlight not updated - PR #12428 Virtual text problems: -- Deleting character before a wrapping virtual text, causes for the following - lines to dissapear (Issue #12244) - If 'list' is on, 'below' virtual text which includes 1 or 2 characters are gone (Issue #12028) - Virtual text aligned "above": Wrong indentation when using tabs (Issue @@ -75,14 +73,6 @@ Virtual text problems: 'below' on an empty line (Issue #11959) - truncated Virtual text below an empty line causes display error #12493 -include #12403: window for Termdebug showing local variables - -include #12140: positional arguments in printf(), fixes #10577 - -Include #11818: attach custom data to quickfix items. - -Include #12292: buffer argument for undotree()? - When 'virtualedit' is "all" and 'cursorcolumn' is set, the wrong column may be highlighted. (van-de-bugger, 2018 Jan 23, #2576) @@ -131,7 +121,7 @@ Upcoming larger works: Further Vim9 improvements, possibly after launch: -- implement :class and :interface: See |vim9-classes +- Classes and Interfaces. See |vim9-classes| - Change access: public by default, private by prefixing "_". Check for error: can't have same name twice (ignoring "_" prefix). - Private methods? @@ -139,25 +129,19 @@ Further Vim9 improvements, possibly after launch: or: def _Func() Perhaps use "private" keyword instead of "_" prefix? - "final" object members - can only be set in the constructor. + - Support export/import of classes and interfaces. - Cannot use class type of itself in the method (Issue #12369) - Cannot use an object method in a lambda #12417 Define all methods before compiling them? - - class members initialized during definition (Issue #12041) - Cannot call class member of funcref type (Issue #12324) Also #12081 first case. - Using list of functions does not work #12081 (repro in later message). - - Weird `class X not found on interface X` error (Issue #12023) - First argument of call() cannot be "obj.Func". (#11865) - - "return this" required for early return from constructor (inconsistent) - (Issue #12040) - - class/method confusion inside ":def" when using "class extends" (Issue - #12089) - null_object - constant type 17 not supported (Issue #12043) - problem compiling object method call as function call argument (Issue #12081) - Make ":defcompile ClassName" compile all functions and methods in the class. - - object's method in stacktrace missing information (Issue #12078) - Forward declaration of a class? E.g. for Clone() function. email lifepillar 2023 Mar 26 - Getting member of variable with "any" type should be handled at runtime. @@ -180,7 +164,7 @@ Further Vim9 improvements, possibly after launch: - For chaining, allow using the class name as type for function return value. - Implement generics - - Add "instanceof" (exact class name). And "assignable" (class or child)? + - Add "assignable" (class or child)? - More efficient way for interface member index than iterating over list? - a variant of type() that returns a different type for each class? list and list should also differ. @@ -3552,8 +3536,6 @@ Macintosh: 8 Dragging the status line doesn't scroll but redraw. 8 When performing incremental search, should abort searching as soon as a character is typed. -8 When the value of $MAKE contains a path, configure can't handle this. - It's an autoconf bug. Remove the path from $MAKE to work around it. 8 How to set VIMRC_FILE to \"something\" for configure? Why does this not work: CFLAGS='-DVIMRC_FILE=\"/mydir/myfile\"' ./configure 8 The temporary file is sometimes not writable. Check for this, and use an diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt index 3df9e58793..53568e907a 100644 --- a/runtime/doc/usr_41.txt +++ b/runtime/doc/usr_41.txt @@ -877,6 +877,7 @@ Other computation: *bitwise-function* srand() initialize seed used by rand() Variables: *var-functions* + instanceof() check if a variable is an instance of a given class type() type of a variable as a number typename() type of a variable as text islocked() check if a variable is locked diff --git a/runtime/doc/vim-it.1 b/runtime/doc/vim-it.1 index 75d0ea94d0..8337ad96d1 100644 --- a/runtime/doc/vim-it.1 +++ b/runtime/doc/vim-it.1 @@ -1,4 +1,4 @@ -.TH VIM 1 "22 febbraio 2002" +.TH VIM 1 "13 giugno 2022" .SH NOME vim \- VI Migliorato, un editor di testi per programmatori .SH SINTASSI @@ -35,17 +35,17 @@ Un editore di testi, compatibile con, e migliore di, Vi. Pu essere usato per editare qualsiasi file di testo. Particolarmente utile per editare programmi. .PP -Ci sono parecchi miglioramenti rispetto a Vi: undo multipli, -finestre e buffer multipli, evidenziazione sintattica, possibilit -di modificare la linea di comando, completamento nomi file, help -in linea, selezione testi in Modo Visual, etc.. +Ci sono parecchi miglioramenti rispetto a Vi: undo multipli, finestre e buffer +multipli, evidenziazione sintattica, possibilit di modificare la riga di comando, +completamento nomi file, help in linea, selezione testi in Modo Visual, etc.. Vedere ":help vi_diff.txt" per un sommario delle differenze fra .B Vim e Vi. .PP Mentre usate .B Vim -potete ricevere molto aiuto dal sistema di help online, col comando ":help". +potete ricevere molto aiuto dal sistema di help online, col comando +":help". Vedere qui sotto la sezione AIUTO ONLINE. .PP Quasi sempre @@ -69,18 +69,16 @@ Una lista di nomi di file. Il primo di questi sar il file corrente, e verr letto nel buffer. Il cursore sar posizionato sulla prima linea del buffer. Potete arrivare agli altri file col comando ":next". -Per editare un file il cui nome inizia per "\-" premettete "\-\-" alla -lista_file. +Per editare un file il cui nome inizia per "\-" premettete "\-\-" alla lista_file. .TP \- -Il file da editare letto dallo "stdin" [di solito, ma non -necessariamente, il terminale \- NdT]. I comandi sono letti da "stderr", -che dovrebbe essere un terminale [tty]. +Il file da editare letto dallo "stdin"- +I comandi sono letti da "stderr", che dovrebbe essere un terminale [tty]. .TP \-t {tag} Il file da editare e la posizione iniziale del cursore dipendono da "tag", una specie di "etichetta" a cui saltare. -{tag} viene cercata nel file "tags", ed il file ad essa associato diventa +{tag} viene cercata nel file "tags", e il file a essa associato diventa quello corrente, ed il comando ad essa associato viene eseguito. Di solito si usa per programmi C, nel qual caso {tag} potrebbe essere un nome di funzione. @@ -129,9 +127,8 @@ della shell o sospendere .B Vim. Si pu chiedere la stessa cosa anche con l'argomento "\-Z". .SH OPZIONI -Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di -file. Opzioni che non necessitano un argomento possono essere specificate -dietro a un solo "\-". +Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di file. +Opzioni che non hanno un argomento si possono specificare dietro a un solo "\-". .TP 12 +[numero] Per il primo file il cursore sar posizionato sulla linea "numero". @@ -145,8 +142,7 @@ Vedere ":help search\-pattern" per come specificare l'espressione. +{comando} .TP \-c {comando} -{comando} sar eseguito dopo che il -primo file stato letto. +{comando} sar eseguito dopo che il primo file stato letto. {comando} interpretato come un comando Ex. Se il {comando} contiene spazi deve essere incluso fra doppi apici (o altro delimitatore, a seconda della shell che si sta usando). @@ -164,14 +160,13 @@ argomento specificato). \-\-cmd {comando} Come "\-c", ma il comando eseguito PRIMA di eseguire qualsiasi file vimrc. -Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi -"\-c". +Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi "\-c". .TP \-A Se .B Vim - stato compilato con supporto Arabic per editare file con orientamento -destra-sinistra e tastiera con mappatura Araba, questa opzione inizia + stato compilato con supporto ARABIC per editare file con orientamento +destra-sinistra e tastiera con mappatura araba, questa opzione inizia .B Vim in Modo Arabic, cio impostando 'arabic'. Altrimenti viene dato un messaggio di errore e @@ -187,8 +182,7 @@ binario o un programma eseguibile. Compatibile. Imposta l'opzione 'compatible'. In questo modo .B Vim -ha quasi lo stesso comportamento di Vi, anche in presenza di un file -di configurazione .vimrc [proprio di Vim, vi usa .exrc \- Ndt]. +ha quasi lo stesso comportamento di Vi, anche in presenza di un file .vimrc. .TP \-d Inizia in Modo Diff [differenze]. @@ -274,7 +268,8 @@ termina in modo anormale. \-i {viminfo} Se abilitato l'uso di un file viminfo, questa opzione indica il nome del file da usare invece di quello predefinito "~/.viminfo". -Si pu anche evitare l'uso di un file .viminfo, dando come nome "NONE". +Si pu anche evitare l'uso di un file .viminfo, dando come nome +"NONE". .TP \-L Equivalente a \-r. @@ -285,8 +280,8 @@ Imposta le opzioni 'lisp' e 'showmatch'. .TP \-m Inibisce modifica file. -Annulla l'opzione 'write'. - ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo. +Inibisce l'opzione 'write'. + ancora possibile modificare un buffer, ma non riscriverlo. .TP \-M Modifiche non permesse. Le opzioni 'modifiable' e 'write' sono annullate, @@ -318,19 +313,23 @@ Se N manca, apri una finestra per ciascun file. Apri N finestre, in verticale. Se N manca, apri una finestra per ciascun file. .TP +\-p[N] +Apri N pagine di linguette. +Quando N omesso, apri una pagine di linguette per ciascun file. +.TP \-R Modo Read-only (Sola Lettura). Imposta l'opzione 'readonly'. -Si pu ancora modificare il buffer, ma siete protetti da una riscrittura +Si pu ancora modificare il buffer, ma il file protetto da una riscrittura involontaria. -Se volete davvero riscrivere il file, aggiungete un punto esclamativo +Se si vuole davvero riscrivere il file, occorre aggiungere un punto esclamativo al comando Ex, come in ":w!". L'opzione \-R implica anche l'opzione \-n (vedere sotto). L'opzione 'readonly' pu essere annullata con ":set noro". Vedere ":help 'readonly'". .TP \-r -Lista file di swap, assieme a dati utili per un recupero. +Lista file di swap, e informazioni su come usarli per ripristinare file. .TP \-r {file} Modo Recovery (ripristino). @@ -345,10 +344,10 @@ Modo silenzioso. Solo quando invocato come "Ex" o quando l'opzione .TP \-s {scriptin} Lo script file {scriptin} letto. -I caratteri nel file sono interpretati come se immessi da voi. -Lo stesso si pu ottenere col comando ":source! {scriptin}". +I caratteri nel file sono interpretati come se immessi da terminale. +Lo stesso risultato si pu ottenere col comando ":source! {scriptin}". Se la fine del file di input viene raggiunta prima che Vim termini, -l'ulteriore input viene preso dalla tastiera. +l'ulteriore input verr preso dalla tastiera. .TP \-T {terminale} Dice a @@ -357,28 +356,25 @@ quale tipo di terminale state usando. Utile solo se il terminale non viene riconosciuto correttamente da Vim. Dovrebbe essere un terminale noto a .B Vim -(internamente) o definito nel file termcap o terminfo. +(internamente) o definito nei file termcap o terminfo. .TP \-u {vimrc} Usa i comandi nel file {vimrc} per inizializzazioni. Tutte le altre inizializzazioni non sono eseguite. Usate questa opzione per editare qualche file di tipo speciale. -Pu anche essere usato per non fare alcuna inizializzazione dando -come nome "NONE". +Si possono anche omettere tutte le inizializzazioni dando come nome "NONE". Vedere ":help initialization" da vim per ulteriori dettagli. .TP \-U {gvimrc} Usa i comandi nel file {gvimrc} per inizializzazioni GUI. Tutte le altre inizializzazioni GUI non sono eseguite. -Pu anche essere usata per non fare alcuna inizializzazione GUI dando -come nome "NONE". +Si possono anche omettere tutte le inizializzazioni GUI dando come nome "NONE". Vedere ":help gui-init" da vim per ulteriori dettagli. .TP \-V[N] -Verboso. Vim manda messaggi relativi agli script file che esegue +Verboso. Vim manda messaggi relativi ai file di script che esegue e quando legge o scrive un file viminfo. Il numero opzionale N il valore -dell'opzione 'verbose'. -Il valore predefinito 10. +dell'opzione 'verbose'. Il valore predefinito 10. .TP \-v Inizia @@ -388,7 +384,7 @@ effetto solo quando Vim viene invocato con il nome "ex". .TP \-w {scriptout} Ogni carattere immesso viene registrato nel file {scriptout}, -finch non uscite da +finch non si esce da .B Vim. Utile se si vuole creare uno script file da usare con "vim \-s" o ":source!". @@ -398,40 +394,41 @@ Se il file {scriptout} esiste, quel che immettete viene aggiunto in fondo. Come \-w, ma uno script file esistente viene sovrascritto. .TP \-x -Uso di cifratura nella scrittura dei file. E' necessario immettere -una chiave di cifratura. +Uso di cifratura nella scrittura dei file. Verr chiesta una chiave di cifratura. .TP \-X -Non connetterti al server X. Vim parte pi rapidamente, -ma il titolo della finestra e la clipboard non sono disponibili. +Non connettersi al server X. Vim parte pi rapidamente, +ma il titolo della finestra e la clipboard non sono usati. .TP \-y Eseguire .B Vim -in Modo Easy (semplificata), come se l'eseguibile invocato -sia "evim" o "eview". +in Modo Easy (semplificato), come se l'eseguibile invocato sia "evim" o "eview". Fa s che .B Vim si comporti come un editor che usa solo il mouse e i caratteri. .TP \-Z -Modo ristretto. Vim si comporta come se invocato con un nome -che inizia per "r". +Modo ristretto. Vim si comporta come se invocato con un nome che inizia per "r". .TP \-\- Specifica la fine delle opzioni. Argomenti specificati dopo questo sono considerati nomi file. Si pu usare per editare un file il cui nome inizi per '-'. .TP +\-\-clean +Richiede di non usare alcun file di personalizzazione (vimrc, plugin, etc.). +Utile per verificare se un problema persiste invocando Vim "originale". +.TP \-\-echo\-wid -Solo con GUI GTK: Visualizza Window ID su "stdout". +Solo per GUI GTK: Visualizza Window ID su "stdout". .TP \-\-help Vim d un messaggio ed esce, come con l'argomento "\-h". .TP \-\-literal -Considera i nomi passati come argomenti letterali, senza espandere -metacaratteri. Non necessario in Unix, la shell espande i metacaratteri. +Considera i nomi passati come argomenti letterali, senza espandere metacaratteri. +Non ha effetto in Unix, dove la shell espande comunque i metacaratteri. .TP \-\-noplugin Non caricare plugin. Implicito se si specifica \-u NONE. @@ -442,8 +439,7 @@ argomenti. Se non si trova un server viene dato un messaggio e i file sono editati nel Vim corrente. .TP \-\-remote\-expr {expr} -Connettersi a un server Vim, valutare ivi {expr} e stampare il risultato -su "stdout". +Connettersi a un server Vim, valutare {expr} e stampare il risultato su "stdout". .TP \-\-remote\-send {chiavi} Connettersi a un server Vim e spedirgli {chiavi}. @@ -458,16 +454,17 @@ Come \-\-remote, ma Vim non termina finch Come \-\-remote\-wait, ma senza avvisare se non si trova un server. .TP \-\-serverlist -Lista i nomi di tutti i server Vim disponibili. +Elenca i nomi di tutti i server Vim disponibili. .TP \-\-servername {nome} -Usa {nome} come nome server. Usato per il Vim corrente, a meno che sia -usato con l'argomento \-\-remote, nel qual caso indica il server a cui -connettersi. +Usa {nome} come nome server. Usato per il Vim corrente, a meno che sia usato +con l'argomento \-\-remote, nel qual caso indica il server a cui connettersi. .TP \-\-socketid {id} -Solo con GUI GTK: Usa il meccanismo GtkPlug per eseguire gvim in un'altra -finestra. +Solo per GUI GTK: Usa meccanismo GtkPlug per eseguire gvim in un'altra finestra. +.TP +\-\-startuptime {nome_file} +Durante la fase iniziale, scrive messaggi di log al file {nome_file}. .TP \-\-version Stampa la versione di Vim ed esci. @@ -477,9 +474,8 @@ Battere ":help" in per iniziare. Battere ":help argomento" per ricevere aiuto su uno specifico argomento. Per esempio: ":help ZZ" per ricevere aiuto sul comando "ZZ". -Usare e CTRL\-D per completare gli argomenti -(":help cmdline\-completion"). -Ci sono "tag" nei file di help per saltare da un argomento a un altro +Usare e CTRL\-D per completare gli argomenti (":help cmdline\-completion"). +Ci sono "tag" nei file di help per passare da un argomento a un altro (simili a legami ipertestuali, vedere ":help"). Tutti i file di documentazione possono essere navigati cos. Ad es.: ":help syntax.txt". @@ -489,7 +485,7 @@ Tutti i file di documentazione possono essere navigati cos I file di documentazione di .B Vim . -Usate ":help doc\-file\-list" per avere la lista completa. +Usare ":help doc\-file\-list" per avere la lista completa. .TP /usr/local/lib/vim/doc/tags Il file di tags usato per trovare informazioni nei file di documentazione. @@ -506,7 +502,7 @@ Inizializzazioni a livello di sistema. .TP ~/.vimrc -Le vostre personali inizializzazioni di +Inizializzazioni personali di .B Vim . .TP @@ -514,11 +510,10 @@ Le vostre personali inizializzazioni di Inizializzazioni gvim a livello di sistema. .TP ~/.gvimrc -Le vostre personali inizializzazioni di gvim. +Inizializzazioni personali di .TP /usr/local/lib/vim/optwin.vim -Script Vim usato dal comando ":options", un modo semplice -per visualizzare e impostare opzioni. +Script Vim usato dal comando ":options", da usare per visualizzare e impostare opzioni. .TP /usr/local/lib/vim/menu.vim Inizializzazioni del men gvim a livello di sistema. @@ -527,12 +522,10 @@ Inizializzazioni del men Script Vim per generare una segnalazione di errore. Vedere ":help bugs". .TP /usr/local/lib/vim/filetype.vim -Script Vim per determinare il tipo di un file a partire dal suo nome. -Vedere ":help 'filetype'". +Script Vim per determinare il tipo di un file dal suo nome. Vedere ":help 'filetype'". .TP /usr/local/lib/vim/scripts.vim -Script Vim per determinare il tipo di un file a partire dal suo contenuto. -Vedere ":help 'filetype'". +Script Vim per determinare il tipo di un file dal suo contenuto. Vedere ":help 'filetype'". .TP /usr/local/lib/vim/print/*.ps File usati per stampa PostScript. @@ -545,7 +538,7 @@ vimtutor(1) .SH AUTORE Buona parte di .B Vim - stato scritto da Bram Moolenaar, con molto aiuto da altri. + stato scritto da Bram Moolenaar, con molto aiuto da parte di altri. Vedere ":help credits" in .B Vim. .br @@ -557,10 +550,9 @@ In verit Probabili. Vedere ":help todo" per una lista di problemi noti. .PP -Si noti che un certo numero di comportamenti che possono essere considerati -errori da qualcuno, sono in effetti causati da una riproduzione fin troppo -fedele del comportamento di Vi. -Se ritenete che altre cose siano errori "perch Vi si comporta diversamente", -date prima un'occhiata al file vi_diff.txt -(o battere :help vi_diff.txt da Vim). -Date anche un'occhiata alle opzioni 'compatible' e 'cpoptions. +Si noti che un certo numero di comportamenti che possono essere considerati errori +da qualcuno, sono in effetti causati da una riproduzione fin troppo fedele del +comportamento di Vi. Se si ritiene che altre cose siano errori "perch Vi si comporta +diversamente", si dia prima un'occhiata al file vi_diff.txt (o si immetta +:help vi_diff.txt da Vim). +Un'occhiata va data anche alle opzioni 'compatible' e 'cpoptions. diff --git a/runtime/doc/vim-it.UTF-8.1 b/runtime/doc/vim-it.UTF-8.1 index 80c18262f5..5931d4bdb2 100644 --- a/runtime/doc/vim-it.UTF-8.1 +++ b/runtime/doc/vim-it.UTF-8.1 @@ -1,4 +1,4 @@ -.TH VIM 1 "22 febbraio 2002" +.TH VIM 1 "13 giugno 2022" .SH NOME vim \- VI Migliorato, un editor di testi per programmatori .SH SINTASSI @@ -35,17 +35,17 @@ Un editore di testi, compatibile con, e migliore di, Vi. Può essere usato per editare qualsiasi file di testo. Particolarmente utile per editare programmi. .PP -Ci sono parecchi miglioramenti rispetto a Vi: undo multipli, -finestre e buffer multipli, evidenziazione sintattica, possibilità -di modificare la linea di comando, completamento nomi file, help -in linea, selezione testi in Modo Visual, etc.. +Ci sono parecchi miglioramenti rispetto a Vi: undo multipli, finestre e buffer +multipli, evidenziazione sintattica, possibilità di modificare la riga di comando, +completamento nomi file, help in linea, selezione testi in Modo Visual, etc.. Vedere ":help vi_diff.txt" per un sommario delle differenze fra .B Vim e Vi. .PP Mentre usate .B Vim -potete ricevere molto aiuto dal sistema di help online, col comando ":help". +potete ricevere molto aiuto dal sistema di help online, col comando +":help". Vedere qui sotto la sezione AIUTO ONLINE. .PP Quasi sempre @@ -69,18 +69,16 @@ Una lista di nomi di file. Il primo di questi sarà il file corrente, e verrà letto nel buffer. Il cursore sarà posizionato sulla prima linea del buffer. Potete arrivare agli altri file col comando ":next". -Per editare un file il cui nome inizia per "\-" premettete "\-\-" alla -lista_file. +Per editare un file il cui nome inizia per "\-" premettete "\-\-" alla lista_file. .TP \- -Il file da editare è letto dallo "stdin" [di solito, ma non -necessariamente, il terminale \- NdT]. I comandi sono letti da "stderr", -che dovrebbe essere un terminale [tty]. +Il file da editare è letto dallo "stdin"- +I comandi sono letti da "stderr", che dovrebbe essere un terminale [tty]. .TP \-t {tag} Il file da editare e la posizione iniziale del cursore dipendono da "tag", una specie di "etichetta" a cui saltare. -{tag} viene cercata nel file "tags", ed il file ad essa associato diventa +{tag} viene cercata nel file "tags", e il file a essa associato diventa quello corrente, ed il comando ad essa associato viene eseguito. Di solito si usa per programmi C, nel qual caso {tag} potrebbe essere un nome di funzione. @@ -129,9 +127,8 @@ della shell o sospendere .B Vim. Si può chiedere la stessa cosa anche con l'argomento "\-Z". .SH OPZIONI -Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di -file. Opzioni che non necessitano un argomento possono essere specificate -dietro a un solo "\-". +Le opzioni possono essere in un ordine qualsiasi, prima o dopo i nomi di file. +Opzioni che non hanno un argomento si possono specificare dietro a un solo "\-". .TP 12 +[numero] Per il primo file il cursore sarà posizionato sulla linea "numero". @@ -145,8 +142,7 @@ Vedere ":help search\-pattern" per come specificare l'espressione. +{comando} .TP \-c {comando} -{comando} sarà eseguito dopo che il -primo file è stato letto. +{comando} sarà eseguito dopo che il primo file è stato letto. {comando} è interpretato come un comando Ex. Se il {comando} contiene spazi deve essere incluso fra doppi apici (o altro delimitatore, a seconda della shell che si sta usando). @@ -164,14 +160,13 @@ argomento specificato). \-\-cmd {comando} Come "\-c", ma il comando è eseguito PRIMA di eseguire qualsiasi file vimrc. -Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi -"\-c". +Si possono usare fino a 10 di questi comandi, indipendentemente dai comandi "\-c". .TP \-A Se .B Vim -è stato compilato con supporto Arabic per editare file con orientamento -destra-sinistra e tastiera con mappatura Araba, questa opzione inizia +è stato compilato con supporto ARABIC per editare file con orientamento +destra-sinistra e tastiera con mappatura araba, questa opzione inizia .B Vim in Modo Arabic, cioè impostando 'arabic'. Altrimenti viene dato un messaggio di errore e @@ -187,8 +182,7 @@ binario o un programma eseguibile. Compatibile. Imposta l'opzione 'compatible'. In questo modo .B Vim -ha quasi lo stesso comportamento di Vi, anche in presenza di un file -di configurazione .vimrc [proprio di Vim, vi usa .exrc \- Ndt]. +ha quasi lo stesso comportamento di Vi, anche in presenza di un file .vimrc. .TP \-d Inizia in Modo Diff [differenze]. @@ -274,7 +268,8 @@ termina in modo anormale. \-i {viminfo} Se è abilitato l'uso di un file viminfo, questa opzione indica il nome del file da usare invece di quello predefinito "~/.viminfo". -Si può anche evitare l'uso di un file .viminfo, dando come nome "NONE". +Si può anche evitare l'uso di un file .viminfo, dando come nome +"NONE". .TP \-L Equivalente a \-r. @@ -285,8 +280,8 @@ Imposta le opzioni 'lisp' e 'showmatch'. .TP \-m Inibisce modifica file. -Annulla l'opzione 'write'. -È ancora possibile modificare un buffer [in memoria \- Ndt], ma non scriverlo. +Inibisce l'opzione 'write'. +È ancora possibile modificare un buffer, ma non riscriverlo. .TP \-M Modifiche non permesse. Le opzioni 'modifiable' e 'write' sono annullate, @@ -318,19 +313,23 @@ Se N manca, apri una finestra per ciascun file. Apri N finestre, in verticale. Se N manca, apri una finestra per ciascun file. .TP +\-p[N] +Apri N pagine di linguette. +Quando N è omesso, apri una pagine di linguette per ciascun file. +.TP \-R Modo Read-only (Sola Lettura). Imposta l'opzione 'readonly'. -Si può ancora modificare il buffer, ma siete protetti da una riscrittura +Si può ancora modificare il buffer, ma il file è protetto da una riscrittura involontaria. -Se volete davvero riscrivere il file, aggiungete un punto esclamativo +Se si vuole davvero riscrivere il file, occorre aggiungere un punto esclamativo al comando Ex, come in ":w!". L'opzione \-R implica anche l'opzione \-n (vedere sotto). L'opzione 'readonly' può essere annullata con ":set noro". Vedere ":help 'readonly'". .TP \-r -Lista file di swap, assieme a dati utili per un recupero. +Lista file di swap, e informazioni su come usarli per ripristinare file. .TP \-r {file} Modo Recovery (ripristino). @@ -345,10 +344,10 @@ Modo silenzioso. Solo quando invocato come "Ex" o quando l'opzione .TP \-s {scriptin} Lo script file {scriptin} è letto. -I caratteri nel file sono interpretati come se immessi da voi. -Lo stesso si può ottenere col comando ":source! {scriptin}". +I caratteri nel file sono interpretati come se immessi da terminale. +Lo stesso risultato si può ottenere col comando ":source! {scriptin}". Se la fine del file di input viene raggiunta prima che Vim termini, -l'ulteriore input viene preso dalla tastiera. +l'ulteriore input verrà preso dalla tastiera. .TP \-T {terminale} Dice a @@ -357,28 +356,25 @@ quale tipo di terminale state usando. Utile solo se il terminale non viene riconosciuto correttamente da Vim. Dovrebbe essere un terminale noto a .B Vim -(internamente) o definito nel file termcap o terminfo. +(internamente) o definito nei file termcap o terminfo. .TP \-u {vimrc} Usa i comandi nel file {vimrc} per inizializzazioni. Tutte le altre inizializzazioni non sono eseguite. Usate questa opzione per editare qualche file di tipo speciale. -Può anche essere usato per non fare alcuna inizializzazione dando -come nome "NONE". +Si possono anche omettere tutte le inizializzazioni dando come nome "NONE". Vedere ":help initialization" da vim per ulteriori dettagli. .TP \-U {gvimrc} Usa i comandi nel file {gvimrc} per inizializzazioni GUI. Tutte le altre inizializzazioni GUI non sono eseguite. -Può anche essere usata per non fare alcuna inizializzazione GUI dando -come nome "NONE". +Si possono anche omettere tutte le inizializzazioni GUI dando come nome "NONE". Vedere ":help gui-init" da vim per ulteriori dettagli. .TP \-V[N] -Verboso. Vim manda messaggi relativi agli script file che esegue +Verboso. Vim manda messaggi relativi ai file di script che esegue e quando legge o scrive un file viminfo. Il numero opzionale N è il valore -dell'opzione 'verbose'. -Il valore predefinito è 10. +dell'opzione 'verbose'. Il valore predefinito è 10. .TP \-v Inizia @@ -388,7 +384,7 @@ effetto solo quando Vim viene invocato con il nome "ex". .TP \-w {scriptout} Ogni carattere immesso viene registrato nel file {scriptout}, -finché non uscite da +finché non si esce da .B Vim. Utile se si vuole creare uno script file da usare con "vim \-s" o ":source!". @@ -398,40 +394,41 @@ Se il file {scriptout} esiste, quel che immettete viene aggiunto in fondo. Come \-w, ma uno script file esistente viene sovrascritto. .TP \-x -Uso di cifratura nella scrittura dei file. E' necessario immettere -una chiave di cifratura. +Uso di cifratura nella scrittura dei file. Verrà chiesta una chiave di cifratura. .TP \-X -Non connetterti al server X. Vim parte più rapidamente, -ma il titolo della finestra e la clipboard non sono disponibili. +Non connettersi al server X. Vim parte più rapidamente, +ma il titolo della finestra e la clipboard non sono usati. .TP \-y Eseguire .B Vim -in Modo Easy (semplificata), come se l'eseguibile invocato -sia "evim" o "eview". +in Modo Easy (semplificato), come se l'eseguibile invocato sia "evim" o "eview". Fa sì che .B Vim si comporti come un editor che usa solo il mouse e i caratteri. .TP \-Z -Modo ristretto. Vim si comporta come se invocato con un nome -che inizia per "r". +Modo ristretto. Vim si comporta come se invocato con un nome che inizia per "r". .TP \-\- Specifica la fine delle opzioni. Argomenti specificati dopo questo sono considerati nomi file. Si può usare per editare un file il cui nome inizi per '-'. .TP +\-\-clean +Richiede di non usare alcun file di personalizzazione (vimrc, plugin, etc.). +Utile per verificare se un problema persiste invocando Vim "originale". +.TP \-\-echo\-wid -Solo con GUI GTK: Visualizza Window ID su "stdout". +Solo per GUI GTK: Visualizza Window ID su "stdout". .TP \-\-help Vim dà un messaggio ed esce, come con l'argomento "\-h". .TP \-\-literal -Considera i nomi passati come argomenti letterali, senza espandere -metacaratteri. Non necessario in Unix, la shell espande i metacaratteri. +Considera i nomi passati come argomenti letterali, senza espandere metacaratteri. +Non ha effetto in Unix, dove la shell espande comunque i metacaratteri. .TP \-\-noplugin Non caricare plugin. Implicito se si specifica \-u NONE. @@ -442,8 +439,7 @@ argomenti. Se non si trova un server viene dato un messaggio e i file sono editati nel Vim corrente. .TP \-\-remote\-expr {expr} -Connettersi a un server Vim, valutare ivi {expr} e stampare il risultato -su "stdout". +Connettersi a un server Vim, valutare {expr} e stampare il risultato su "stdout". .TP \-\-remote\-send {chiavi} Connettersi a un server Vim e spedirgli {chiavi}. @@ -458,16 +454,17 @@ Come \-\-remote, ma Vim non termina finché i file non sono stati editati. Come \-\-remote\-wait, ma senza avvisare se non si trova un server. .TP \-\-serverlist -Lista i nomi di tutti i server Vim disponibili. +Elenca i nomi di tutti i server Vim disponibili. .TP \-\-servername {nome} -Usa {nome} come nome server. Usato per il Vim corrente, a meno che sia -usato con l'argomento \-\-remote, nel qual caso indica il server a cui -connettersi. +Usa {nome} come nome server. Usato per il Vim corrente, a meno che sia usato +con l'argomento \-\-remote, nel qual caso indica il server a cui connettersi. .TP \-\-socketid {id} -Solo con GUI GTK: Usa il meccanismo GtkPlug per eseguire gvim in un'altra -finestra. +Solo per GUI GTK: Usa meccanismo GtkPlug per eseguire gvim in un'altra finestra. +.TP +\-\-startuptime {nome_file} +Durante la fase iniziale, scrive messaggi di log al file {nome_file}. .TP \-\-version Stampa la versione di Vim ed esci. @@ -477,9 +474,8 @@ Battere ":help" in per iniziare. Battere ":help argomento" per ricevere aiuto su uno specifico argomento. Per esempio: ":help ZZ" per ricevere aiuto sul comando "ZZ". -Usare e CTRL\-D per completare gli argomenti -(":help cmdline\-completion"). -Ci sono "tag" nei file di help per saltare da un argomento a un altro +Usare e CTRL\-D per completare gli argomenti (":help cmdline\-completion"). +Ci sono "tag" nei file di help per passare da un argomento a un altro (simili a legami ipertestuali, vedere ":help"). Tutti i file di documentazione possono essere navigati così. Ad es.: ":help syntax.txt". @@ -489,7 +485,7 @@ Tutti i file di documentazione possono essere navigati così. Ad es.: I file di documentazione di .B Vim . -Usate ":help doc\-file\-list" per avere la lista completa. +Usare ":help doc\-file\-list" per avere la lista completa. .TP /usr/local/lib/vim/doc/tags Il file di tags usato per trovare informazioni nei file di documentazione. @@ -506,7 +502,7 @@ Inizializzazioni a livello di sistema. .TP ~/.vimrc -Le vostre personali inizializzazioni di +Inizializzazioni personali di .B Vim . .TP @@ -514,11 +510,10 @@ Le vostre personali inizializzazioni di Inizializzazioni gvim a livello di sistema. .TP ~/.gvimrc -Le vostre personali inizializzazioni di gvim. +Inizializzazioni personali di .TP /usr/local/lib/vim/optwin.vim -Script Vim usato dal comando ":options", un modo semplice -per visualizzare e impostare opzioni. +Script Vim usato dal comando ":options", da usare per visualizzare e impostare opzioni. .TP /usr/local/lib/vim/menu.vim Inizializzazioni del menù gvim a livello di sistema. @@ -527,12 +522,10 @@ Inizializzazioni del menù gvim a livello di sistema. Script Vim per generare una segnalazione di errore. Vedere ":help bugs". .TP /usr/local/lib/vim/filetype.vim -Script Vim per determinare il tipo di un file a partire dal suo nome. -Vedere ":help 'filetype'". +Script Vim per determinare il tipo di un file dal suo nome. Vedere ":help 'filetype'". .TP /usr/local/lib/vim/scripts.vim -Script Vim per determinare il tipo di un file a partire dal suo contenuto. -Vedere ":help 'filetype'". +Script Vim per determinare il tipo di un file dal suo contenuto. Vedere ":help 'filetype'". .TP /usr/local/lib/vim/print/*.ps File usati per stampa PostScript. @@ -545,7 +538,7 @@ vimtutor(1) .SH AUTORE Buona parte di .B Vim -è stato scritto da Bram Moolenaar, con molto aiuto da altri. +è stato scritto da Bram Moolenaar, con molto aiuto da parte di altri. Vedere ":help credits" in .B Vim. .br @@ -557,10 +550,9 @@ In verità, poco o nulla è rimasto del loro codice originale. Probabili. Vedere ":help todo" per una lista di problemi noti. .PP -Si noti che un certo numero di comportamenti che possono essere considerati -errori da qualcuno, sono in effetti causati da una riproduzione fin troppo -fedele del comportamento di Vi. -Se ritenete che altre cose siano errori "perché Vi si comporta diversamente", -date prima un'occhiata al file vi_diff.txt -(o battere :help vi_diff.txt da Vim). -Date anche un'occhiata alle opzioni 'compatible' e 'cpoptions. +Si noti che un certo numero di comportamenti che possono essere considerati errori +da qualcuno, sono in effetti causati da una riproduzione fin troppo fedele del +comportamento di Vi. Se si ritiene che altre cose siano errori "perché Vi si comporta +diversamente", si dia prima un'occhiata al file vi_diff.txt (o si immetta +:help vi_diff.txt da Vim). +Un'occhiata va data anche alle opzioni 'compatible' e 'cpoptions. diff --git a/runtime/doc/vim9.txt b/runtime/doc/vim9.txt index 4b0cdbb676..1431a134e8 100644 --- a/runtime/doc/vim9.txt +++ b/runtime/doc/vim9.txt @@ -1033,10 +1033,12 @@ In Vim9 script one can use the following predefined values: > null null_blob null_channel + null_class null_dict null_function null_job null_list + null_object null_partial null_string `true` is the same as `v:true`, `false` the same as `v:false`, `null` the same diff --git a/runtime/doc/vim9class.txt b/runtime/doc/vim9class.txt index a68b97c87b..8a9e37e812 100644 --- a/runtime/doc/vim9class.txt +++ b/runtime/doc/vim9class.txt @@ -178,6 +178,26 @@ number to the total number of lines: > enddef +Private methods ~ +If you want object methods to be accessible only from other methods of the +same class and not used from outside the class, then you can make them +private. This is done by prefixing the method name with an underscore: > + + class SomeClass + def _Foo(): number + return 10 + enddef + def Bar(): number + return this._Foo() + enddef + endclass +< +Accessing a private method outside the class will result in an error (using +the above class): > + + var a = SomeClass.new() + a._Foo() +< Simplifying the new() method ~ Many constructors take values for the object members. Thus you very often see @@ -284,6 +304,22 @@ object members, they cannot use the "this" keyword. > Inside the class the function can be called by name directly, outside the class the class name must be prefixed: `OtherThing.ClearTotalSize()`. +Just like object methods the access can be made private by using an underscore +as the first character in the method name: > + + class OtherThing + static def _Foo() + echo "Foo" + enddef + def Bar() + OtherThing._Foo() + enddef + endclass +< + *E1370* +Note that constructors cannot be declared as "static", because they always +are. + ============================================================================== 4. Using an abstract class *Vim9-abstract-class* @@ -423,6 +459,12 @@ Each member and function name can be used only once. It is not possible to define a function with the same name and different type of arguments. +Member Initialization ~ +If the type of a member is not explicitly specified in a class, then it is set +to "any" during class definition. When an object is instantiated from the +class, then the type of the member is set. + + Extending a class ~ *extends* A class can extend one other class. *E1352* *E1353* *E1354* diff --git a/runtime/doc/vimdiff-it.1 b/runtime/doc/vimdiff-it.1 index 2203877acf..836ccbeabd 100644 --- a/runtime/doc/vimdiff-it.1 +++ b/runtime/doc/vimdiff-it.1 @@ -1,48 +1,46 @@ .TH VIMDIFF 1 "30 marzo 2001" .SH NOME -vimdiff \- modifica due, tre o quattro versioni di un file con Vim, -visualizzando le differenze +vimdiff \- modifica da due, fino a otto versioni di un file con Vim, visualizzando le differenze .SH SINTASSI .br .B vimdiff -[opzioni] file1 file2 [file3 [file4]] +[opzioni] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]] .PP .B gvimdiff .SH DESCRIZIONE .B Vimdiff inizia .B Vim -per due (o tre o quattro) file. +per due e fino a otto file. Ogni file ha una sua finestra. Le differenze fra file sono evidenziate. - una maniera elegante per controllare modifiche e portare modifiche -verso un'altra versione dello stesso file. + una maniera elegante per controllare modifiche e applicare modifiche +a qualche altra versione dello stesso file. .PP -Vedere vim(1) per dettagli su Vim in generale. +Vedere vim(1) per dettagli su Vim in s. .PP Se iniziato con .B gvimdiff la GUI sar utilizzata, se disponibile. .PP -In ogni finestra l'opzione 'diff' impostata, evidenziando cos le -differenze. +In ogni finestra l'opzione 'diff' impostata, in modo da evidenziare le +differenze fra le versioni .br -Le opzioni 'wrap' e 'scrollbind' sono impostate per migliorare la -visibilit del testo. +Le opzioni 'wrap' e 'scrollbind' sono impostate per favorire la visibilit del testo. .br -L'opzione 'foldmethod' impostata al valore "diff", che mette gruppi di +L'opzione 'foldmethod' impostata al valore "diff", che mette i gruppi di linee uguali fra i diversi file in una piegatura. 'foldcolumn' impostato a due per poter facilmente visualizzare le piegature, aprirle e chiuderle. .SH OPZIONI -Lo schermo diviso verticalmente, come se aveste usato l'opzione "\-O". -Per dividerlo orizzontalmente, usare l'opzione "\-o". +Lo schermo diviso verticalmente, come quando si usa l'opzione "\-O". +Per dividerlo orizzontalmente, usare invece l'opzione "\-o". .PP -Per tutte le altre opzioni, vedere vim(1). +Per tutti gli altri argomenti, vedere vim(1). .SH VEDERE ANCHE vim(1) .SH AUTORE Buona parte di .B Vim - stato scritto da Bram Moolenaar, con molto aiuto da altri. + stato scritto da Bram Moolenaar, con molto aiuto da parte di altri. Vedere ":help credits" in .B Vim. diff --git a/runtime/doc/vimdiff-it.UTF-8.1 b/runtime/doc/vimdiff-it.UTF-8.1 index 090892fa93..ebcf8acb35 100644 --- a/runtime/doc/vimdiff-it.UTF-8.1 +++ b/runtime/doc/vimdiff-it.UTF-8.1 @@ -1,48 +1,46 @@ .TH VIMDIFF 1 "30 marzo 2001" .SH NOME -vimdiff \- modifica due, tre o quattro versioni di un file con Vim, -visualizzando le differenze +vimdiff \- modifica da due, fino a otto versioni di un file con Vim, visualizzando le differenze .SH SINTASSI .br .B vimdiff -[opzioni] file1 file2 [file3 [file4]] +[opzioni] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]] .PP .B gvimdiff .SH DESCRIZIONE .B Vimdiff inizia .B Vim -per due (o tre o quattro) file. +per due e fino a otto file. Ogni file ha una sua finestra. Le differenze fra file sono evidenziate. -È una maniera elegante per controllare modifiche e portare modifiche -verso un'altra versione dello stesso file. +È una maniera elegante per controllare modifiche e applicare modifiche +a qualche altra versione dello stesso file. .PP -Vedere vim(1) per dettagli su Vim in generale. +Vedere vim(1) per dettagli su Vim in sé. .PP Se iniziato con .B gvimdiff la GUI sarà utilizzata, se disponibile. .PP -In ogni finestra l'opzione 'diff' è impostata, evidenziando così le -differenze. +In ogni finestra l'opzione 'diff' è impostata, in modo da evidenziare le +differenze fra le versioni .br -Le opzioni 'wrap' e 'scrollbind' sono impostate per migliorare la -visibilità del testo. +Le opzioni 'wrap' e 'scrollbind' sono impostate per favorire la visibilità del testo. .br -L'opzione 'foldmethod' è impostata al valore "diff", che mette gruppi di +L'opzione 'foldmethod' è impostata al valore "diff", che mette i gruppi di linee uguali fra i diversi file in una piegatura. 'foldcolumn' è impostato a due per poter facilmente visualizzare le piegature, aprirle e chiuderle. .SH OPZIONI -Lo schermo è diviso verticalmente, come se aveste usato l'opzione "\-O". -Per dividerlo orizzontalmente, usare l'opzione "\-o". +Lo schermo è diviso verticalmente, come quando si usa l'opzione "\-O". +Per dividerlo orizzontalmente, usare invece l'opzione "\-o". .PP -Per tutte le altre opzioni, vedere vim(1). +Per tutti gli altri argomenti, vedere vim(1). .SH VEDERE ANCHE vim(1) .SH AUTORE Buona parte di .B Vim -è stato scritto da Bram Moolenaar, con molto aiuto da altri. +è stato scritto da Bram Moolenaar, con molto aiuto da parte di altri. Vedere ":help credits" in .B Vim. diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/vimtutor-it.1 index b5c1e61e01..f521134403 100644 --- a/runtime/doc/vimtutor-it.1 +++ b/runtime/doc/vimtutor-it.1 @@ -1,6 +1,6 @@ .TH VIMTUTOR 1 "2 aprile 2001" .SH NOME -vimtutor \- Un breve corso per imparare Vim +vimtutor \- Un breve corso introduttivo a Vim .SH SINTASSI .br .B vimtutor [\-g] [lingua] @@ -8,51 +8,50 @@ vimtutor \- Un breve corso per imparare Vim .B Vimtutor inizia il .B Vim -tutor (una breve corso per imparare Vim). -Per prima cosa viene creata una copia del file di lavoro, che pu cos essere -modificato senza alterare il file usato come modello. +tutor (un breve corso introduttivo a Vim). +Viene utilizzata una copia del file di lavoro, che pu cos essere modificato +a piacere senza alterare il file usato come modello. .PP Il comando .B Vimtutor - utile a chi voglia imparare i primi comandi + utile a chi voglia imparare i primi comandi di .B Vim . .PP L'argomento opzionale \-g inizia vimtutor usando gvim invece che vim, se la -versione GUI di vim disponibile. oppure utilizza vim, se gvim non -disponibile. +versione GUI di vim disponibile; altrimenti viene utilizzato Vim. .PP -L'arogmento opzionale [lingua] l'abbreviazione di due lettere del nome +L'argomento opzionale [lingua] l'abbreviazione di due lettere del nome di una lingua, per esempio "it" oppure "es". -se L'argomento [lingua] non viene specificato, si utilizza la lingua "locale" +Se l'argomento [lingua] non viene specificato, si utilizza la lingua "locale" del computer. -Se la versione in quella lingua del "tutor" disponibile, sar usata. -Altrimenti sar usata la versione inglese. +Se la versione in tale lingua del "tutor" non disponibile, +verr usata la versione inglese. .PP .B Vim - sempre iniziato in Modo compatibile con vi. + sempre iniziato in Modo compatibile con Vi. .SH FILE .TP 15 /usr/local/lib/vim/tutor/tutor[.language] -Il/I file di testo per +I file di testo per .B Vimtutor - +. .TP 15 /usr/local/lib/vim/tutor/tutor.vim Lo script di Vim usato per copiare il file di testo .B Vimtutor . .SH AUTORE -The +Il corso introduttivo .B Vimtutor stato scritto in origine per Vi da Michael C. Pierce e Robert K. Ware, Colorado School of Mines, usando idee fornite da Charles Smith, Colorado State University. -E\-mail: bware@mines.colorado.edu. +E-mail: bware@mines.colorado.edu (non pi valido). .br stato modificato per .B Vim da Bram Moolenaar. -Per i nomi dei traduttori, vedere i file usati nelle rispettive lingue. +Per i nomi dei traduttori, vedere i file nelle rispettive lingue. .SH VEDERE ANCHE vim(1) diff --git a/runtime/doc/vimtutor-it.UTF-8.1 b/runtime/doc/vimtutor-it.UTF-8.1 index a33dcb00b0..49747d4d2f 100644 --- a/runtime/doc/vimtutor-it.UTF-8.1 +++ b/runtime/doc/vimtutor-it.UTF-8.1 @@ -1,6 +1,6 @@ .TH VIMTUTOR 1 "2 aprile 2001" .SH NOME -vimtutor \- Un breve corso per imparare Vim +vimtutor \- Un breve corso introduttivo a Vim .SH SINTASSI .br .B vimtutor [\-g] [lingua] @@ -8,51 +8,50 @@ vimtutor \- Un breve corso per imparare Vim .B Vimtutor inizia il .B Vim -tutor (una breve corso per imparare Vim). -Per prima cosa viene creata una copia del file di lavoro, che può così essere -modificato senza alterare il file usato come modello. +tutor (un breve corso introduttivo a Vim). +Viene utilizzata una copia del file di lavoro, che può così essere modificato +a piacere senza alterare il file usato come modello. .PP Il comando .B Vimtutor -è utile a chi voglia imparare i primi comandi +è utile a chi voglia imparare i primi comandi di .B Vim . .PP L'argomento opzionale \-g inizia vimtutor usando gvim invece che vim, se la -versione GUI di vim è disponibile. oppure utilizza vim, se gvim non è -disponibile. +versione GUI di vim è disponibile; altrimenti viene utilizzato Vim. .PP -L'arogmento opzionale [lingua] è l'abbreviazione di due lettere del nome +L'argomento opzionale [lingua] è l'abbreviazione di due lettere del nome di una lingua, per esempio "it" oppure "es". -se L'argomento [lingua] non viene specificato, si utilizza la lingua "locale" +Se l'argomento [lingua] non viene specificato, si utilizza la lingua "locale" del computer. -Se la versione in quella lingua del "tutor" è disponibile, sarà usata. -Altrimenti sarà usata la versione inglese. +Se la versione in tale lingua del "tutor" non è disponibile, +verrà usata la versione inglese. .PP .B Vim -è sempre iniziato in Modo compatibile con vi. +è sempre iniziato in Modo compatibile con Vi. .SH FILE .TP 15 /usr/local/lib/vim/tutor/tutor[.language] -Il/I file di testo per +I file di testo per .B Vimtutor - +. .TP 15 /usr/local/lib/vim/tutor/tutor.vim Lo script di Vim usato per copiare il file di testo .B Vimtutor . .SH AUTORE -The +Il corso introduttivo .B Vimtutor è stato scritto in origine per Vi da Michael C. Pierce e Robert K. Ware, Colorado School of Mines, usando idee fornite da Charles Smith, Colorado State University. -E\-mail: bware@mines.colorado.edu. +E-mail: bware@mines.colorado.edu (non più valido). .br È stato modificato per .B Vim da Bram Moolenaar. -Per i nomi dei traduttori, vedere i file usati nelle rispettive lingue. +Per i nomi dei traduttori, vedere i file nelle rispettive lingue. .SH VEDERE ANCHE vim(1) diff --git a/runtime/doc/xxd-it.1 b/runtime/doc/xxd-it.1 index 1fb4ae5e80..ad132bce43 100644 --- a/runtime/doc/xxd-it.1 +++ b/runtime/doc/xxd-it.1 @@ -6,7 +6,7 @@ .\" Modificato da Bram Moolenaar .SH NOME .I xxd -\- Produce esadecimale da un file binario o viceversa. +\- Produce lista esadecimale da un file binario o viceversa. .SH SINTASSI .B xxd \-h[elp] @@ -18,36 +18,33 @@ \-r[evert] [opzioni] [input_file [output_file]] .SH DESCRIZIONE .I xxd -crea un'immagine esadecimale di un dato file o dello "standard input". -Pu anche ottenere da un'immagine esadecimale il file binario originale. +crea un'immagine esadecimale di un dato file o dello `standard input'. +Pu anche ricostruire da un'immagine esadecimale il file binario originale. Come .BR uuencode (1) e .BR uudecode (1) -permette di trasmettere dati binari in una rappresentazione ASCII "a prova -di email", ma ha anche il vantaggio di poter decodificare sullo "standard -output". Inoltre, pu essere usato per effettuare delle modifiche (patch) -a file binari. +permette di trasmettere dati binari in una rappresentazione ASCII `a prova +di email', ma ha anche il vantaggio di poter decodificare sullo `standard output'. +Inoltre, pu essere usato per effettuare delle modifiche (patch) a file binari. .SH OPZIONI Se non si specifica un .I input_file -il programma legge dallo "standard input". +il programma legge dallo `standard input'. Se .I input_file specificato come il carattere .RB \` \- ' -, l'input letto dallo "standard input". +, l'input letto dallo `standard input'. Se non si specifica un .I output_file (o si mette al suo posto il carattere .RB \` \- ' -), i risultati sono inviati allo "standard output". +), i risultati sono inviati allo `standard output'. .PP -Si noti che la scansione dei caratteri "pigra", e non controlla oltre -la prima lettera dell'opzione, a meno che l'opzione sia seguita da un -parametro. -Gli spazi fra una singola lettera di opzione e il corrispondente parametro -dopo di essa sono facoltativi. +Si noti che la scansione dei caratteri "pigra", e non controlla oltre la prima +lettera di un'opzione, a meno che l'opzione sia seguita da un parametro. +Gli spazi fra una singola lettera di opzione e il relativo parametro sono facoltativi. I parametri delle opzioni possono essere specificati usando la notazione decimale, esadecimale oppure ottale. Pertanto @@ -60,118 +57,123 @@ sono notazioni equivalenti fra loro. .PP .TP .IR \-a " | " \-autoskip -Richiesta di autoskip: Un singolo '*' rimpiazza linee di zeri binari. -Valore di default: off. +Richiesta di omissione: Un singolo '*' rimpiazza righe a zeri binari. Default: off. .TP .IR \-b " | " \-bits Richiesta di una immagine binaria (cifre binarie), invece che esadecimale. -Questa opzione scrive un byte come otto cifre "1" e "0" invece di usare i -numeri esadecimali. Ogni linea preceduta da un indirizzo in esadecimale e -seguita da una decodifica ascii (o ebcdic). Le opzioni specificabili dalla -linea comando \-r, \-p, \-i non funzionano in questo modo. +Quest'opzione scrive un byte come otto cifre "1" e "0" invece di usare i +numeri esadecimali. Ogni riga preceduta da un indirizzo in esadecimale e +seguita da una decodifica ASCII (o EBCDIC). Le opzioni specificabili dalla +riga comando \-r, \-p, \-i non funzionano in questo modo. .TP .IR "\-c colonne " | " \-cols colonne" -.IR "\-c colonne " | " \-cols colonne" -In ogni linea sono formattate +In ogni riga sono formattate .RI < colonne > colonne. Valore di default 16 (\-i: 12, \-ps: 30, \-b: 6). -Valore massimo 256. +Non c' un valore massimo per \-ps; se si specifica 0 viene scritta un'unica lunga riga di output. +.TP +.IR \-C " | " \-capitalize +Mette in maiuscolo i nomi di variabili nello stile delle `include' C, se si usa \-i. .TP .IR \-E " | " \-EBCDIC Cambia la codifica della colonna di destra da ASCII a EBCDIC. Questo non modifica la rappresentazione esadecimale. Non ha senso -specificare questa opzione in combinazione con \-r, \-p o \-i. +specificare quest'opzione in combinazione con \-r, \-p o \-i. .TP -.IR "\-g numero_byte " | " \-groupsize numero_byte" -Inserisci ogni -.RI < numero_byte > -byte di output (di due caratteri esadecimali o otto numeri binari ognuno) -uno spazio bianco. +.IR \-e +Considera la lista esadecimale come avente codifica `little-endian'. +Quest'opzione tratta i gruppi di byte come parole in codifica `little-endian'. +Il raggruppamento di default dei byte a 4 a 4 pu essere cambiato usando +.RI "" \-g . +Quest'opzione si applica solo alla lista esadecimale, Lasciando inalterata +la rappresentazione ASCII (or EBCDIC). +Le opzioni della riga di comando +\-r, \-p, \-i non funzionano in questa modalit. +.TP +.IR "\-g numero " | " \-groupsize numero" +Separa ogni gruppo di +.RI < numero > +byte in output (di due caratteri esadecimali o otto caratteri binari ognuno) con uno spazio bianco. Specificando .I \-g 0 i byte di output non sono separati da alcuno spazio. -.RI < numero_byte > ha come valore di default " 2 -in modalit normale [esadecimale] e \fI1\fP in modalit binaria. -Il raggruppamento non si applica agli stili "PostScript" e "include". +.RI < Numero "> ha come valore di default " 2 +in modalit normale [esadecimale], \fI4\fP in modalit `little-endian' e \fI1\fP in modalit binaria. +Il raggruppamento non si applica agli stili `PostScript' e `include'. .TP .IR \-h " | " \-help -stampa un sommario dei comandi disponibili ed esce. Non viene fatto -null'altro. +Stampa un sommario dei comandi disponibili ed esce. Non viene fatto null'altro. .TP .IR \-i " | " \-include -L'output nello stile dei file "include" in C. Viene preparata la -definizione completa di un "array" [vettore], dandogli il nome del -file di input), tranne che nel caso in cui xxd legga dallo "standard input". +L'output un file `include' in C. Viene preparata la definizione completa del +vettore (col nome del file di input), tranne quando xxd legga dallo `standard input'. .TP .IR "\-l numero " | " \-len numero" Il programma esce dopo aver scritto .RI < numero > byte. .TP +.I "\-n nome " | " \-name nome" +Specifica il nome del vettore in output quando si usa \-i. Il vettore viene chiamato +\fInome\fP e la sua lunghezza viene chiamata \fInome\fP_len. +.TP +.I \-o incremento +Aggiunge +.RI < incremento > +alla posizione visualizzata dei byte del file. +.TP .IR \-p " | " \-ps " | " \-postscript " | " \-plain -L'output nello stile di un dump continuo sotto postscript. -Noto anche come stile esadecimale semplice [plain]. +L'output nello stile di un dump esadecimale continuo sotto postscript. Noto anche come stile esadecimale semplice. .TP .IR \-r " | " \-revert -ricostruzione: converte (o mette una patch) a partire dall'immagine -esadecimale, creando [o modificando] il file binario. -Se non diretto allo "standard output", xxd scrive nel suo file di output -in maniera continua, senza interruzioni. Usare la combinazione +Ricostruisce: converte (o mette una patch) da immagine esadecimale, a file binario. +Se non scrive sullo `standard output', xxd scrive nel file di output in maniera +continua, senza interruzioni. Usare la combinazione .I \-r \-p -per leggere dump in stile esadecimale semplice [plain], senza l'informazione -di numero di linea e senza un particolare tracciato di colonna. Degli spazi -o delle linee vuote possono essere inserite a piacere [e vengono ignorate]. +per leggere dump in stile esadecimale semplice, senza l'informazione del numero +di riga e senza un particolare tracciato di colonna. Spazi o righe vuote possono +essere presenti [e vengono ignorati]. .TP .I \-seek distanza Usato con l'opzione .IR \-r : (ricostruzione), .RI < distanza > -viene aggiunta alla posizione nel file trovata nella immagine -esadecimale. +viene aggiunta alla posizione nel file trovata nella immagine esadecimale. .TP .I \-s [+][\-]seek Inizia a .RI < seek > byte assoluti (o relativi) di distanza all'interno di input_file. -\fI+ \fRindica che il "seek" relativo alla posizione corrente nel file -"standard input" (non significativa quando non si legge da "standard input"). -\fI\- \fRindica che il "seek" dovrebbe posizionarsi ad quel numero di -caratteri dalla fine dell'input (o se in combinazione con -\fI+ \fR: prime della posizione corrente nel file "standard input"). -Se non si specifica una opzione \-s, xxd inizia alla posizione -corrente all'interno del file. +\fI+ \fRindica che il `seek' relativo alla posizione corrente nel file `standard input' +(non significativo quando non si legge da `standard input'). \fI\- \fRindica che il +`seek' dovrebbe posizionarsi al numero specificato di caratteri dalla fine dell'input +(o se in combinazione con \fI+ \fR: prima della posizione corrente nel file `standard input'). +Se non si specifica l'opzione \-s, xxd inizia dalla posizione corrente all'interno del file. .TP .I \-u -usa lettere esadecimali maiuscole. Il valore di default di usare -lettere minuscole. +Usa lettere esadecimali maiuscole. Per default si usano lettere minuscole. .TP .IR \-v " | " \-version -visualizza la stringa contenente la versione del programma. +Visualizza la stringa contenente la versione del programma. .SH ATTENZIONE .PP .I xxd \-r - capace di operare "magie" nell'utilizzare l'informazione "numero di linea". -Se sul file di output ci si pu posizionare usando la "seek", il numero di -linea all'inizio di ogni riga esadecimale pu essere non ordinato, delle -linee possono mancare delle linee, oppure esserci delle sovrapposizioni. -In simili casi xxd user lseek(2) per raggiungere la posizione d'inizio. -Se il file di output non consente di usare "seek", sono permessi solo dei -"buchi", che saranno riempiti con zeri binari. + capace di operare "magie" nell'utilizzare l'informazione "numero di riga". +Se possibili posizionarsi tramite `seek' sul file di output, il numero di riga +di ogni riga esadecimale pu essere non ordinato, delle righe possono mancare, o +sovrapporsi. In tal caso xxd user lseek(2) per posizionarsi all'interno del file. +Se per il file di output non si pu usare `seek', sono permessi solo dei "buchi", che saranno riempiti con zeri binari. .PP .I xxd \-r -non genera mai errori di specifica parametri. I parametri non riconosciuti -sono silenziosamente ignorati. +non genera mai errori per parametri errati. I parametri extra sono silenziosamente ignorati. .PP -Nel modificare immagini esadecimali, tenete conto che +Nel modificare immagini esadecimali, si tenga conto che .I xxd \-r -salta il resto della linea, dopo aver letto abbastanza caratteri contenenti -dati esadecimali (vedere opzione \-c). Ci implica pure che le modifiche alle -colonne di caratteri stampabili ascii (o ebcdic) sono sempre ignorate. -La ricostruzione da un file immagine esadecimale in stile semplice -(postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. -IN questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali - interpretata [e utilizzata]. +salta il resto della riga, dopo aver letto i caratteri contenenti dati esadecimali +(vedere opzione \-c). Ci implica pure che le modifiche alle colonne di caratteri +stampabili ASCII (o EBCDIC) sono sempre ignorate. La ricostruzione da un file immagine +esadecimale in stile semplice (postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. In questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali interpretata [e utilizzata]. .PP Notare la differenza fra .br @@ -183,53 +185,48 @@ e .PP .I xxd \-s \+seek pu comportarsi in modo diverso da -.IR "xxd \-s seek" -, perch lseek(2) usata per tornare indietro nel file di input. Il '+' -fa differenza se il file di input lo "standard input", e se la posizione nel -file di "standard input" non all'inizio del file quando xxd eseguito, -con questo input. -I seguenti esempi possono contribuire a chiarire il concetto -(o ad oscurarlo!)... +.IR "xxd \-s seek" , +perch lseek(2) usata per tornare indietro nel file di input. Il '+' +fa differenza se il file di input lo `standard input', e se la posizione nel +file di `standard input' non all'inizio del file quando xxd eseguito, e riceve input. +I seguenti esempi possono contribuire a chiarire il concetto (o ad oscurarlo!)... .PP -Riavvolge lo "standard input" prima di leggere; necessario perch `cat' -ha gi letto lo stesso file ["file"] fino alla fine dello "standard input". +Riavvolge lo `standard input' prima di leggere; necessario perch `cat' +ha gi letto lo stesso file fino alla fine dello `standard input'. .br -\fI% sh \-c 'cat > copia_normale; xxd \-s 0 > copia_esadecimale' < file +\fI% sh \-c "cat > copia_normale; xxd \-s 0 > copia_esadecimale" < file\fR .PP Stampa immagine esadecimale dalla posizione file 0x480 (=1024+128) in poi. Il segno `+' vuol dire "rispetto alla posizione corrente", quindi il `128' si aggiunge a 1k (1024) dove `dd' si era fermato. .br -\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +128 > esadecimale' < file +\fI% sh \-c "dd of=normale bs=1k count=1; xxd \-s +128 > esadecimale" < file\fR .PP -Immagine esadecimale dalla posizione 0x100 ( = 1024\-768 ) del file in avanti. +Immagine esadecimale dalla posizione 0x100 (=1024\-768 ) del file in avanti. .br -\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale' < file +\fI% sh \-c "dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale" < file .PP Comunque, questo capita raramente, e l'uso del `+' non serve quasi mai. -L'autore preferisce monitorare il comportamento di xxd con strace(1) o -truss(1), quando si usa l'opzione \-s. +L'autore preferisce monitorare il comportamento di xxd con strace(1) o truss(1), quando si usa l'opzione \-s. .SH ESEMPI .PP .br -Stampa tutto tranne le prime tre linee (0x30 byte esadecimali) di -.B file +Stampa tutto tranne le prime tre righe (0x30 byte in esadecimale) di +.BR file \. .br -\fI% xxd \-s 0x30 file +\fI% xxd \-s 0x30 file\fR .PP .br -Stampa 3 linee (0x30 byte esadecimali) alla fine di -.B file -\. +Stampa 3 righe (0x30 byte in esadecimale) alla fine di +.BR file . .br \fI% xxd \-s \-0x30 file .PP .br -Stampa 120 byte come immagine esadecimale continua con 20 byte per linea. +Stampa 120 byte come immagine esadecimale continua con 20 byte per riga. .br \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR - .br 2e54482058584420312022417567757374203139 .br @@ -245,11 +242,9 @@ Stampa 120 byte come immagine esadecimale continua con 20 byte per linea. .br .br -Stampa i primi 120 byte della pagina di manuale vim.1 a 12 byte per linea. +Stampa i primi 120 byte della pagina di manuale xxd.1 a 12 byte per riga. .br \fI% xxd \-l 120 \-c 12 xxd.1\fR - - .br 0000000: 2e54 4820 5858 4420 3120 2241 .TH XXD 1 "A .br @@ -285,13 +280,13 @@ su .B output_file premettendogli 100 byte a 0x00. .br -\fI% xxd input_file | xxd \-r \-s 100 \> output_file\fR +\fI% xxd input_file | xxd \-r \-s 100 > output_file\fR .br .br Modificare (patch) la data nel file xxd.1 .br -\fI% echo '0000037: 3574 68' | xxd \-r \- xxd.1\fR +\fI% echo "0000037: 3574 68" | xxd \-r \- xxd.1\fR .br \fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR .br @@ -299,9 +294,9 @@ Modificare (patch) la data nel file xxd.1 .PP .br Creare un file di 65537 byte tutto a 0x00, -tranne che l'ultimo carattere che una 'A' (esadecimale 0x41). +tranne l'ultimo carattere che una 'A' (esadecimale 0x41). .br -\fI% echo '010000: 41' | xxd \-r \> file\fR +\fI% echo "010000: 41" | xxd \-r > file\fR .PP .br Stampa una immagine esadecimale del file di cui sopra con opzione autoskip. @@ -314,34 +309,31 @@ Stampa una immagine esadecimale del file di cui sopra con opzione autoskip. .br 000fffc: 0000 0000 40 ....A .PP -Crea un file di 1 byte che contiene il solo carattere 'A'. +Creare un file di 1 byte che contiene il solo carattere 'A'. Il numero dopo '\-r \-s' viene aggiunto a quello trovato nel file; in pratica, i byte precedenti non sono stampati. .br -\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR +\fI% echo "010000: 41" | xxd \-r \-s \-0x10000 > file\fR .PP -Usa xxd come filtro all'interno di un editor come +Usare xxd come filtro all'interno di un editor come .B vim(1) -per ottenere una immagine esadecimale di una parte di file -delimitata dai marcatori `a' e `z'. +per ottenere l'immagine esadecimale della parte di file fra i marcatori `a' e `z'. .br \fI:'a,'z!xxd\fR .PP Usare xxd come filtro all'interno di un editor come .B vim(1) -per ricostruire un pezzo di file binario da una immagine esadecimale -delimitata dai marcatori `a' e `z'. +per ricostruire un pezzo di file binario da un'immagine esadecimale fra i marcatori `a' e `z'. .br \fI:'a,'z!xxd \-r\fR .PP Usare xxd come filtro all'interno di un editor come .B vim(1) -per ricostruire una sola linea di file binario da una immagine esadecimale, -Portare il cursore sopra la linea e battere: +per ricostruire una sola riga di file binario da un'immagine esadecimale. Portare il cursore sopra la riga e battere: .br \fI!!xxd \-r\fR .PP -Per leggere singoli caratteri da una linea seriale +Leggere singoli caratteri da una linea seriale .br \fI% xxd \-c1 < /dev/term/b &\fR .br @@ -356,7 +348,8 @@ Il programma pu nessun errore rilevato. .TP \-1 -operazione non supportata ( +operazione non supportata +\%(\c .I xxd \-r \-i non ancora possible). .TP @@ -370,14 +363,13 @@ problemi con il file di input. problemi con il file di output. .TP 4,5 -posizione "seek" specificata non raggiungibile all'interno del file. +posizione `seek' specificata non raggiungibile all'interno del file. .SH VEDERE ANCHE uuencode(1), uudecode(1), patch(1) .br .SH AVVERTIMENTI La stranezza dello strumento rispecchia la mente del suo creatore. -Usate a vostro rischio e pericolo. Copiate i file. Tracciate l'esecuzione. -Diventate un mago. +Usate a vostro rischio e pericolo. Copiate i file. Tracciate l'esecuzione. Diventate un mago. .br .SH VERSIONE Questa pagina di manuale documenta la versione 1.7 di xxd. @@ -393,7 +385,7 @@ fate soldi e condivideteli con me .br perdete soldi e non venite a chiederli a me. .PP -Pagina di manuale messa in piedi da Tony Nugent +Pagina di manuale iniziata da Tony Nugent .br .br diff --git a/runtime/doc/xxd-it.UTF-8.1 b/runtime/doc/xxd-it.UTF-8.1 index 8b0d53e1f9..5be512639c 100644 --- a/runtime/doc/xxd-it.UTF-8.1 +++ b/runtime/doc/xxd-it.UTF-8.1 @@ -6,7 +6,7 @@ .\" Modificato da Bram Moolenaar .SH NOME .I xxd -\- Produce esadecimale da un file binario o viceversa. +\- Produce lista esadecimale da un file binario o viceversa. .SH SINTASSI .B xxd \-h[elp] @@ -18,36 +18,33 @@ \-r[evert] [opzioni] [input_file [output_file]] .SH DESCRIZIONE .I xxd -crea un'immagine esadecimale di un dato file o dello "standard input". -Può anche ottenere da un'immagine esadecimale il file binario originale. +crea un'immagine esadecimale di un dato file o dello `standard input'. +Può anche ricostruire da un'immagine esadecimale il file binario originale. Come .BR uuencode (1) e .BR uudecode (1) -permette di trasmettere dati binari in una rappresentazione ASCII "a prova -di email", ma ha anche il vantaggio di poter decodificare sullo "standard -output". Inoltre, può essere usato per effettuare delle modifiche (patch) -a file binari. +permette di trasmettere dati binari in una rappresentazione ASCII `a prova +di email', ma ha anche il vantaggio di poter decodificare sullo `standard output'. +Inoltre, può essere usato per effettuare delle modifiche (patch) a file binari. .SH OPZIONI Se non si specifica un .I input_file -il programma legge dallo "standard input". +il programma legge dallo `standard input'. Se .I input_file è specificato come il carattere .RB \` \- ' -, l'input è letto dallo "standard input". +, l'input è letto dallo `standard input'. Se non si specifica un .I output_file (o si mette al suo posto il carattere .RB \` \- ' -), i risultati sono inviati allo "standard output". +), i risultati sono inviati allo `standard output'. .PP -Si noti che la scansione dei caratteri è "pigra", e non controlla oltre -la prima lettera dell'opzione, a meno che l'opzione sia seguita da un -parametro. -Gli spazi fra una singola lettera di opzione e il corrispondente parametro -dopo di essa sono facoltativi. +Si noti che la scansione dei caratteri è "pigra", e non controlla oltre la prima +lettera di un'opzione, a meno che l'opzione sia seguita da un parametro. +Gli spazi fra una singola lettera di opzione e il relativo parametro sono facoltativi. I parametri delle opzioni possono essere specificati usando la notazione decimale, esadecimale oppure ottale. Pertanto @@ -60,118 +57,123 @@ sono notazioni equivalenti fra loro. .PP .TP .IR \-a " | " \-autoskip -Richiesta di autoskip: Un singolo '*' rimpiazza linee di zeri binari. -Valore di default: off. +Richiesta di omissione: Un singolo '*' rimpiazza righe a zeri binari. Default: off. .TP .IR \-b " | " \-bits Richiesta di una immagine binaria (cifre binarie), invece che esadecimale. -Questa opzione scrive un byte come otto cifre "1" e "0" invece di usare i -numeri esadecimali. Ogni linea è preceduta da un indirizzo in esadecimale e -seguita da una decodifica ascii (o ebcdic). Le opzioni specificabili dalla -linea comando \-r, \-p, \-i non funzionano in questo modo. +Quest'opzione scrive un byte come otto cifre "1" e "0" invece di usare i +numeri esadecimali. Ogni riga è preceduta da un indirizzo in esadecimale e +seguita da una decodifica ASCII (o EBCDIC). Le opzioni specificabili dalla +riga comando \-r, \-p, \-i non funzionano in questo modo. .TP .IR "\-c colonne " | " \-cols colonne" -.IR "\-c colonne " | " \-cols colonne" -In ogni linea sono formattate +In ogni riga sono formattate .RI < colonne > colonne. Valore di default 16 (\-i: 12, \-ps: 30, \-b: 6). -Valore massimo 256. +Non c'è un valore massimo per \-ps; se si specifica 0 viene scritta un'unica lunga riga di output. +.TP +.IR \-C " | " \-capitalize +Mette in maiuscolo i nomi di variabili nello stile delle `include' C, se si usa \-i. .TP .IR \-E " | " \-EBCDIC Cambia la codifica della colonna di destra da ASCII a EBCDIC. Questo non modifica la rappresentazione esadecimale. Non ha senso -specificare questa opzione in combinazione con \-r, \-p o \-i. +specificare quest'opzione in combinazione con \-r, \-p o \-i. .TP -.IR "\-g numero_byte " | " \-groupsize numero_byte" -Inserisci ogni -.RI < numero_byte > -byte di output (di due caratteri esadecimali o otto numeri binari ognuno) -uno spazio bianco. +.IR \-e +Considera la lista esadecimale come avente codifica `little-endian'. +Quest'opzione tratta i gruppi di byte come parole in codifica `little-endian'. +Il raggruppamento di default dei byte a 4 a 4 può essere cambiato usando +.RI "" \-g . +Quest'opzione si applica solo alla lista esadecimale, Lasciando inalterata +la rappresentazione ASCII (or EBCDIC). +Le opzioni della riga di comando +\-r, \-p, \-i non funzionano in questa modalità. +.TP +.IR "\-g numero " | " \-groupsize numero" +Separa ogni gruppo di +.RI < numero > +byte in output (di due caratteri esadecimali o otto caratteri binari ognuno) con uno spazio bianco. Specificando .I \-g 0 i byte di output non sono separati da alcuno spazio. -.RI < numero_byte > ha come valore di default " 2 -in modalità normale [esadecimale] e \fI1\fP in modalità binaria. -Il raggruppamento non si applica agli stili "PostScript" e "include". +.RI < Numero "> ha come valore di default " 2 +in modalità normale [esadecimale], \fI4\fP in modalità `little-endian' e \fI1\fP in modalità binaria. +Il raggruppamento non si applica agli stili `PostScript' e `include'. .TP .IR \-h " | " \-help -stampa un sommario dei comandi disponibili ed esce. Non viene fatto -null'altro. +Stampa un sommario dei comandi disponibili ed esce. Non viene fatto null'altro. .TP .IR \-i " | " \-include -L'output è nello stile dei file "include" in C. Viene preparata la -definizione completa di un "array" [vettore], dandogli il nome del -file di input), tranne che nel caso in cui xxd legga dallo "standard input". +L'output è un file `include' in C. Viene preparata la definizione completa del +vettore (col nome del file di input), tranne quando xxd legga dallo `standard input'. .TP .IR "\-l numero " | " \-len numero" Il programma esce dopo aver scritto .RI < numero > byte. .TP +.I "\-n nome " | " \-name nome" +Specifica il nome del vettore in output quando si usa \-i. Il vettore viene chiamato +\fInome\fP e la sua lunghezza viene chiamata \fInome\fP_len. +.TP +.I \-o incremento +Aggiunge +.RI < incremento > +alla posizione visualizzata dei byte del file. +.TP .IR \-p " | " \-ps " | " \-postscript " | " \-plain -L'output è nello stile di un dump continuo sotto postscript. -Noto anche come stile esadecimale semplice [plain]. +L'output è nello stile di un dump esadecimale continuo sotto postscript. Noto anche come stile esadecimale semplice. .TP .IR \-r " | " \-revert -ricostruzione: converte (o mette una patch) a partire dall'immagine -esadecimale, creando [o modificando] il file binario. -Se non diretto allo "standard output", xxd scrive nel suo file di output -in maniera continua, senza interruzioni. Usare la combinazione +Ricostruisce: converte (o mette una patch) da immagine esadecimale, a file binario. +Se non scrive sullo `standard output', xxd scrive nel file di output in maniera +continua, senza interruzioni. Usare la combinazione .I \-r \-p -per leggere dump in stile esadecimale semplice [plain], senza l'informazione -di numero di linea e senza un particolare tracciato di colonna. Degli spazi -o delle linee vuote possono essere inserite a piacere [e vengono ignorate]. +per leggere dump in stile esadecimale semplice, senza l'informazione del numero +di riga e senza un particolare tracciato di colonna. Spazi o righe vuote possono +essere presenti [e vengono ignorati]. .TP .I \-seek distanza Usato con l'opzione .IR \-r : (ricostruzione), .RI < distanza > -viene aggiunta alla posizione nel file trovata nella immagine -esadecimale. +viene aggiunta alla posizione nel file trovata nella immagine esadecimale. .TP .I \-s [+][\-]seek Inizia a .RI < seek > byte assoluti (o relativi) di distanza all'interno di input_file. -\fI+ \fRindica che il "seek" è relativo alla posizione corrente nel file -"standard input" (non significativa quando non si legge da "standard input"). -\fI\- \fRindica che il "seek" dovrebbe posizionarsi ad quel numero di -caratteri dalla fine dell'input (o se in combinazione con -\fI+ \fR: prime della posizione corrente nel file "standard input"). -Se non si specifica una opzione \-s, xxd inizia alla posizione -corrente all'interno del file. +\fI+ \fRindica che il `seek' è relativo alla posizione corrente nel file `standard input' +(non significativo quando non si legge da `standard input'). \fI\- \fRindica che il +`seek' dovrebbe posizionarsi al numero specificato di caratteri dalla fine dell'input +(o se in combinazione con \fI+ \fR: prima della posizione corrente nel file `standard input'). +Se non si specifica l'opzione \-s, xxd inizia dalla posizione corrente all'interno del file. .TP .I \-u -usa lettere esadecimali maiuscole. Il valore di default è di usare -lettere minuscole. +Usa lettere esadecimali maiuscole. Per default si usano lettere minuscole. .TP .IR \-v " | " \-version -visualizza la stringa contenente la versione del programma. +Visualizza la stringa contenente la versione del programma. .SH ATTENZIONE .PP .I xxd \-r -è capace di operare "magie" nell'utilizzare l'informazione "numero di linea". -Se sul file di output ci si può posizionare usando la "seek", il numero di -linea all'inizio di ogni riga esadecimale può essere non ordinato, delle -linee possono mancare delle linee, oppure esserci delle sovrapposizioni. -In simili casi xxd userà lseek(2) per raggiungere la posizione d'inizio. -Se il file di output non consente di usare "seek", sono permessi solo dei -"buchi", che saranno riempiti con zeri binari. +è capace di operare "magie" nell'utilizzare l'informazione "numero di riga". +Se è possibili posizionarsi tramite `seek' sul file di output, il numero di riga +di ogni riga esadecimale può essere non ordinato, delle righe possono mancare, o +sovrapporsi. In tal caso xxd userà lseek(2) per posizionarsi all'interno del file. +Se per il file di output non si può usare `seek', sono permessi solo dei "buchi", che saranno riempiti con zeri binari. .PP .I xxd \-r -non genera mai errori di specifica parametri. I parametri non riconosciuti -sono silenziosamente ignorati. +non genera mai errori per parametri errati. I parametri extra sono silenziosamente ignorati. .PP -Nel modificare immagini esadecimali, tenete conto che +Nel modificare immagini esadecimali, si tenga conto che .I xxd \-r -salta il resto della linea, dopo aver letto abbastanza caratteri contenenti -dati esadecimali (vedere opzione \-c). Ciò implica pure che le modifiche alle -colonne di caratteri stampabili ascii (o ebcdic) sono sempre ignorate. -La ricostruzione da un file immagine esadecimale in stile semplice -(postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. -IN questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali -è interpretata [e utilizzata]. +salta il resto della riga, dopo aver letto i caratteri contenenti dati esadecimali +(vedere opzione \-c). Ciò implica pure che le modifiche alle colonne di caratteri +stampabili ASCII (o EBCDIC) sono sempre ignorate. La ricostruzione da un file immagine +esadecimale in stile semplice (postscript) con xxd \-r \-p non dipende dal numero corretto di colonne. In questo caso, qualsiasi cosa assomigli a una coppia di cifre esadecimali è interpretata [e utilizzata]. .PP Notare la differenza fra .br @@ -183,53 +185,48 @@ e .PP .I xxd \-s \+seek può comportarsi in modo diverso da -.IR "xxd \-s seek" -, perché lseek(2) è usata per tornare indietro nel file di input. Il '+' -fa differenza se il file di input è lo "standard input", e se la posizione nel -file di "standard input" non è all'inizio del file quando xxd è eseguito, -con questo input. -I seguenti esempi possono contribuire a chiarire il concetto -(o ad oscurarlo!)... +.IR "xxd \-s seek" , +perché lseek(2) è usata per tornare indietro nel file di input. Il '+' +fa differenza se il file di input è lo `standard input', e se la posizione nel +file di `standard input' non è all'inizio del file quando xxd è eseguito, e riceve input. +I seguenti esempi possono contribuire a chiarire il concetto (o ad oscurarlo!)... .PP -Riavvolge lo "standard input" prima di leggere; necessario perché `cat' -ha già letto lo stesso file ["file"] fino alla fine dello "standard input". +Riavvolge lo `standard input' prima di leggere; necessario perché `cat' +ha già letto lo stesso file fino alla fine dello `standard input'. .br -\fI% sh \-c 'cat > copia_normale; xxd \-s 0 > copia_esadecimale' < file +\fI% sh \-c "cat > copia_normale; xxd \-s 0 > copia_esadecimale" < file\fR .PP Stampa immagine esadecimale dalla posizione file 0x480 (=1024+128) in poi. Il segno `+' vuol dire "rispetto alla posizione corrente", quindi il `128' si aggiunge a 1k (1024) dove `dd' si era fermato. .br -\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +128 > esadecimale' < file +\fI% sh \-c "dd of=normale bs=1k count=1; xxd \-s +128 > esadecimale" < file\fR .PP -Immagine esadecimale dalla posizione 0x100 ( = 1024\-768 ) del file in avanti. +Immagine esadecimale dalla posizione 0x100 (=1024\-768 ) del file in avanti. .br -\fI% sh \-c 'dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale' < file +\fI% sh \-c "dd of=normale bs=1k count=1; xxd \-s +\-768 > esadecimale" < file .PP Comunque, questo capita raramente, e l'uso del `+' non serve quasi mai. -L'autore preferisce monitorare il comportamento di xxd con strace(1) o -truss(1), quando si usa l'opzione \-s. +L'autore preferisce monitorare il comportamento di xxd con strace(1) o truss(1), quando si usa l'opzione \-s. .SH ESEMPI .PP .br -Stampa tutto tranne le prime tre linee (0x30 byte esadecimali) di -.B file +Stampa tutto tranne le prime tre righe (0x30 byte in esadecimale) di +.BR file \. .br -\fI% xxd \-s 0x30 file +\fI% xxd \-s 0x30 file\fR .PP .br -Stampa 3 linee (0x30 byte esadecimali) alla fine di -.B file -\. +Stampa 3 righe (0x30 byte in esadecimale) alla fine di +.BR file . .br \fI% xxd \-s \-0x30 file .PP .br -Stampa 120 byte come immagine esadecimale continua con 20 byte per linea. +Stampa 120 byte come immagine esadecimale continua con 20 byte per riga. .br \fI% xxd \-l 120 \-ps \-c 20 xxd.1\fR - .br 2e54482058584420312022417567757374203139 .br @@ -245,11 +242,9 @@ Stampa 120 byte come immagine esadecimale continua con 20 byte per linea. .br .br -Stampa i primi 120 byte della pagina di manuale vim.1 a 12 byte per linea. +Stampa i primi 120 byte della pagina di manuale xxd.1 a 12 byte per riga. .br \fI% xxd \-l 120 \-c 12 xxd.1\fR - - .br 0000000: 2e54 4820 5858 4420 3120 2241 .TH XXD 1 "A .br @@ -285,13 +280,13 @@ su .B output_file premettendogli 100 byte a 0x00. .br -\fI% xxd input_file | xxd \-r \-s 100 \> output_file\fR +\fI% xxd input_file | xxd \-r \-s 100 > output_file\fR .br .br Modificare (patch) la data nel file xxd.1 .br -\fI% echo '0000037: 3574 68' | xxd \-r \- xxd.1\fR +\fI% echo "0000037: 3574 68" | xxd \-r \- xxd.1\fR .br \fI% xxd \-s 0x36 \-l 13 \-c 13 xxd.1\fR .br @@ -299,9 +294,9 @@ Modificare (patch) la data nel file xxd.1 .PP .br Creare un file di 65537 byte tutto a 0x00, -tranne che l'ultimo carattere che è una 'A' (esadecimale 0x41). +tranne l'ultimo carattere che è una 'A' (esadecimale 0x41). .br -\fI% echo '010000: 41' | xxd \-r \> file\fR +\fI% echo "010000: 41" | xxd \-r > file\fR .PP .br Stampa una immagine esadecimale del file di cui sopra con opzione autoskip. @@ -314,34 +309,31 @@ Stampa una immagine esadecimale del file di cui sopra con opzione autoskip. .br 000fffc: 0000 0000 40 ....A .PP -Crea un file di 1 byte che contiene il solo carattere 'A'. +Creare un file di 1 byte che contiene il solo carattere 'A'. Il numero dopo '\-r \-s' viene aggiunto a quello trovato nel file; in pratica, i byte precedenti non sono stampati. .br -\fI% echo '010000: 41' | xxd \-r \-s \-0x10000 \> file\fR +\fI% echo "010000: 41" | xxd \-r \-s \-0x10000 > file\fR .PP -Usa xxd come filtro all'interno di un editor come +Usare xxd come filtro all'interno di un editor come .B vim(1) -per ottenere una immagine esadecimale di una parte di file -delimitata dai marcatori `a' e `z'. +per ottenere l'immagine esadecimale della parte di file fra i marcatori `a' e `z'. .br \fI:'a,'z!xxd\fR .PP Usare xxd come filtro all'interno di un editor come .B vim(1) -per ricostruire un pezzo di file binario da una immagine esadecimale -delimitata dai marcatori `a' e `z'. +per ricostruire un pezzo di file binario da un'immagine esadecimale fra i marcatori `a' e `z'. .br \fI:'a,'z!xxd \-r\fR .PP Usare xxd come filtro all'interno di un editor come .B vim(1) -per ricostruire una sola linea di file binario da una immagine esadecimale, -Portare il cursore sopra la linea e battere: +per ricostruire una sola riga di file binario da un'immagine esadecimale. Portare il cursore sopra la riga e battere: .br \fI!!xxd \-r\fR .PP -Per leggere singoli caratteri da una linea seriale +Leggere singoli caratteri da una linea seriale .br \fI% xxd \-c1 < /dev/term/b &\fR .br @@ -356,7 +348,8 @@ Il programma può restituire questi codici di errore: nessun errore rilevato. .TP \-1 -operazione non supportata ( +operazione non supportata +\%(\c .I xxd \-r \-i non ancora possible). .TP @@ -370,14 +363,13 @@ problemi con il file di input. problemi con il file di output. .TP 4,5 -posizione "seek" specificata non raggiungibile all'interno del file. +posizione `seek' specificata non raggiungibile all'interno del file. .SH VEDERE ANCHE uuencode(1), uudecode(1), patch(1) .br .SH AVVERTIMENTI La stranezza dello strumento rispecchia la mente del suo creatore. -Usate a vostro rischio e pericolo. Copiate i file. Tracciate l'esecuzione. -Diventate un mago. +Usate a vostro rischio e pericolo. Copiate i file. Tracciate l'esecuzione. Diventate un mago. .br .SH VERSIONE Questa pagina di manuale documenta la versione 1.7 di xxd. @@ -393,7 +385,7 @@ fate soldi e condivideteli con me .br perdete soldi e non venite a chiederli a me. .PP -Pagina di manuale messa in piedi da Tony Nugent +Pagina di manuale iniziata da Tony Nugent .br .br diff --git a/runtime/doc/xxd.1 b/runtime/doc/xxd.1 index 0e7f64fedd..9ae132b324 100644 --- a/runtime/doc/xxd.1 +++ b/runtime/doc/xxd.1 @@ -135,6 +135,12 @@ to read plain hexadecimal dumps without line number information and without a particular column layout. Additional whitespace and line breaks are allowed anywhere. .TP +.IR \-R " "[WHEN] +In output the hex-value and the value are both colored with the same color depending on the hex-value. Mostly helping to differentiate printable and non-printable characters. +.I WHEN +is +.BR never ", " always ", or " auto . +.TP .I \-seek offset When used after .IR \-r : diff --git a/runtime/filetype.vim b/runtime/filetype.vim index a434503418..81764c1b59 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -209,9 +209,6 @@ au BufNewFile,BufRead *.bi,*.bm call dist#ft#FTbas() " Bass au BufNewFile,BufRead *.bass setf bass -" Visual Basic Script (close to Visual Basic) or Visual Basic .NET -au BufNewFile,BufRead *.vb,*.vbs,*.dsm,*.ctl setf vb - " IBasic file (similar to QBasic) au BufNewFile,BufRead *.iba,*.ibi setf ibasic @@ -1410,6 +1407,9 @@ au BufNewFile,BufRead *.ninja setf ninja " Nix au BufRead,BufNewFile *.nix setf nix +" Norg +au BufNewFile,BufRead *.norg setf norg + " NPM RC file au BufNewFile,BufRead npmrc,.npmrc setf dosini @@ -2376,7 +2376,7 @@ au BufNewFile,BufRead *.tape setf vhs au BufNewFile,BufRead *.hdl,*.vhd,*.vhdl,*.vbe,*.vst,*.vho setf vhdl " Vim script -au BufNewFile,BufRead *.vim,*.vba,.exrc,_exrc setf vim +au BufNewFile,BufRead *.vim,.exrc,_exrc setf vim " Viminfo file au BufNewFile,BufRead .viminfo,_viminfo setf viminfo @@ -2389,10 +2389,31 @@ au BufRead,BufNewFile *.hw,*.module,*.pkg \ setf virata | \ endif -" Visual Basic (also uses *.bas) or FORM +" Visual Basic (see also *.bas *.cls) + +" Visual Basic or FORM au BufNewFile,BufRead *.frm call dist#ft#FTfrm() -" SaxBasic is close to Visual Basic +" Visual Basic +" user control, ActiveX document form, active designer, property page +au BufNewFile,BufRead *.ctl,*.dob,*.dsr,*.pag setf vb + +" Visual Basic or Vimball Archiver +au BufNewFile,BufRead *.vba call dist#ft#FTvba() + +" Visual Basic Project +au BufNewFile,BufRead *.vbp setf dosini + +" VBScript (close to Visual Basic) +au BufNewFile,BufRead *.vbs setf vb + +" Visual Basic .NET (close to Visual Basic) +au BufNewFile,BufRead *.vb setf vb + +" Visual Studio Macro +au BufNewFile,BufRead *.dsm setf vb + +" SaxBasic (close to Visual Basic) au BufNewFile,BufRead *.sba setf vb " Vgrindefs file diff --git a/runtime/ftplugin/abap.vim b/runtime/ftplugin/abap.vim index 956b002ecd..61db8093fb 100644 --- a/runtime/ftplugin/abap.vim +++ b/runtime/ftplugin/abap.vim @@ -3,6 +3,7 @@ " Author: Steven Oliver " Copyright: Copyright (c) 2013 Steven Oliver " License: You may redistribute this under the same terms as Vim itself +" Last Change: 2023 Aug 28 by Vim Project (undo_ftplugin) " -------------------------------------------------------------------------- " Only do this when not done yet for this buffer @@ -17,10 +18,13 @@ set cpo&vim setlocal softtabstop=2 shiftwidth=2 setlocal suffixesadd=.abap +let b:undo_ftplugin = "setl sts< sua< sw<" + " Windows allows you to filter the open file dialog if has("gui_win32") && !exists("b:browsefilter") let b:browsefilter = "ABAP Source Files (*.abap)\t*.abap\n" . \ "All Files (*.*)\t*.*\n" + let b:undo_ftplugin .= " | unlet! b:browsefilter" endif let &cpo = s:cpo_save diff --git a/runtime/ftplugin/art.vim b/runtime/ftplugin/art.vim index c501a992d8..41b02a94e5 100644 --- a/runtime/ftplugin/art.vim +++ b/runtime/ftplugin/art.vim @@ -3,6 +3,7 @@ " Maintainer: Dorai Sitaram " URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html " Last Change: Apr 2, 2003 +" 2023 Aug 28 by Vim Project (undo_ftplugin) " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -13,3 +14,5 @@ run ftplugin/lisp.vim setl lw-=if setl lw+=def-art-fun,deffacts,defglobal,defrule,defschema,for,schema,while + +let b:undo_ftplugin ..= " | setl lw<" diff --git a/runtime/ftplugin/asm.vim b/runtime/ftplugin/asm.vim index 0914bf634a..f6a92d57d7 100644 --- a/runtime/ftplugin/asm.vim +++ b/runtime/ftplugin/asm.vim @@ -1,11 +1,13 @@ " Vim filetype plugin file " Language: asm " Maintainer: Colin Caine -" Last Changed: 23 May 2020 +" Last Change: 23 May 2020 +" 2023 Aug 28 by Vim Project (undo_ftplugin) if exists("b:did_ftplugin") | finish | endif +let b:did_ftplugin = 1 setl comments=:;,s1:/*,mb:*,ex:*/,:// setl commentstring=;%s -let b:did_ftplugin = 1 +let b:undo_ftplugin = "setl commentstring< comments<" diff --git a/runtime/ftplugin/bash.vim b/runtime/ftplugin/bash.vim index 7bd9787b6c..7be1eca2a9 100644 --- a/runtime/ftplugin/bash.vim +++ b/runtime/ftplugin/bash.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file " Language: bash -" Maintainer: Bram Moolenaar -" Last Changed: 2019 Jan 12 +" Maintainer: The Vim Project +" Last Changed: 2023 Aug 13 " " This is not a real filetype plugin. It allows for someone to set 'filetype' " to "bash" in the modeline, and gets the effect of filetype "sh" with diff --git a/runtime/ftplugin/bzl.vim b/runtime/ftplugin/bzl.vim index 8ab876e9d6..716b3890b1 100644 --- a/runtime/ftplugin/bzl.vim +++ b/runtime/ftplugin/bzl.vim @@ -2,6 +2,7 @@ " Language: Bazel (http://bazel.io) " Maintainer: David Barnett (https://github.com/google/vim-ft-bzl) " Last Change: 2021 Jan 19 +" 2023 Aug 28 by Vim Project (undo_ftplugin) "" " @section Introduction, intro @@ -41,6 +42,9 @@ let &l:tabstop = s:save_tabstop setlocal formatoptions-=t +" Initially defined in the python ftplugin sourced above +let b:undo_ftplugin .= " | setlocal fo<" + " Make gf work with imports in BUILD files. setlocal includeexpr=substitute(v:fname,'//','','') @@ -48,6 +52,7 @@ setlocal includeexpr=substitute(v:fname,'//','','') if get(g:, 'ft_bzl_fold', 0) setlocal foldmethod=syntax setlocal foldtext=BzlFoldText() + let b:undo_ftplugin .= " | setlocal fdm< fdt<" endif if exists('*BzlFoldText') diff --git a/runtime/ftplugin/debchangelog.vim b/runtime/ftplugin/debchangelog.vim index 062fc054c8..dca7f7355a 100644 --- a/runtime/ftplugin/debchangelog.vim +++ b/runtime/ftplugin/debchangelog.vim @@ -122,7 +122,7 @@ function NewVersion() normal! 1G0 call search(')') normal! h - " ':normal' doens't support key annotation () directly. + " ':normal' doesn't support key annotation () directly. " Vim's manual recommends using ':exe' to use key annotation indirectly (backslash-escaping needed though). exe "normal! \" call setline(1, substitute(getline(1), '-\$\$', '-', '')) diff --git a/runtime/ftplugin/dune.vim b/runtime/ftplugin/dune.vim index 86c99c097f..6e20a8fabb 100644 --- a/runtime/ftplugin/dune.vim +++ b/runtime/ftplugin/dune.vim @@ -3,8 +3,9 @@ " Anton Kochkov " URL: https://github.com/ocaml/vim-ocaml " Last Change: -" 2018 Nov 3 - Added commentstring (Markus Mottl) -" 2017 Sep 6 - Initial version (Etienne Millon) +" 2023 Aug 28 - Added undo_ftplugin (Vim Project) +" 2018 Nov 03 - Added commentstring (Markus Mottl) +" 2017 Sep 06 - Initial version (Etienne Millon) if exists("b:did_ftplugin") finish @@ -18,3 +19,5 @@ setl commentstring=;\ %s setl comments=:; setl iskeyword+=#,?,.,/ + +let b:undo_ftplugin = "setl lisp< cms< com< isk<" diff --git a/runtime/ftplugin/fish.vim b/runtime/ftplugin/fish.vim index 7acbf44210..f06ad3a0bf 100644 --- a/runtime/ftplugin/fish.vim +++ b/runtime/ftplugin/fish.vim @@ -3,6 +3,7 @@ " Maintainer: Nicholas Boyle (github.com/nickeb96) " Repository: https://github.com/nickeb96/fish.vim " Last Change: February 1, 2023 +" 2023 Aug 28 by Vim Project (undo_ftplugin) if exists("b:did_ftplugin") finish @@ -13,3 +14,5 @@ setlocal iskeyword=@,48-57,_,192-255,-,. setlocal comments=:# setlocal commentstring=#%s setlocal formatoptions+=crjq + +let b:undo_ftplugin = "setl cms< com< fo< isk<" diff --git a/runtime/ftplugin/forth.vim b/runtime/ftplugin/forth.vim new file mode 100644 index 0000000000..5343784a21 --- /dev/null +++ b/runtime/ftplugin/forth.vim @@ -0,0 +1,71 @@ +" Vim filetype plugin +" Language: Forth +" Maintainer: Johan Kotlinski +" Last Change: 2023 Aug 08 +" URL: https://github.com/jkotlinski/forth.vim + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let s:cpo_save = &cpo +set cpo&vim + +setlocal commentstring=\\\ %s +setlocal comments=s:(,mb:\ ,e:),b:\\ +setlocal iskeyword=33-126,128-255 + +let s:include_patterns =<< trim EOL + + \<\%(INCLUDE\|REQUIRE\)\>\s\+\zs\k\+\ze + \ +EOL +let &l:include = $'\c{ s:include_patterns[1:]->join('\|') }' + +let s:define_patterns =<< trim EOL + : + [2F]\=CONSTANT + [2F]\=VALUE + [2F]\=VARIABLE + BEGIN-STRUCTURE + BUFFER: + CODE + CREATE + MARKER + SYNONYM +EOL +let &l:define = $'\c\<\%({ s:define_patterns->join('\|') }\)' + +" assume consistent intra-project file extensions +let &l:suffixesadd = "." .. expand("%:e") + +let b:undo_ftplugin = "setl cms< com< def< inc< isk< sua<" + +if exists("loaded_matchit") && !exists("b:match_words") + let s:matchit_patterns =<< trim EOL + + \<\:\%(NONAME\)\=\>:\:\<;\> + \:\:\ + \<\[IF]\>:\<\[ELSE]\>:\<\[THEN]\> + \:\:\<+\=LOOP\> + \:\ + \:\ + \:\:\<\%(AGAIN\|REPEAT\|UNTIL\)\> + \:\ + \:\ + EOL + let b:match_ignorecase = 1 + let b:match_words = s:matchit_patterns[1:]->join(',') + let b:undo_ftplugin ..= "| unlet! b:match_ignorecase b:match_words" +endif + +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") + let b:browsefilter = "Forth Source Files (*.f *.fs *.ft *.fth *.4th)\t*.f;*.fs;*.ft;*.fth;*.4th\n" .. + \ "All Files (*.*)\t*.*\n" + let b:undo_ftplugin ..= " | unlet! b:browsefilter" +endif + +let &cpo = s:cpo_save +unlet s:cpo_save +unlet s:define_patterns s:include_patterns s:matchit_patterns diff --git a/runtime/ftplugin/gpg.vim b/runtime/ftplugin/gpg.vim index 3f890e58f6..2415555e09 100644 --- a/runtime/ftplugin/gpg.vim +++ b/runtime/ftplugin/gpg.vim @@ -15,5 +15,22 @@ let b:undo_ftplugin = "setl com< cms< fo<" setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+--' . . '\b'' --hilite-search" man ' . 'gpg' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+--' . . '\b', '\') . ''' --hilite-search" man ' . 'gpg' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif + let &cpo = s:cpo_save unlet s:cpo_save + diff --git a/runtime/ftplugin/hare.vim b/runtime/ftplugin/hare.vim index bb10daf38c..0200ba5913 100644 --- a/runtime/ftplugin/hare.vim +++ b/runtime/ftplugin/hare.vim @@ -2,26 +2,34 @@ " Language: Hare " Maintainer: Amelia Clarke " Previous Maintainer: Drew DeVault -" Last Updated: 2022-09-21 +" Last Updated: 2022-09-28 +" 2023 Aug 28 by Vim Project (undo_ftplugin) -" Only do this when not done yet for this buffer if exists('b:did_ftplugin') finish endif - -" Don't load another plugin for this buffer let b:did_ftplugin = 1 -setlocal noexpandtab -setlocal tabstop=8 -setlocal shiftwidth=0 -setlocal softtabstop=0 -setlocal textwidth=80 -setlocal commentstring=//\ %s +" Formatting settings. +setlocal formatoptions-=t formatoptions+=croql/ -" Set 'formatoptions' to break comment lines but not other lines, -" and insert the comment leader when hitting or using "o". -setlocal fo-=t fo+=croql +" Miscellaneous. +setlocal comments=:// +setlocal commentstring=//\ %s +setlocal suffixesadd=.ha + +let b:undo_ftplugin = "setl cms< com< fo< sua<" + +" Hare recommended style. +if get(g:, "hare_recommended_style", 1) + setlocal noexpandtab + setlocal shiftwidth=8 + setlocal softtabstop=0 + setlocal tabstop=8 + setlocal textwidth=80 + let b:undo_ftplugin ..= " | setl et< sts< sw< ts< tw<" +endif compiler hare -" vim: tabstop=2 shiftwidth=2 expandtab + +" vim: et sw=2 sts=2 ts=8 diff --git a/runtime/ftplugin/heex.vim b/runtime/ftplugin/heex.vim index f79c69d2aa..becc071c37 100644 --- a/runtime/ftplugin/heex.vim +++ b/runtime/ftplugin/heex.vim @@ -18,7 +18,7 @@ let b:undo_ftplugin = 'set sw< sts< et< com< cms<' " HTML: thanks to Johannes Zellner and Benji Fisher. if exists("loaded_matchit") && !exists("b:match_words") let b:match_ignorecase = 1 - let b:match_words = ',' .. + let b:match_words = '<%\{-}!--:--%\{-}>,' .. \ '<:>,' .. \ '<\@<=[ou]l\>[^>]*\%(>\|$\):<\@<=li\>:<\@<=/[ou]l>,' .. \ '<\@<=dl\>[^>]*\%(>\|$\):<\@<=d[td]\>:<\@<=/dl>,' .. diff --git a/runtime/ftplugin/ishd.vim b/runtime/ftplugin/ishd.vim index 33ef1510b5..b160349033 100644 --- a/runtime/ftplugin/ishd.vim +++ b/runtime/ftplugin/ishd.vim @@ -1,32 +1,37 @@ " Vim filetype plugin file -" Language: InstallShield (ft=ishd) -" Maintainer: Johannes Zellner -" Last Change: Sat, 24 May 2003 11:55:36 CEST +" Language: InstallShield (ft=ishd) +" Maintainer: Doug Kearns +" Previous Maintainer: Johannes Zellner +" Last Change: 2023 Aug 28 if exists("b:did_ftplugin") | finish | endif let b:did_ftplugin = 1 -setlocal foldmethod=syntax - " Using line continuation here. let s:cpo_save = &cpo set cpo-=C +setlocal foldmethod=syntax + +let b:undo_ftplugin = "setl fdm<" + " matchit support if exists("loaded_matchit") - let b:match_ignorecase=0 - let b:match_words= + let b:match_ignorecase = 0 + let b:match_words = \ '\%(^\s*\)\@<=\\s\+[^()]\+\s*(:\%(^\s*\)\@<=\\s*$:\%(^\s*\)\@<=\:\%(^\s*\)\@<=\\s*;\s*$,' . \ '\%(^\s*\)\@<=\\s*$:\%(^\s*\)\@<=\\s\+.\{-}\s*;\s*$,' . \ '\%(^\s*\)\@<=\\s*(.\{-}):\%(^\s*\)\@<=\<\%(case\|default\)\>:\%(^\s*\)\@<=\\s*;\s*$,' . \ '\%(^\s*\)\@<=\\s*(.\{-}):\%(^\s*\)\@<=\\s*;\s*$,' . \ '\%(^\s*\)\@<=\.\{-}\<\%(to\|downto\)\>:\%(^\s*\)\@<=\\s*;\s*$,' . \ '\%(^\s*\)\@<=\\s*(.\{-})\s*then:\%(^\s*\)\@<=\\s*([^)]*)\s*then:\%(^\s*\)\@<=\:\%(^\s*\)\@<=\\s*;\s*$' + let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words" endif -if has("gui_win32") && !exists("b:browsefilter") +if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:browsefilter = "InstallShield Files (*.rul)\t*.rul\n" . - \ "All Files (*.*)\t*.*\n" + \ "All Files (*.*)\t*\n" + let b:undo_ftplugin .= " | unlet! b:browsefilter" endif let &cpo = s:cpo_save diff --git a/runtime/ftplugin/lprolog.vim b/runtime/ftplugin/lprolog.vim index a8a3c612c1..1075a9c813 100644 --- a/runtime/ftplugin/lprolog.vim +++ b/runtime/ftplugin/lprolog.vim @@ -2,7 +2,8 @@ " Language: LambdaProlog (Teyjus) " Maintainer: Markus Mottl " URL: http://www.ocaml.info/vim/ftplugin/lprolog.vim -" Last Change: 2006 Feb 05 +" Last Change: 2023 Aug 28 - added undo_ftplugin (Vim Project) +" 2006 Feb 05 " 2001 Sep 16 - fixed 'no_mail_maps'-bug (MM) " 2001 Sep 02 - initial release (MM) @@ -15,11 +16,13 @@ endif let b:did_ftplugin = 1 " Error format -setlocal efm=%+A./%f:%l.%c:\ %m formatprg=fmt\ -w75\ -p\\% +setlocal efm=%+A./%f:%l.%c:\ %m " Formatting of comments setlocal formatprg=fmt\ -w75\ -p\\% +let b:undo_ftplugin = "setlocal efm< fp<" + " Add mappings, unless the user didn't want this. if !exists("no_plugin_maps") && !exists("no_lprolog_maps") " Uncommenting @@ -28,6 +31,11 @@ if !exists("no_plugin_maps") && !exists("no_lprolog_maps") vmap c BUncomOn nmap C LUncomOff vmap C BUncomOff + let b:undo_ftplugin ..= + \ " | silent! execute 'nunmap c'" .. + \ " | silent! execute 'vunmap c'" .. + \ " | silent! execute 'nunmap C'" .. + \ " | silent! execute 'vunmap C'" endif nnoremap LUncomOn mz0i/* $A */`z diff --git a/runtime/ftplugin/modconf.vim b/runtime/ftplugin/modconf.vim index c8e76b538b..d5eda5af21 100644 --- a/runtime/ftplugin/modconf.vim +++ b/runtime/ftplugin/modconf.vim @@ -16,5 +16,21 @@ let b:undo_ftplugin = "setl com< cms< inc< fo<" setlocal comments=:# commentstring=#\ %s include=^\\s*include setlocal formatoptions-=t formatoptions+=croql +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . . '\b'' --hilite-search" man ' . 'modprobe.d' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'modprobe.d' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/muttrc.vim b/runtime/ftplugin/muttrc.vim index c8ad0f2ec5..7a4eb7a8bb 100644 --- a/runtime/ftplugin/muttrc.vim +++ b/runtime/ftplugin/muttrc.vim @@ -18,5 +18,21 @@ setlocal formatoptions-=t formatoptions+=croql let &l:include = '^\s*source\>' +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '\b'' --hilite-search" man ' . 'muttrc' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . 'muttrc' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/nginx.vim b/runtime/ftplugin/nginx.vim index e808db1277..525d0fdccf 100644 --- a/runtime/ftplugin/nginx.vim +++ b/runtime/ftplugin/nginx.vim @@ -2,5 +2,8 @@ " Language: nginx.conf " Maintainer: Chris Aumann " Last Change: Apr 15, 2017 +" 2023 Aug 28 by Vim Project (undo_ftplugin) setlocal commentstring=#\ %s + +let b:undo_ftplugin = "setlocal commentstring<" diff --git a/runtime/ftplugin/pbtxt.vim b/runtime/ftplugin/pbtxt.vim index e3c1bf7650..56c2553ca8 100644 --- a/runtime/ftplugin/pbtxt.vim +++ b/runtime/ftplugin/pbtxt.vim @@ -2,20 +2,16 @@ " Language: Protobuf Text Format " Maintainer: Lakshay Garg " Last Change: 2020 Nov 17 +" 2023 Aug 28 by Vim Project (undo_ftplugin) " Homepage: https://github.com/lakshayg/vim-pbtxt if exists("b:did_ftplugin") finish endif - let b:did_ftplugin = 1 -let s:cpo_save = &cpo -set cpo&vim - setlocal commentstring=#\ %s -let &cpo = s:cpo_save -unlet s:cpo_save +let b:undo_ftplugin = "setlocal commentstring<" " vim: nowrap sw=2 sts=2 ts=8 noet diff --git a/runtime/ftplugin/perl.vim b/runtime/ftplugin/perl.vim index d0bdbc0cfb..edc7b960f1 100644 --- a/runtime/ftplugin/perl.vim +++ b/runtime/ftplugin/perl.vim @@ -54,7 +54,8 @@ endif " Set this once, globally. if !exists("perlpath") - if executable("perl") + " safety check: don't execute perl from current directory + if executable("perl") && fnamemodify(exepath("perl"), ":p:h") != getcwd() try if &shellxquote != '"' let perlpath = system('perl -e "print join(q/,/,@INC)"') diff --git a/runtime/ftplugin/readline.vim b/runtime/ftplugin/readline.vim index eba7122347..a696da2701 100644 --- a/runtime/ftplugin/readline.vim +++ b/runtime/ftplugin/readline.vim @@ -25,11 +25,27 @@ if exists("loaded_matchit") && !exists("b:match_words") endif if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") - let b:browsefilter = "Readline Intialization Files (inputrc .inputrc)\tinputrc;*.inputrc\n" .. + let b:browsefilter = "Readline Initialization Files (inputrc .inputrc)\tinputrc;*.inputrc\n" .. \ "All Files (*.*)\t*.*\n" let b:undo_ftplugin ..= " | unlet! b:browsefilter" endif +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '\b'' --hilite-search" man ' . '3 readline' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '\b', '\') . ''' --hilite-search" man ' . '3 readline' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/rst.vim b/runtime/ftplugin/rst.vim index ff7a402d10..c88e8f2580 100644 --- a/runtime/ftplugin/rst.vim +++ b/runtime/ftplugin/rst.vim @@ -28,7 +28,7 @@ setlocal formatoptions+=tcroql " directives (..) and ordered lists (1.), although it can cause problems for " many other cases. " -" More sophisticated indentation rules should be revisted in the future. +" More sophisticated indentation rules should be revisited in the future. if exists("g:rst_style") && g:rst_style != 0 setlocal expandtab shiftwidth=3 softtabstop=3 tabstop=8 diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim index 8c1f47731c..f4e1f60438 100644 --- a/runtime/ftplugin/ruby.vim +++ b/runtime/ftplugin/ruby.vim @@ -99,41 +99,51 @@ function! s:build_path(path) abort return path endfunction -if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h')) - let s:version_file = findfile('.ruby-version', '.;') - if !empty(s:version_file) && filereadable(s:version_file) - let b:ruby_version = get(readfile(s:version_file, '', 1), '') - if !has_key(g:ruby_version_paths, b:ruby_version) - let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h')) - endif - endif +let s:execute_ruby = 1 +" Security Check, don't execute ruby from the current directory +if fnamemodify(exepath("ruby"), ":p:h") ==# getcwd() + let s:execute_ruby = 0 endif -if exists("g:ruby_path") - let s:ruby_path = type(g:ruby_path) == type([]) ? join(g:ruby_path, ',') : g:ruby_path -elseif has_key(g:ruby_version_paths, get(b:, 'ruby_version', '')) - let s:ruby_paths = g:ruby_version_paths[b:ruby_version] - let s:ruby_path = s:build_path(s:ruby_paths) -else - if !exists('g:ruby_default_path') - if has("ruby") && has("win32") - ruby ::VIM::command( 'let g:ruby_default_path = split("%s",",")' % $:.join(%q{,}) ) - elseif executable('ruby') && !empty($HOME) - let g:ruby_default_path = s:query_path($HOME) - else - let g:ruby_default_path = map(split($RUBYLIB,':'), 'v:val ==# "." ? "" : v:val') +function SetRubyPath() + if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h')) + let s:version_file = findfile('.ruby-version', '.;') + if !empty(s:version_file) && filereadable(s:version_file) && s:execute_ruby + let b:ruby_version = get(readfile(s:version_file, '', 1), '') + if !has_key(g:ruby_version_paths, b:ruby_version) + let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h')) + endif endif endif - let s:ruby_paths = g:ruby_default_path - let s:ruby_path = s:build_path(s:ruby_paths) -endif -if stridx(&l:path, s:ruby_path) == -1 - let &l:path = s:ruby_path -endif -if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val."/tags"'),',')) == -1 - let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',') -endif + if exists("g:ruby_path") + let s:ruby_path = type(g:ruby_path) == type([]) ? join(g:ruby_path, ',') : g:ruby_path + elseif has_key(g:ruby_version_paths, get(b:, 'ruby_version', '')) && s:execute_ruby + let s:ruby_paths = g:ruby_version_paths[b:ruby_version] + let s:ruby_path = s:build_path(s:ruby_paths) + else + if !exists('g:ruby_default_path') + if has("ruby") && has("win32") + ruby ::VIM::command( 'let g:ruby_default_path = split("%s",",")' % $:.join(%q{,}) ) + elseif executable('ruby') && !empty($HOME) && s:execute_ruby + let g:ruby_default_path = s:query_path($HOME) + else + let g:ruby_default_path = map(split($RUBYLIB,':'), 'v:val ==# "." ? "" : v:val') + endif + endif + let s:ruby_paths = g:ruby_default_path + let s:ruby_path = s:build_path(s:ruby_paths) + endif + + if stridx(&l:path, s:ruby_path) == -1 + let &l:path = s:ruby_path + endif + if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val."/tags"'),',')) == -1 + let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',') + endif +endfunction + +call SetRubyPath() if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") let b:browsefilter = "Ruby Source Files (*.rb)\t*.rb\n" . diff --git a/runtime/ftplugin/scala.vim b/runtime/ftplugin/scala.vim index b484df99f3..769499cfc1 100644 --- a/runtime/ftplugin/scala.vim +++ b/runtime/ftplugin/scala.vim @@ -4,6 +4,7 @@ " URL: https://github.com/derekwyatt/vim-scala " License: Same as Vim " Last Change: 11 August 2021 +" 2023 Aug 28 by Vim Project (undo_ftplugin) " ---------------------------------------------------------------------------- if exists('b:did_ftplugin') || &cp @@ -32,4 +33,6 @@ setlocal includeexpr=substitute(v:fname,'\\.','/','g') setlocal path+=src/main/scala,src/test/scala setlocal suffixesadd=.scala +let b:undo_ftplugin = "setlocal cms< com< et< fo< inc< inex< pa< sts< sua< sw<" + " vim:set sw=2 sts=2 ts=8 et: diff --git a/runtime/ftplugin/sexplib.vim b/runtime/ftplugin/sexplib.vim index 27e1b28370..b0767ef559 100644 --- a/runtime/ftplugin/sexplib.vim +++ b/runtime/ftplugin/sexplib.vim @@ -3,6 +3,7 @@ " Maintainer: Markus Mottl " URL: https://github.com/ocaml/vim-ocaml " Last Change: +" 2023 Aug 28 - Added undo_ftplugin (Vim Project) " 2017 Apr 12 - First version (MM) if exists("b:did_ftplugin") @@ -13,3 +14,5 @@ let b:did_ftplugin=1 " Comment string setl commentstring=;\ %s setl comments=:; + +let b:undo_ftplugin = "setl cms< com<" diff --git a/runtime/ftplugin/sh.vim b/runtime/ftplugin/sh.vim index b6fdb8f3e2..4409f3f90c 100644 --- a/runtime/ftplugin/sh.vim +++ b/runtime/ftplugin/sh.vim @@ -2,15 +2,14 @@ " Language: sh " Maintainer: Doug Kearns " Previous Maintainer: Dan Sharp -" Last Change: 2022 Sep 07 +" Contributor: Enno Nagel +" Last Change: 2023 Aug 29 if exists("b:did_ftplugin") finish endif let b:did_ftplugin = 1 -" Make sure the continuation lines below do not cause problems in -" compatibility mode. let s:save_cpo = &cpo set cpo-=C @@ -32,16 +31,27 @@ if exists("loaded_matchit") && !exists("b:match_words") let b:undo_ftplugin ..= " | unlet! b:match_ignorecase b:match_words" endif -" Change the :browse e filter to primarily show shell-related files. if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter") - let b:browsefilter = "Bourne Shell Scripts (*.sh)\t*.sh\n" .. - \ "Korn Shell Scripts (*.ksh)\t*.ksh\n" .. - \ "Bash Shell Scripts (*.bash)\t*.bash\n" .. - \ "All Files (*.*)\t*.*\n" + let b:browsefilter = "Bourne Shell Scripts (*.sh)\t*.sh\n" .. + \ "Korn Shell Scripts (*.ksh)\t*.ksh\n" .. + \ "Bash Shell Scripts (*.bash)\t*.bash\n" .. + \ "All Files (*.*)\t*.*\n" let b:undo_ftplugin ..= " | unlet! b:browsefilter" endif -" Restore the saved compatibility options. +if (exists("b:is_bash") && (b:is_bash == 1)) || + \ (exists("b:is_sh") && (b:is_sh == 1)) + if !has("gui_running") && executable("less") + command! -buffer -nargs=1 Help silent exe '!bash -c "{ help "" 2>/dev/null || man ""; } | LESS= less"' | redraw! + elseif has('terminal') + command! -buffer -nargs=1 Help silent exe ':term bash -c "help "" 2>/dev/null || man """' + else + command! -buffer -nargs=1 Help echo system('bash -c "help " 2>/dev/null || man ""') + endif + setlocal keywordprg=:Help + let b:undo_ftplugin ..= " | setl kp< | sil! delc -buffer Help" +endif + let &cpo = s:save_cpo unlet s:save_cpo diff --git a/runtime/ftplugin/solidity.vim b/runtime/ftplugin/solidity.vim new file mode 100644 index 0000000000..abe9f2ff26 --- /dev/null +++ b/runtime/ftplugin/solidity.vim @@ -0,0 +1,15 @@ +" Vim filetype plugin file +" Language: Solidity +" Maintainer: Cothi (jiungdev@gmail.com) +" Original Author: tomlion (https://github.com/tomlion/vim-solidity) +" Last Change: 2022 Sep 27 +" 2023 Aug 22 Vim Project (did_ftplugin, undo_ftplugin) + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +setlocal commentstring=//\ %s + +let b:undo_ftplugin = "setlocal commentstring<" diff --git a/runtime/ftplugin/sql.vim b/runtime/ftplugin/sql.vim index 1c02a98c7c..7a29d39f8e 100644 --- a/runtime/ftplugin/sql.vim +++ b/runtime/ftplugin/sql.vim @@ -140,7 +140,7 @@ if !exists("*SQL_SetType") \ ) " Remove duplicates, since sqlanywhere.vim can exist in the - " sytax, indent and ftplugin directory, yet we only want + " syntax, indent and ftplugin directory, yet we only want " to display the option once let index = match(sqls, '.\{-}\ze\n') while index > -1 @@ -204,7 +204,7 @@ if !exists("*SQL_SetType") endif let b:sql_type_override = new_sql_type - " Remove any cached SQL since a new sytax will have different + " Remove any cached SQL since a new syntax will have different " items and groups if !exists('g:loaded_sql_completion') || g:loaded_sql_completion >= 100 call sqlcomplete#ResetCacheSyntax() diff --git a/runtime/ftplugin/sshconfig.vim b/runtime/ftplugin/sshconfig.vim index d933ce0527..c9a5cfaa68 100644 --- a/runtime/ftplugin/sshconfig.vim +++ b/runtime/ftplugin/sshconfig.vim @@ -1,7 +1,7 @@ " Vim filetype plugin file -" Language: OpenSSH client configuration file -" Previous Maintainer: Nikolai Weibull -" Latest Revision: 2008-07-09 +" Language: OpenSSH client configuration file +" Previous Maintainer: Nikolai Weibull +" Latest Revision: 2008-07-09 if exists("b:did_ftplugin") finish @@ -11,9 +11,24 @@ let b:did_ftplugin = 1 let s:cpo_save = &cpo set cpo&vim -let b:undo_ftplugin = "setl com< cms< fo<" - setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql +let b:undo_ftplugin = 'setlocal com< cms< fo<' + +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s+' . . '$'' --hilite-search" man ' . 'ssh_config' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe 'term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s+' . . '$', '\') . ''' --hilite-search" man ' . 'ssh_config' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/sudoers.vim b/runtime/ftplugin/sudoers.vim index 38dbf559ee..b4123620af 100644 --- a/runtime/ftplugin/sudoers.vim +++ b/runtime/ftplugin/sudoers.vim @@ -15,5 +15,21 @@ let b:undo_ftplugin = "setl com< cms< fo<" setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''\b' . . '\b'' --hilite-search" man ' . 'sudoers' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('\b' . . '\b', '\') . ''' --hilite-search" man ' . 'sudoers' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/systemd.vim b/runtime/ftplugin/systemd.vim index 4c5c9a1dc1..e60a5e4960 100644 --- a/runtime/ftplugin/systemd.vim +++ b/runtime/ftplugin/systemd.vim @@ -7,35 +7,30 @@ if !exists('b:did_ftplugin') runtime! ftplugin/dosini.vim endif -if !has('unix') - finish -endif - -if !has('gui_running') - command! -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd() | redraw! -elseif has('terminal') - command! -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd() -else - finish -endif - -if !exists('*KeywordLookup_systemd') - function KeywordLookup_systemd(keyword) abort - let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$') - if len(matches) > 1 - let section = matches[1] - return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section - else - return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd' +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman silent exe '!' . KeywordLookup_systemd() | redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman silent exe 'term ' . KeywordLookup_systemd() + endif + if exists(':Sman') == 2 + if !exists('*KeywordLookup_systemd') + function KeywordLookup_systemd(keyword) abort + let matches = matchlist(getline(search('\v^\s*\[\s*.+\s*\]\s*$', 'nbWz')), '\v^\s*\[\s*(\k+).*\]\s*$') + if len(matches) > 1 + let section = matches[1] + return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd.' . section + else + return 'LESS= MANPAGER="less --pattern=''(^|,)\s+' . a:keyword . '=$'' --hilite-search" man ' . 'systemd' + endif + endfunction endif - endfunction -endif - -setlocal iskeyword+=- -setlocal keywordprg=:Sman - -if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin) - let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<' -else - let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword<' + setlocal iskeyword+=- + setlocal keywordprg=:Sman + if !exists('b:undo_ftplugin') || empty(b:undo_ftplugin) + let b:undo_ftplugin = 'setlocal keywordprg< iskeyword<' + else + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif + endif endif diff --git a/runtime/ftplugin/tidy.vim b/runtime/ftplugin/tidy.vim index 470548d83a..b81b66db4a 100644 --- a/runtime/ftplugin/tidy.vim +++ b/runtime/ftplugin/tidy.vim @@ -1,5 +1,5 @@ " Vim filetype plugin file -" Language: HMTL Tidy Configuration +" Language: HTML Tidy Configuration " Maintainer: Doug Kearns " Last Change: 2020 Sep 4 diff --git a/runtime/ftplugin/udevrules.vim b/runtime/ftplugin/udevrules.vim index 6404f6c85e..83fb728a54 100644 --- a/runtime/ftplugin/udevrules.vim +++ b/runtime/ftplugin/udevrules.vim @@ -15,5 +15,21 @@ let b:undo_ftplugin = "setl com< cms< fo<" setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql +if has('unix') && executable('less') + if !has('gui_running') + command -buffer -nargs=1 Sman + \ silent exe '!' . 'LESS= MANPAGER="less --pattern=''^\s{,8}' . . '\b'' --hilite-search" man ' . 'udev' | + \ redraw! + elseif has('terminal') + command -buffer -nargs=1 Sman + \ silent exe ':term ' . 'env LESS= MANPAGER="less --pattern=''' . escape('^\s{,8}' . . '\b', '\') . ''' --hilite-search" man ' . 'udev' + endif + if exists(':Sman') == 2 + setlocal iskeyword+=- + setlocal keywordprg=:Sman + let b:undo_ftplugin .= '| setlocal keywordprg< iskeyword< | sil! delc -buffer Sman' + endif +endif + let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/usd.vim b/runtime/ftplugin/usd.vim index c795ba591b..cd5013f960 100644 --- a/runtime/ftplugin/usd.vim +++ b/runtime/ftplugin/usd.vim @@ -2,17 +2,13 @@ " Language: Pixar Animation's Universal Scene Description format " Maintainer: Colin Kennedy " Last Change: 2023 May 9 +" 2023 Aug 28 by Vim Project (undo_ftplugin) if exists("b:did_ftplugin") finish endif - -let s:cpo_save = &cpo -set cpo&vim - let b:did_ftplugin = 1 setlocal commentstring=#\ %s -let &cpo = s:cpo_save -unlet s:cpo_save +let b:undo_ftplugin = "setlocal commentstring<" diff --git a/runtime/ftplugin/vhdl.vim b/runtime/ftplugin/vhdl.vim index 0249b542be..ff56166ebe 100644 --- a/runtime/ftplugin/vhdl.vim +++ b/runtime/ftplugin/vhdl.vim @@ -3,6 +3,7 @@ " Maintainer: R.Shankar " Modified By: Gerald Lai " Last Change: 2011 Dec 11 +" 2023 Aug 28 by Vim Project (undo_ftplugin, commentstring) " Only do this when not done yet for this buffer if exists("b:did_ftplugin") @@ -22,13 +23,20 @@ set cpo&vim " Set 'comments' to format dashed lists in comments. "setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/*,mb:*,ex:*/,:// +setlocal commentstring=--\ %s + " Format comments to be up to 78 characters long "setlocal tw=75 +" let b:undo_ftplugin = "setl cms< com< fo< tw<" + +let b:undo_ftplugin = "setl cms< " + " Win32 can filter files in the browse dialog "if has("gui_win32") && !exists("b:browsefilter") " let b:browsefilter = "Verilog Source Files (*.v)\t*.v\n" . " \ "All Files (*.*)\t*.*\n" +" let b:undo_ftplugin .= " | unlet! b:browsefilter" "endif " Let the matchit plugin know what items can be matched. @@ -52,37 +60,49 @@ if ! exists("b:match_words") && exists("loaded_matchit") \ s:notend.'\:\,'. \ s:notend.'\:\,'. \ s:notend.'\:\' + let b:undo_ftplugin .= " | unlet! b:match_ignorecase b:match_words" endif -" count repeat -function! CountWrapper(cmd) - let i = v:count1 - if a:cmd[0] == ":" - while i > 0 - execute a:cmd - let i = i - 1 - endwhile - else - execute "normal! gv\" - execute "normal ".i.a:cmd - let curcol = col(".") - let curline = line(".") - normal! gv - call cursor(curline, curcol) - endif -endfunction +if !exists("no_plugin_maps") && !exists("no_vhdl_maps") + " count repeat + function! CountWrapper(cmd) + let i = v:count1 + if a:cmd[0] == ":" + while i > 0 + execute a:cmd + let i = i - 1 + endwhile + else + execute "normal! gv\" + execute "normal ".i.a:cmd + let curcol = col(".") + let curline = line(".") + normal! gv + call cursor(curline, curcol) + endif + endfunction -" explore motion -" keywords: "architecture", "block", "configuration", "component", "entity", "function", "package", "procedure", "process", "record", "units" -let b:vhdl_explore = '\%(architecture\|block\|configuration\|component\|entity\|function\|package\|procedure\|process\|record\|units\)' -noremap [[ :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%^","bW")') -noremap ]] :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%$","W")') -noremap [] :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%^","bW")') -noremap ][ :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%$","W")') -vnoremap [[ :cal CountWrapper('[[') -vnoremap ]] :cal CountWrapper(']]') -vnoremap [] :cal CountWrapper('[]') -vnoremap ][ :cal CountWrapper('][') + " explore motion + " keywords: "architecture", "block", "configuration", "component", "entity", "function", "package", "procedure", "process", "record", "units" + let b:vhdl_explore = '\%(architecture\|block\|configuration\|component\|entity\|function\|package\|procedure\|process\|record\|units\)' + noremap [[ :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%^","bW")') + noremap ]] :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%$","W")') + noremap [] :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%^","bW")') + noremap ][ :cal CountWrapper(':cal search("\\%(--.*\\)\\@\\c\\\\%$","W")') + vnoremap [[ :cal CountWrapper('[[') + vnoremap ]] :cal CountWrapper(']]') + vnoremap [] :cal CountWrapper('[]') + vnoremap ][ :cal CountWrapper('][') + let b:undo_ftplugin .= + \ " | silent! execute 'nunmap [['" . + \ " | silent! execute 'nunmap ]]'" . + \ " | silent! execute 'nunmap []'" . + \ " | silent! execute 'nunmap ]['" . + \ " | silent! execute 'vunmap [['" . + \ " | silent! execute 'vunmap ]]'" . + \ " | silent! execute 'vunmap []'" . + \ " | silent! execute 'vunmap ]['" +endif let &cpo = s:cpo_save unlet s:cpo_save diff --git a/runtime/ftplugin/zig.vim b/runtime/ftplugin/zig.vim index e740a52849..cd18bfe2bd 100644 --- a/runtime/ftplugin/zig.vim +++ b/runtime/ftplugin/zig.vim @@ -17,7 +17,7 @@ compiler zig_build " Match Zig builtin fns setlocal iskeyword+=@-@ -" Recomended code style, no tabs and 4-space indentation +" Recommended code style, no tabs and 4-space indentation setlocal expandtab setlocal tabstop=8 setlocal softtabstop=4 @@ -39,7 +39,9 @@ endif let &l:define='\v(|||^\s*\#\s*define)' -if !exists('g:zig_std_dir') && exists('*json_decode') && executable('zig') +" Safety check: don't execute zip from current directory +if !exists('g:zig_std_dir') && exists('*json_decode') && + \ executable('zig') && fnamemodify(exepath("zig"), ":p:h") != getcwd() silent let s:env = system('zig env') if v:shell_error == 0 let g:zig_std_dir = json_decode(s:env)['std_dir'] diff --git a/runtime/ftplugin/zsh.vim b/runtime/ftplugin/zsh.vim index 0ca8077305..ed75d04003 100644 --- a/runtime/ftplugin/zsh.vim +++ b/runtime/ftplugin/zsh.vim @@ -30,7 +30,7 @@ if executable('zsh') && &shell !~# '/\%(nologin\|false\)$' compiler zsh endif setlocal keywordprg=:RunHelp - let b:undo_ftplugin .= 'keywordprg<' + let b:undo_ftplugin .= 'keywordprg< | sil! delc -buffer RunHelp' endif let b:match_words = '\:\:\:\' diff --git a/runtime/indent/bash.vim b/runtime/indent/bash.vim index b91640687c..407081232c 100644 --- a/runtime/indent/bash.vim +++ b/runtime/indent/bash.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: bash -" Maintainer: Bram -" Last Change: 2019 Sep 27 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 13 " Only load this indent file when no other was loaded. if exists("b:did_indent") diff --git a/runtime/indent/ch.vim b/runtime/indent/ch.vim index e1bd8a356c..11b1f67790 100644 --- a/runtime/indent/ch.vim +++ b/runtime/indent/ch.vim @@ -3,6 +3,7 @@ " Maintainer: SoftIntegration, Inc. " URL: http://www.softintegration.com/download/vim/indent/ch.vim " Last change: 2006 Apr 30 +" 2023 Aug 28 by Vim Project (undo_indent) " Created based on cpp.vim " " Ch is a C/C++ interpreter with many high level extensions @@ -16,3 +17,5 @@ let b:did_indent = 1 " Ch indenting is built-in, thus this is very simple setlocal cindent + +let b:undo_indent = "setlocal cindent<" diff --git a/runtime/indent/dune.vim b/runtime/indent/dune.vim index 0590d66d13..a9349e4e04 100644 --- a/runtime/indent/dune.vim +++ b/runtime/indent/dune.vim @@ -3,6 +3,7 @@ " Maintainers: Markus Mottl " URL: https://github.com/ocaml/vim-ocaml " Last Change: 2021 Jan 01 +" 2023 Aug 28 by Vim Project (undo_indent) if exists("b:did_indent") finish @@ -11,3 +12,5 @@ let b:did_indent = 1 " dune format-dune-file uses 1 space to indent setlocal softtabstop=1 shiftwidth=1 expandtab + +let b:undo_indent = "setl et< sts< sw<" diff --git a/runtime/indent/fish.vim b/runtime/indent/fish.vim index 7455287ec0..e7678cb7c8 100644 --- a/runtime/indent/fish.vim +++ b/runtime/indent/fish.vim @@ -3,6 +3,7 @@ " Maintainer: Nicholas Boyle (github.com/nickeb96) " Repository: https://github.com/nickeb96/fish.vim " Last Change: February 4, 2023 +" 2023 Aug 28 by Vim Project (undo_indent) if exists("b:did_indent") finish @@ -12,6 +13,8 @@ let b:did_indent = 1 setlocal indentexpr=GetFishIndent(v:lnum) setlocal indentkeys+==end,=else,=case +let b:undo_indent = "setlocal indentexpr< indentkeys<" + function s:PrevCmdStart(linenum) let l:linenum = a:linenum " look for the first line that isn't a line continuation diff --git a/runtime/indent/go.vim b/runtime/indent/go.vim index bf9ff75e6c..a9b1d8d19b 100644 --- a/runtime/indent/go.vim +++ b/runtime/indent/go.vim @@ -2,6 +2,7 @@ " Language: Go " Maintainer: David Barnett (https://github.com/google/vim-ft-go) " Last Change: 2017 Jun 13 +" 2023 Aug 28 by Vim Project (undo_indent) " " TODO: " - function invocations split across lines @@ -19,6 +20,8 @@ setlocal autoindent setlocal indentexpr=GoIndent(v:lnum) setlocal indentkeys+=<:>,0=},0=) +let b:undo_indent = "setl ai< inde< indk< lisp<" + if exists('*GoIndent') finish endif diff --git a/runtime/indent/hare.vim b/runtime/indent/hare.vim index bc4fea4e61..0a9d8dafd8 100644 --- a/runtime/indent/hare.vim +++ b/runtime/indent/hare.vim @@ -2,6 +2,7 @@ " Language: Hare " Maintainer: Amelia Clarke " Last Change: 2022 Sep 22 +" 2023 Aug 28 by Vim Project (undo_indent) if exists("b:did_indent") finish @@ -40,6 +41,8 @@ setlocal cinwords=if,else,for,switch,match setlocal indentexpr=GetHareIndent() +let b:undo_indent = "setl cin< cino< cinw< inde< indk<" + function! FloorCindent(lnum) return cindent(a:lnum) / shiftwidth() * shiftwidth() endfunction diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim index 65e0ffc40c..2fa10cc91e 100644 --- a/runtime/indent/html.vim +++ b/runtime/indent/html.vim @@ -1,7 +1,7 @@ " Vim indent script for HTML -" Maintainer: Bram Moolenaar +" Maintainer: The Vim Project " Original Author: Andy Wokula -" Last Change: 2022 Jan 31 +" Last Change: 2023 Aug 13 " Version: 1.0 "{{{ " Description: HTML indent script with cached state for faster indenting on a " range of lines. diff --git a/runtime/indent/jsonc.vim b/runtime/indent/jsonc.vim index bf8e501dd5..058634a6d2 100644 --- a/runtime/indent/jsonc.vim +++ b/runtime/indent/jsonc.vim @@ -4,6 +4,7 @@ " Acknowledgement: Based off of vim-json maintained by Eli Parra " https://github.com/elzr/vim-json " Last Change: 2021-07-01 +" 2023 Aug 28 by Vim Project (undo_indent) " 0. Initialization {{{1 " ================= @@ -20,6 +21,8 @@ setlocal nosmartindent setlocal indentexpr=GetJSONCIndent() setlocal indentkeys=0{,0},0),0[,0],!^F,o,O,e +let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<" + " Only define the function once. if exists("*GetJSONCIndent") finish diff --git a/runtime/indent/julia.vim b/runtime/indent/julia.vim index 8e4c60322e..36f39f6652 100644 --- a/runtime/indent/julia.vim +++ b/runtime/indent/julia.vim @@ -3,7 +3,8 @@ " Maintainer: Carlo Baldassi " Homepage: https://github.com/JuliaEditorSupport/julia-vim " Last Change: 2022 Jun 14 -" Notes: originally based on Bram Molenaar's indent file for vim +" 2023 Aug 28 by Vim Project (undo_indent) +" Notes: originally based on Bram Moolenaar's indent file for vim " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -21,6 +22,8 @@ setlocal indentkeys-=0{ setlocal indentkeys-=0} setlocal nosmartindent +let b:undo_indent = "setl ai< inde< indk< si<" + " Only define the function once. if exists("*GetJuliaIndent") finish diff --git a/runtime/indent/logtalk.vim b/runtime/indent/logtalk.vim index 8e36f86115..f7a8b0387c 100644 --- a/runtime/indent/logtalk.vim +++ b/runtime/indent/logtalk.vim @@ -1,5 +1,6 @@ " Maintainer: Paulo Moura " Revised on: 2018.08.04 +" 2023 Aug 28 by Vim Project (undo_indent) " Language: Logtalk " This Logtalk indent file is a modified version of the Prolog @@ -16,6 +17,8 @@ setlocal indentexpr=GetLogtalkIndent() setlocal indentkeys-=:,0# setlocal indentkeys+=0%,-,0;,>,0) +let b:undo_indent = "setlocal indentexpr< indentkeys<" + " Only define the function once. if exists("*GetLogtalkIndent") finish diff --git a/runtime/indent/mail.vim b/runtime/indent/mail.vim index 22bb0f7e12..eec9b4e43d 100644 --- a/runtime/indent/mail.vim +++ b/runtime/indent/mail.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Mail -" Maintainer: Bram Moolenaar -" Last Change: 2021 Sep 26 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 13 if exists("b:did_indent") finish diff --git a/runtime/indent/nsis.vim b/runtime/indent/nsis.vim index 5d3decca37..3731781201 100644 --- a/runtime/indent/nsis.vim +++ b/runtime/indent/nsis.vim @@ -15,7 +15,7 @@ setlocal nosmartindent setlocal noautoindent setlocal indentexpr=GetNsisIndent(v:lnum) setlocal indentkeys=!^F,o,O -setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwith,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif +setlocal indentkeys+==~${Else,=~${EndIf,=~${EndUnless,=~${AndIf,=~${AndUnless,=~${OrIf,=~${OrUnless,=~${Case,=~${Default,=~${EndSelect,=~${EndSwitch,=~${Loop,=~${Next,=~${MementoSectionEnd,=~FunctionEnd,=~SectionEnd,=~SectionGroupEnd,=~PageExEnd,0=~!macroend,0=~!if,0=~!else,0=~!endif let b:undo_indent = "setl ai< inde< indk< si<" diff --git a/runtime/indent/ocaml.vim b/runtime/indent/ocaml.vim index 19c81f49c4..c9beb8be0b 100644 --- a/runtime/indent/ocaml.vim +++ b/runtime/indent/ocaml.vim @@ -4,7 +4,8 @@ " Mike Leary " Markus Mottl " URL: https://github.com/ocaml/vim-ocaml -" Last Change: 2017 Jun 13 +" Last Change: 2023 Aug 28 - Add undo_indent (Vim Project) +" 2017 Jun 13 " 2005 Jun 25 - Fixed multiple bugs due to 'else\nreturn ind' working " 2005 May 09 - Added an option to not indent OCaml-indents specially (MM) " 2013 June - commented textwidth (Marc Weber) @@ -24,6 +25,8 @@ setlocal indentkeys+=0=and,0=class,0=constraint,0=done,0=else,0=end,0=exception, setlocal nolisp setlocal nosmartindent +let b:undo_indent = "setl et< inde< indk< lisp< si<" + " At least Marc Weber and Markus Mottl do not like this: " setlocal textwidth=80 diff --git a/runtime/indent/php.vim b/runtime/indent/php.vim index 0e623689d5..350accaa11 100644 --- a/runtime/indent/php.vim +++ b/runtime/indent/php.vim @@ -4,6 +4,7 @@ " URL: https://www.2072productions.com/vim/indent/php.vim " Home: https://github.com/2072/PHP-Indenting-for-VIm " Last Change: 2020 Mar 05 +" 2023 Aug 28 by Vim Project (undo_indent) " Version: 1.70 " " @@ -128,7 +129,7 @@ setlocal nolisp setlocal indentexpr=GetPhpIndent() setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e,*,=?>,= 1 let last_line = getline(lnum) if last_line =~ '^\s*->' - let parrentArrowPos = indent(a:lnum) + let parentArrowPos = indent(a:lnum) break else @@ -355,28 +356,28 @@ function! FindArrowIndent (lnum) " {{{ else endif else - let parrentArrowPos = -1 + let parentArrowPos = -1 break end endif if cleanedLnum =~ '->' call cursor(lnum, cursorPos == -1 ? strwidth(cleanedLnum) : cursorPos) - let parrentArrowPos = searchpos('->', 'cWb', lnum)[1] - 1 + let parentArrowPos = searchpos('->', 'cWb', lnum)[1] - 1 break else - let parrentArrowPos = -1 + let parentArrowPos = -1 break endif endif endwhile - if parrentArrowPos == -1 - let parrentArrowPos = indent(lnum) + shiftwidth() + if parentArrowPos == -1 + let parentArrowPos = indent(lnum) + shiftwidth() end - return parrentArrowPos + return parentArrowPos endfun "}}} function! FindTheIfOfAnElse (lnum, StopAfterFirstPrevElse) " {{{ diff --git a/runtime/indent/raku.vim b/runtime/indent/raku.vim index 3f9b49ec77..753a2b04be 100644 --- a/runtime/indent/raku.vim +++ b/runtime/indent/raku.vim @@ -4,6 +4,7 @@ " Homepage: https://github.com/vim-perl/vim-perl " Bugs/requests: https://github.com/vim-perl/vim-perl/issues " Last Change: 2020 Apr 15 +" 2023 Aug 28 by Vim Project (undo_indent) " Contributors: Andy Lester " Hinrik Örn Sigurðsson " @@ -47,6 +48,8 @@ if !b:indent_use_syntax setlocal indentkeys+=0=EO endif +let b:undo_indent = "setlocal indentexpr< indentkeys<" + let s:cpo_save = &cpo set cpo-=C diff --git a/runtime/indent/rapid.vim b/runtime/indent/rapid.vim index f97ebf84db..2c99bb2491 100644 --- a/runtime/indent/rapid.vim +++ b/runtime/indent/rapid.vim @@ -146,7 +146,7 @@ endfunction " Returns the length of the line until a:str occur outside a string or " comment. Search starts at string index a:startIdx. -" If a:str is a word also add word bounderies and case insesitivity. +" If a:str is a word also add word boundaries and case insensitivity. " Note: rapidTodoComment and rapidDebugComment are not taken into account. function s:RapidLenTilStr(lnum, str, startIdx) abort @@ -179,8 +179,8 @@ function s:RapidLenTilStr(lnum, str, startIdx) abort return -1 endfunction -" a:lchar shoud be one of (, ), [, ], { or } -" returns the number of opening/closing parenthesise which have no +" a:lchar should be one of (, ), [, ], { or } +" returns the number of opening/closing parentheses which have no " closing/opening match in getline(a:lnum) function s:RapidLoneParen(lnum,lchar) abort if a:lchar == "(" || a:lchar == ")" @@ -205,7 +205,7 @@ function s:RapidLoneParen(lnum,lchar) abort endif let l:opnParen = 0 - " count opening brakets + " count opening brackets let l:i = 0 while l:i >= 0 let l:i = s:RapidLenTilStr(a:lnum, l:opnParChar, l:i) @@ -216,7 +216,7 @@ function s:RapidLoneParen(lnum,lchar) abort endwhile let l:clsParen = 0 - " count closing brakets + " count closing brackets let l:i = 0 while l:i >= 0 let l:i = s:RapidLenTilStr(a:lnum, l:clsParChar, l:i) @@ -242,7 +242,7 @@ function s:RapidPreNoneBlank(lnum) abort let nPreNoneBlank = prevnonblank(a:lnum) while nPreNoneBlank>0 && getline(nPreNoneBlank) =~ '\v\c^\s*(\%\%\%|!)' - " Previouse none blank line irrelevant. Look further aback. + " Previous none blank line irrelevant. Look further aback. let nPreNoneBlank = prevnonblank(nPreNoneBlank - 1) endwhile diff --git a/runtime/indent/rst.vim b/runtime/indent/rst.vim index a31ad8e080..e3c10865a6 100644 --- a/runtime/indent/rst.vim +++ b/runtime/indent/rst.vim @@ -4,6 +4,7 @@ " Maintainer: Marshall Ward " Previous Maintainer: Nikolai Weibull " Latest Revision: 2020-03-31 +" 2023 Aug 28 by Vim Project (undo_indent) if exists("b:did_indent") finish @@ -14,6 +15,8 @@ setlocal indentexpr=GetRSTIndent() setlocal indentkeys=!^F,o,O setlocal nosmartindent +let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<" + if exists("*GetRSTIndent") finish endif diff --git a/runtime/indent/rust.vim b/runtime/indent/rust.vim index 2b544f4a67..b27d93c3a2 100644 --- a/runtime/indent/rust.vim +++ b/runtime/indent/rust.vim @@ -2,6 +2,7 @@ " Language: Rust " Author: Chris Morgan " Last Change: 2017 Jun 13 +" 2023 Aug 28 by Vim Project (undo_indent) " For bugs, patches and license go to https://github.com/rust-lang/rust.vim " Only load this indent file when no other was loaded. @@ -24,6 +25,8 @@ setlocal indentkeys=0{,0},!^F,o,O,0[,0] setlocal indentexpr=GetRustIndent(v:lnum) +let b:undo_indent = "setlocal cindent< cinoptions< cinkeys< cinwords< lisp< autoindent< indentkeys< indentexpr<" + " Only define the function once. if exists("*GetRustIndent") finish diff --git a/runtime/indent/scala.vim b/runtime/indent/scala.vim index b5eba29543..c6aba4e388 100644 --- a/runtime/indent/scala.vim +++ b/runtime/indent/scala.vim @@ -4,6 +4,7 @@ " Modifications By: Derek Wyatt " URL: https://github.com/derekwyatt/vim-scala " Last Change: 2016 Aug 26 +" 2023 Aug 28 by Vim Project (undo_indent) if exists("b:did_indent") finish @@ -14,6 +15,8 @@ setlocal autoindent setlocal indentexpr=GetScalaIndent() setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case, +let b:undo_indent = "setl ai< inde< indk<" + if exists("*GetScalaIndent") finish endif diff --git a/runtime/indent/solidity.vim b/runtime/indent/solidity.vim index caed726c0a..55a07c015a 100644 --- a/runtime/indent/solidity.vim +++ b/runtime/indent/solidity.vim @@ -1,9 +1,11 @@ " Vim indent file -" Language: Solidity -" Acknowledgement: Based off of vim-javascript -" Maintainer: Cothi (jiungdev@gmail.com) -" Original Author: tomlion (https://github.com/tomlion/vim-solidity) -" Last Changed: 2022 Sep 27 +" Language: Solidity +" Maintainer: Cothi (jiungdev@gmail.com) +" Original Author: tomlion (https://github.com/tomlion/vim-solidity) +" Last Change: 2022 Sep 27 +" 2023 Aug 22 Vim Project (undo_indent) +" +" Acknowledgement: Based off of vim-javascript " " 0. Initialization {{{1 " ================= @@ -20,6 +22,8 @@ setlocal nosmartindent setlocal indentexpr=GetSolidityIndent() setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e +let b:undo_indent = "setlocal indentexpr< indentkeys< smartindent<" + " Only define the function once. if exists("*GetSolidityIndent") finish diff --git a/runtime/indent/tex.vim b/runtime/indent/tex.vim index d356ba905b..68d13fb116 100644 --- a/runtime/indent/tex.vim +++ b/runtime/indent/tex.vim @@ -67,7 +67,8 @@ " 2020/04/26 by Yichao Zhou " (*) Fix a bug related to \[ & \]. Thanks Manuel Boni for " reporting. -" +" 2023/08/28 by Vim Project +" (*) Set b:undo_indent. " }}} " Document: {{{ @@ -167,6 +168,7 @@ setlocal indentexpr=GetTeXIndent() setlocal indentkeys& exec 'setlocal indentkeys+=[,(,{,),},],\&' . substitute(g:tex_items, '^\|\(\\|\)', ',=', 'g') let g:tex_items = '^\s*' . substitute(g:tex_items, '^\(\^\\s\*\)*', '', '') +let b:undo_indent = "setlocal autoindent< indentexpr< indentkeys< smartindent<" " }}} function! GetTeXIndent() " {{{ diff --git a/runtime/indent/typescript.vim b/runtime/indent/typescript.vim index e899f83d0f..e26750b8aa 100644 --- a/runtime/indent/typescript.vim +++ b/runtime/indent/typescript.vim @@ -2,6 +2,7 @@ " Language: TypeScript " Maintainer: See https://github.com/HerringtonDarkholme/yats.vim " Last Change: 2019 Oct 18 +" 2023 Aug 28 by Vim Project (undo_indent) " Acknowledgement: Based off of vim-ruby maintained by Nikolai Weibull http://vim-ruby.rubyforge.org " 0. Initialization {{{1 @@ -20,6 +21,8 @@ setlocal indentexpr=GetTypescriptIndent() setlocal formatexpr=Fixedgq(v:lnum,v:count) setlocal indentkeys=0{,0},0),0],0\,,!^F,o,O,e +let b:undo_indent = "setlocal formatexpr< indentexpr< indentkeys< smartindent<" + " Only define the function once. if exists("*GetTypescriptIndent") finish diff --git a/runtime/indent/verilog.vim b/runtime/indent/verilog.vim index e81197c3b4..377615c348 100644 --- a/runtime/indent/verilog.vim +++ b/runtime/indent/verilog.vim @@ -1,6 +1,7 @@ " Language: Verilog HDL " Maintainer: Chih-Tsun Huang " Last Change: 2017 Aug 25 by Chih-Tsun Huang +" 2023 Aug 28 by Vim Project (undo_indent) " URL: http://www.cs.nthu.edu.tw/~cthuang/vim/indent/verilog.vim " " Credits: @@ -28,6 +29,8 @@ setlocal indentkeys+==endmodule,=endfunction,=endtask,=endspecify setlocal indentkeys+==endconfig,=endgenerate,=endprimitive,=endtable setlocal indentkeys+==`else,=`elsif,=`endif +let b:undo_indent = "setlocal indentexpr< indentkeys<" + " Only define the function once. if exists("*GetVerilogIndent") finish diff --git a/runtime/indent/vhdl.vim b/runtime/indent/vhdl.vim index ad318066f4..b01d1156e9 100644 --- a/runtime/indent/vhdl.vim +++ b/runtime/indent/vhdl.vim @@ -3,6 +3,7 @@ " Maintainer: Gerald Lai " Version: 1.62 " Last Change: 2017 Oct 17 +" 2023 Aug 28 by Vim Project (undo_indent) " URL: http://www.vim.org/scripts/script.php?script_id=1450 " only load this indent file when no other was loaded @@ -19,6 +20,8 @@ setlocal indentkeys+==~if,=~then,=~elsif,=~else setlocal indentkeys+==~case,=~loop,=~for,=~generate,=~record,=~units,=~process,=~block,=~function,=~component,=~procedure setlocal indentkeys+==~architecture,=~configuration,=~entity,=~package +let b:undo_indent = "setlocal indentexpr< indentkeys<" + " constants " not a comment let s:NC = '\%(--.*\)\@ +" Last Change: 2023 Aug 13 " All characters are given literally, conversion to another encoding (e.g., " UTF-8) should work. diff --git a/runtime/lang/Makefile b/runtime/lang/Makefile index b4e524a611..fb762391a4 100644 --- a/runtime/lang/Makefile +++ b/runtime/lang/Makefile @@ -13,6 +13,7 @@ all: \ menu_pl_pl.iso_8859-2.vim \ menu_polish_poland.1250.vim \ menu_ru_ru.koi8-r.vim \ + menu_ru_ru.cp1251.vim \ menu_sl_si.cp1250.vim \ menu_sl_si.latin2.vim \ menu_slovak_slovak_republic.1250.vim \ @@ -113,6 +114,12 @@ menu_ru_ru.koi8-r.vim: menu_ru_ru.utf-8.vim iconv -f utf-8 -t koi8-r menu_ru_ru.utf-8.vim | \ $(SED) -e 's/scriptencoding utf-8/scriptencoding koi8-r/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.koi8-r.vim +# Convert menu_ru_ru.utf-8.vim to create menu_ru_ru.cp1251.vim. +menu_ru_ru.cp1251.vim: menu_ru_ru.utf-8.vim + rm -f menu_ru_ru.cp1251.vim + iconv -f utf-8 -t cp1251 menu_ru_ru.utf-8.vim | \ + $(SED) -e 's/scriptencoding utf-8/scriptencoding cp1251/' -e 's/" Original translations/" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT/' > menu_ru_ru.cp1251.vim + # Convert menu_sl_si.utf-8.vim to create menu_sl_si.cp1250.vim. menu_sl_si.cp1250.vim: menu_sl_si.utf-8.vim rm -f menu_sl_si.cp1250.vim diff --git a/runtime/lang/menu_it_it.latin1.vim b/runtime/lang/menu_it_it.latin1.vim index 26dc8f6523..f2d9d914bc 100644 --- a/runtime/lang/menu_it_it.latin1.vim +++ b/runtime/lang/menu_it_it.latin1.vim @@ -2,7 +2,7 @@ " Maintainer: Antonio Colombo " Vlad Sandrini " Luciano Montanaro -" Last Change: 2022 Jun 17 +" Last Change: 2023 Aug 22 " Original translations " Quit when menu translations have already been done. @@ -20,7 +20,7 @@ menut &Help &Aiuto menut &Overview &Panoramica menut &User\ Manual Manuale\ &Utente -menut &How-to\ links Co&Me\.\.\. +menut &How-To\ Links Co&Me\.\.\. menut &Find\.\.\. &Cerca\.\.\. menut &Credits Cr&Editi menut Co&pying C&Opie @@ -29,7 +29,7 @@ menut O&rphans O&Rfani menut &Version &Versione menut &About &Intro -let g:menutrans_help_dialog = "Batti un comando o una parola per cercare aiuto:\n\nPremetti i_ per comandi in modo Input (p.es.: i_CTRL-X)\nPremetti c_ per comandi che editano la linea-comandi (p.es.: c_)\nPremetti ' per un nome di opzione (p.es.: 'shiftwidth')" +let g:menutrans_help_dialog = "Batti un comando o una parola per cercare aiuto su:\n\nPremetti i_ per comandi in modo Input (p.es.: i_CTRL-X)\nPremetti c_ per comandi che editano la linea-comandi (p.es.: c_)\nPremetti ' per un nome di opzione (p.es.: 'shiftwidth')" " File / File menut &File &File @@ -68,7 +68,6 @@ menut Find\ and\ Rep&lace\.\.\.:s &Sostituisci\.\.\.:s menut Settings\ &Window &Finestra\ Impostazioni menut Startup\ &Settings Impostazioni\ di\ &Avvio menut &Global\ Settings Impostazioni\ &Globali -menut Question Domanda " Edit / Modifica / Impostazioni Globali @@ -80,7 +79,7 @@ menut &Context\ lines &Linee\ di\ contesto menut &Virtual\ Edit &Edit\ virtuale menut Never Mai -menut Block\ Selection Selezione\ Blocco +menut Block\ Selection Seleziona\ Blocco menut Insert\ mode Modo\ Insert menut Block\ and\ Insert Selezione\ Blocco\ e\ Inserimento menut Always Sempre @@ -167,7 +166,7 @@ menut &File\ Format\.\.\. Formato\ &File\.\.\. let g:menutrans_textwidth_dialog = "Batti nuova lunghezza linea (0 per inibire la formattazione): " let g:menutrans_fileformat_dialog = "Scegli formato con cui scrivere il file" -let g:menutrans_fileformat_choices = " &Unix \n &Dos \n &Mac \n &Annullare " +let g:menutrans_fileformat_choices = " &Unix\n&Dos\n&Mac\n&Annullare " menut Show\ C&olor\ Schemes\ in\ Menu Mostra\ Schemi\ C&olore\ in\ Men menut C&olor\ Scheme Schema\ c&Olori @@ -180,8 +179,12 @@ menut evening sera menut industry industria menut morning mattino menut peachpuff pesca +menut quiet quieto menut shine brillante +menut sorbet sorbetto menut slate ardesia +menut torte torta +menut wildcharm fascino\ selvaggio menut BLUE BL menut DARKBLUE BL\ SCURO menut DESERT DESERTO @@ -190,8 +193,12 @@ menut EVENING SERA menut INDUSTRY INDUSTRIA menut MORNING MATTINO menut PEACHPUFF PESCA +menut QUIET QUIETO menut SHINE BRILLANTE +menut SORBET SORBETTO menut SLATE ARDESIA +menut TORTE TORTA +menut WILDCHARM FASCINO\ SELVAGGIO menut Show\ &Keymaps\ in\ Menu Mostra\ Ma&ppe\ tastiera\ in\ Men menut &Keymap Ma&ppa\ tastiera @@ -202,29 +209,105 @@ menut arabic arabo menut armenian-eastern armeno-orientale menut armenian-western armeno-occidentale menut belarusian-jcuken bielorusso-jcuken +menut bulgarian-bds bulgaro-bds +menut bulgarian-phonetic bulgaro-fonetico +menut canfr-win franco-canadese-win +menut croatian croato menut czech ceco +menut dvorak tastiera-dvorak +menut esperanto esperanto +menut french-azerty francese-azerty +menut german-qwertz tedesco-qwertz menut greek greco menut hebrew ebraico menut hebrewp ebraicop +menut kana kana +menut kazakh-jcuken kazako-jcuken +menut korean coreano +menut korean-dubeolsik coreano-dubeolsik +menut lithuanian-baltic lituano-baltico menut magyar ungherese +menut mongolian mongolo +menut oldturkic-orkhon turco-antico-orkhon +menut oldturkic-yenisei turco-antico-yenisei menut persian persiano +menut persian-iranian persiano-iraniano +menut pinyin pinyin +menut polish-slash polacco-slash +menut russian-dvorak russo-dvorak +menut russian-jcuken russo-jcuken +menut russian-jcukenmac russo-jcukenmac +menut russian-jcukenwin russo-jcukenwin +menut russian-jcukenwintype russo-jcukenwintype +menut russian-typograph russo-tipografico +menut russian-yawerty russo-yawerty menut serbian serbo menut serbian-latin serbo-latino +menut sinhala singalese +menut sinhala-phonetic singalese-phonetic menut slovak slovacco +menut tamil tamil +menut thaana thaana +menut thaana-phonetic thaana-fonetico +menut turkish-f turco-f +menut turkish-q turco-q +menut ukrainian-dvorak ukraino-dvorak +menut ukrainian-jcuken ukraino-jcuken +menut vietnamese-telex vietnamita-telex +menut vietnamese-viqr vietnamita-viqr +menut vietnamese-vni vietnamita-vni menut ACCENTS ACCENTI menut ARABIC ARABO menut ARMENIAN-EASTERN ARMENO-ORIENTALE menut ARMENIAN-WESTERN ARMENO-OCCIDENTALE menut BELARUSIAN-JCUKEN BIELORUSSO-JCUKEN +menut BULGARIAN-BDS BULGARO-BDS +menut BULGARIAN-PHONETIC BULGARO-FONETICO +menut CANFR-WIN FRANCO-CANADESE-WIN +menut CROATIAN CROATO menut CZECH CECO +menut DVORAK TASTIERA-DVORAK +menut ESPERANTO ESPERANTO +menut FRENCH-AZERTY FRANCESE-AZERTY +menut GERMAN-QWERTZ TEDESCO-QWERTZ menut GREEK GRECO menut HEBREW EBRAICO menut HEBREWP EBRAICOP +menut KANA KANA +menut KAZAKH-JCUKEN KAZAKO-JCUKEN +menut KOREAN COREANO +menut KOREAN-DUBEOLSIK COREANO-DUBEOLSIK +menut LITHUANIAN-BALTIC LITUANO-BALTICO menut MAGYAR UNGHERESE +menut MONGOLIAN MONGOLO +menut OLDTURKIC-ORKHON TURCO-ANTICO-ORKHON +menut OLDTURKIC-YENISEI TURCO-ANTICO-YENISEI menut PERSIAN PERSIANO +menut PERSIAN-IRANIAN PERSIANO-IRANIANO +menut PINYIN PINYIN +menut POLISH-SLASH POLACCO-SLASH +menut RUSSIAN-DVORAK RUSSO-DVORAK +menut RUSSIAN-JCUKEN RUSSO-JCUKEN +menut RUSSIAN-JCUKENMAC RUSSO-JCUKENMAC +menut RUSSIAN-JCUKENWIN RUSSO-JCUKENWIN +menut RUSSIAN-JCUKENWINTYPE RUSSO-JCUKENWINTYPE +menut RUSSIAN-TYPOGRAPH RUSSO-TIPOGRAFICO +menut RUSSIAN-YAWERTY RUSSO-YAWERTY menut SERBIAN SERBO menut SERBIAN-LATIN SERBO-LATINO +menut SINHALA SINGALESE +menut SINHALA-PHONETIC SINGALESE-PHONETIC menut SLOVAK SLOVACCO +menut TAMIL TAMIL +menut THAANA THAANA +menut THAANA-PHONETIC THAANA-FONETICO +menut TURKISH-F TURCO-F +menut TURKISH-Q TURCO-Q +menut UKRAINIAN-DVORAK UKRAINO-DVORAK +menut UKRAINIAN-JCUKEN UKRAINO-JCUKEN +menut VIETNAMESE-TELEX VIETNAMITA-TELEX +menut VIETNAMESE-VIQR VIETNAMITA-VIQR +menut VIETNAMESE-VNI VIETNAMITA-VNI menut Select\ Fo&nt\.\.\. Scegli\ &Font\.\.\. @@ -233,7 +316,7 @@ menut &Tools &Strumenti menut &Jump\ to\ this\ tagg^] &Vai\ a\ questa\ tagg^] menut Jump\ &back^T Torna\ &Indietro^T -menut Build\ &Tags\ File Costruisci\ file\ &Tags\ +menut Build\ &Tags\ File Costruisci\ file\ &Tag\ " Men ortografia / Spelling menut &Spelling &Ortografia @@ -243,6 +326,7 @@ menut To\ &Next\ error]s Errore\ &Seguente]s menut To\ &Previous\ error[s Errore\ &Precedente[s menut Suggest\ &Correctionsz= &Suggerimentiz= menut &Repeat\ correction:spellrepall &Ripeti\ correzione:spellrepall +menut Set\ language\ to Imposta\ lingua\ a menut Set\ language\ to\ "en" Imposta\ lingua\ a\ "en" menut Set\ language\ to\ "en_au" Imposta\ lingua\ a\ "en_au" menut Set\ language\ to\ "en_ca" Imposta\ lingua\ a\ "en_ca" @@ -255,25 +339,25 @@ menut &Find\ More\ Languages &Trova\ altre\ lingue menut &Folding &Piegature " apri e chiudi piegature menut &Enable/Disable\ foldszi Pi&egature\ S/Nozi -menut &View\ Cursor\ Linezv &Vedi\ linea\ col\ Cursorezv -menut Vie&w\ Cursor\ Line\ onlyzMzx Vedi\ &Solo\ linea\ col\ CursorezMzx -menut C&lose\ more\ foldszm C&Hiudi\ pi\ piegaturezm -menut &Close\ all\ foldszM &Chiudi\ tutte\ le\ piegaturezM -menut O&pen\ more\ foldszr A&Pri\ pi\ piegaturezr -menut &Open\ all\ foldszR &Apri\ tutte\ le\ piegaturezR +menut &View\ Cursor\ Linezv &Vedi\ linea\ col\ Cursorezv +menut Vie&w\ Cursor\ Line\ onlyzMzx Vedi\ &Solo\ linea\ col\ CursorezMzx +menut C&lose\ More\ foldszm C&Hiudi\ pi\ piegaturezm +menut &Close\ All\ foldszM &Chiudi\ tutte\ le\ piegaturezM +menut O&pen\ More\ foldszr A&Pri\ pi\ piegaturezr +menut &Open\ All\ foldszR &Apri\ tutte\ le\ piegaturezR " metodo piegatura menut Fold\ Met&hod Meto&Do\ piegatura menut M&anual &Manuale menut I&ndent &Nidificazione -menut E&xpression &Espressione\ Reg\. +menut E&xpression &Espressione\ Reg\. menut S&yntax &Sintassi menut &Diff &Differenza menut Ma&rker Mar&Catura " crea e cancella piegature menut Create\ &Foldzf Crea\ &Piegaturazf -menut &Delete\ Foldzd &Leva\ piegaturazd -menut Delete\ &All\ FoldszD Leva\ &Tutte\ le\ piegaturezD +menut &Delete\ Foldzd &Togli\ piegaturazd +menut Delete\ &All\ FoldszD Togli\ &Tutte\ le\ piegaturezD " movimenti all'interno delle piegature menut Fold\ col&umn\ width Larghezza\ piegat&Ure\ in\ colonne @@ -285,9 +369,9 @@ menut &Put\ Block &Esporta\ differenze menut &Make:make Esegui\ &Make:make -menut &List\ Errors:cl Lista\ &Errori:cl +menut &List\ Errors:cl Lista\ &Errori:cl menut L&ist\ Messages:cl! Lista\ &Messaggi:cl! -menut &Next\ Error:cn Errore\ s&Uccessivo:cn +menut &Next\ Error:cn Errore\ s&Uccessivo:cn menut &Previous\ Error:cp Errore\ &Precedente:cp menut &Older\ List:cold Lista\ men&O\ recente:cold menut N&ewer\ List:cnew Lista\ pi\ rece&Nte:cnew @@ -302,11 +386,12 @@ menut &Convert\ to\ HEX:%!xxd &Converti\ a\ esadecimale:%!xxd menut Conve&rt\ back:%!xxd\ -r Conve&rti\ da\ esadecimale:%!xxd\ -r menut Se&T\ Compiler Impo&Sta\ Compilatore +menut Show\ Compiler\ Se&ttings\ in\ Menu Mostra\ Impos&Tazioni\ Compilatore\ nel\ Men " Buffers / Buffer menut &Buffers &Buffer -menut &Refresh\ menu A&ggiorna\ men +menut &Refresh\ menu A&Ggiorna\ men menut &Delete &Elimina menut &Alternate &Alternato menut &Next &Successivo @@ -352,10 +437,10 @@ menut &Right\ side^WL Lato\ &Destro^WL menut Rotate\ &Up^WR Ruota\ verso\ l'&Alto^WR menut Rotate\ &Down^Wr Ruota\ verso\ il\ &Basso^Wr menut &Equal\ Size^W= &Uguale\ ampiezza^W= -menut &Max\ Height^W_ &Altezza\ massima^W_ -menut M&in\ Height^W1_ A&Ltezza\ minima^W1_ -menut Max\ &Width^W\| Larghezza\ massima^W\| -menut Min\ Widt&h^W1\| Larghezza\ minima^W1\| +menut &Max\ Height^W_ A&Ltezza\ massima^W_ +menut M&in\ Height^W1_ Al&Tezza\ minima^W1_ +menut Max\ &Width^W\| Lar&Ghezza\ massima^W\| +menut Min\ Widt&h^W1\| Larg&hhezza\ minima^W1\| " The popup menu menut &Undo &Annulla @@ -363,11 +448,13 @@ menut Cu&t &Taglia menut &Copy &Copia menut &Paste &Incolla menut &Delete &Elimina -menut Select\ Blockwise Seleziona\ in\ blocco +menut Select\ Blockwise Seleziona\ Blocco menut Select\ &Word Seleziona\ &Parola -menut Select\ &Line Seleziona\ &Linea +menut Select\ &Line Seleziona\ &Riga menut Select\ &Block Seleziona\ &Blocco -menut Select\ &All Seleziona\ t&Utto +menut Select\ &All Seleziona\ &Tutto +menut Select\ &Sentence Seleziona\ &Frase +menut Select\ Pa&ragraph Seleziona\ Para&Grafo " The GUI Toolbar / Barra Strumenti menut Open Apri diff --git a/runtime/lang/menu_nl_nl.latin1.vim b/runtime/lang/menu_nl_nl.latin1.vim index 62dc49bce4..22c60f24dd 100644 --- a/runtime/lang/menu_nl_nl.latin1.vim +++ b/runtime/lang/menu_nl_nl.latin1.vim @@ -1,6 +1,6 @@ " Menu Translations: Nederlands -" Maintainer: Bram Moolenaar -" Last Change: 2012 May 01 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 13 " Original translations " Quit when menu translations have already been done. diff --git a/runtime/lang/menu_ru.cp1251.vim b/runtime/lang/menu_ru.cp1251.vim new file mode 100644 index 0000000000..a06c9a714a --- /dev/null +++ b/runtime/lang/menu_ru.cp1251.vim @@ -0,0 +1,3 @@ +" Menu Translations: Russian + +source :p:h/menu_ru_ru.cp1251.vim diff --git a/runtime/lang/menu_ru.koi8-r.vim b/runtime/lang/menu_ru.koi8-r.vim new file mode 100644 index 0000000000..1ee85b3621 --- /dev/null +++ b/runtime/lang/menu_ru.koi8-r.vim @@ -0,0 +1,3 @@ +" Menu Translations: Russian + +source :p:h/menu_ru_ru.koi8-r.vim diff --git a/runtime/lang/menu_ru.vim b/runtime/lang/menu_ru.vim new file mode 100644 index 0000000000..20b0b2d5a9 --- /dev/null +++ b/runtime/lang/menu_ru.vim @@ -0,0 +1,3 @@ +" Menu Translations: Russian + +source :p:h/menu_ru_ru.vim diff --git a/runtime/lang/menu_ru_ru.cp1251.vim b/runtime/lang/menu_ru_ru.cp1251.vim new file mode 100644 index 0000000000..fd5ad73bf6 --- /dev/null +++ b/runtime/lang/menu_ru_ru.cp1251.vim @@ -0,0 +1,364 @@ +" Menu Translations: Russian +" Maintainer: Restorer, +" Previous Maintainer: Sergey Alyoshin, +" vassily ragosin, +" Last Change: 23 Aug 2023 +" Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT +" URL: https://github.com/RestorerZ/RuVim +" +" +" Adopted for RuVim project by Vassily Ragosin. +" First translation: Tim Alexeevsky, , +" based on ukrainian translation by Bohdan Vlasyuk, +" +" +" Quit when menu translations have already been done. +" +" Check is +" +if exists("did_menu_trans") + finish +endif +let g:did_menu_trans = 1 +let s:keepcpo= &cpo +set cpo&vim + +scriptencoding cp1251 + +" Top +menutrans &File & +menutrans &Edit & +menutrans &Tools & +menutrans &Syntax & +menutrans &Buffers & +menutrans &Window & +menutrans &Help & +" +" +" +" Submenu of menu Help +menutrans &Overview &\ F1 +menutrans &User\ Manual &\ +menutrans &How-to\ links & +menutrans &Find\.\.\. &\.\.\. +"-------------------- +menutrans &Credits & +menutrans Co&pying & +menutrans &Sponsor/Register &\ \ +menutrans O&rphans & +"-------------------- +menutrans &Version &\ +menutrans &About &\ +" +" +" Submenu of File menu +menutrans &Open\.\.\.:e &\.\.\.:e +menutrans Sp&lit-Open\.\.\.:sp &\ \ \ \.\.\.:sp +menutrans Open\ &Tab\.\.\.:tabnew &\ \ \ \.\.\.:tabnew +menutrans &New:enew &:enew +menutrans &Close:close &:close +"-------------------- +menutrans &Save:w &:w +menutrans Save\ &As\.\.\.:sav &\ \.\.\.:sav +"-------------------- +menutrans Split\ &Diff\ with\.\.\. &\ \.\.\. +menutrans Split\ Patched\ &By\.\.\. &\ \ \.\.\. +"-------------------- +menutrans &Print &\.\.\. +menutrans Sa&ve-Exit:wqa &\ \ :wqa +menutrans E&xit:qa &:qa +" +" +" Submenu of Edit menu +menutrans &Undou &u +menutrans &Redo^R &Ctrl+R +menutrans Rep&eat\. &\. +"-------------------- +menutrans Cu&t"+x &"+x +menutrans &Copy"+y &"+y +menutrans &Paste"+gP &"+g\ Shift+P +menutrans Put\ &Before[p \ &[p +menutrans Put\ &After]p \ &]p +menutrans &Deletex &x +menutrans &Select\ AllggVG &\ gg\ Shift+V\ Shift+G +"-------------------- +" if has("win32") || has("gui_gtk") || has("gui_kde") || has("gui_motif") +menutrans &Find\.\.\. &\.\.\. +menutrans Find\ and\ Rep&lace\.\.\. &\.\.\. +" else +menutrans &Find/ &/ +menutrans Find\ and\ Rep&lace:%s &:%s +menutrans Find\ and\ Rep&lace:s &:s +"-------------------- +menutrans Settings\ &Window \ &\.\.\. +menutrans Startup\ &Settings \ & +menutrans &Global\ Settings &\ +menutrans F&ile\ Settings &\ \ +menutrans Show\ C&olor\ Schemes\ in\ Menu \ \ \ &\ +menutrans C&olor\ Scheme \ & +menutrans Show\ &Keymaps\ in\ Menu \ \ \ \ & +menutrans &Keymap &\ +menutrans None \ +menutrans Select\ Fo&nt\.\.\. &\.\.\. +">>>----------------- Edit/Global settings +menutrans Toggle\ Pattern\ &Highlight:set\ hls! \ &:set\ hls! +menutrans Toggle\ &Ignoring\ Case:set\ ic! &\ :set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! \ \ &:set\ sm! +menutrans &Context\ lines \ & +menutrans &Virtual\ Edit &\ +menutrans Toggle\ Insert\ &Mode:set\ im! \ &:set\ im! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! &\ \ \ Vi:set\ cp! +menutrans Search\ &Path\.\.\. &\ \ \ \.\.\. +menutrans Ta&g\ Files\.\.\. &\ \.\.\. +" +menutrans Toggle\ &Toolbar \ \ & +menutrans Toggle\ &Bottom\ Scrollbar \ \ \ & +menutrans Toggle\ &Left\ Scrollbar \ \ \ & +menutrans Toggle\ &Right\ Scrollbar \ \ \ & +">>>->>>------------- Edit/Global settings/Virtual edit +menutrans Never \ \ \ +menutrans Block\ Selection \ \ \ \ +menutrans Insert\ mode \ \ \ +menutrans Block\ and\ Insert \ \ \ \ \ \ +menutrans Always \ \ \ +">>>----------------- Edit/File settings +menutrans Toggle\ Line\ &Numbering:set\ nu! \ &\ :set\ nu! +menutrans Toggle\ relati&ve\ Line\ Numbering:set\ rnu! \ &\ \ :set\ nru! +menutrans Toggle\ &List\ Mode:set\ list! \ &\ :set\ list! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! &\ \ \ \ :set\ wrap! +menutrans Toggle\ W&rapping\ at\ word:set\ lbr! \ \ \ &\ :set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! \ \ &\ \ :set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! \ \ \ \ \ &:set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! \ \ \ \ &\ :set\ cin! +">>>--- +menutrans &Shiftwidth &\ +menutrans Soft\ &Tabstop \ & +menutrans Te&xt\ Width\.\.\. &\ \.\.\. +menutrans &File\ Format\.\.\. &\ \.\.\. +" +" +" +" Submenu of Tools menu +menutrans &Jump\ to\ this\ tagg^] &\ \ g\ Ctrl+] +menutrans Jump\ &back^T &\ Ctrl+T +menutrans Build\ &Tags\ File \ \ \ & +"------------------- +menutrans &Folding &\ +menutrans &Spelling & +menutrans &Diff &\ +"------------------- +menutrans &Make:make &:make +menutrans &List\ Errors:cl \ &:cl +menutrans L&ist\ Messages:cl! &\ \ :cl! +menutrans &Next\ Error:cn &\ \ \ :cn +menutrans &Previous\ Error:cp &\ \ \ :cp +menutrans &Older\ List:cold &\ \ :cold +menutrans N&ewer\ List:cnew &\ \ :cnew +menutrans Error\ &Window &\ \ \ +menutrans Show\ Compiler\ Se&ttings\ in\ Menu \ \ \ & +menutrans Se&T\ Compiler \ & +"------------------- +menutrans &Convert\ to\ HEX:%!xxd &\ \ HEX:%!xxd +menutrans Conve&rt\ back:%!xxd\ -r \ &\ HEX:%!xxd\ -r +">>>---------------- Tools/Spelling +menutrans &Spell\ Check\ On \ & +menutrans Spell\ Check\ &Off &\ \ +menutrans To\ &Next\ error]s &\ ]s +menutrans To\ &Previous\ error[s &\ [s +menutrans Suggest\ &Correctionsz= &\ z= +menutrans &Repeat\ correction:spellrepall \ &:spellrepall +"------------------- +menutrans Set\ language\ to\ "en" \ \ \ "en" +menutrans Set\ language\ to\ "en_au" \ \ \ "en_au" +menutrans Set\ language\ to\ "en_ca" \ \ \ "en_ca" +menutrans Set\ language\ to\ "en_gb" \ \ \ "en_gb" +menutrans Set\ language\ to\ "en_nz" \ \ \ "en_nz" +menutrans Set\ language\ to\ "en_us" \ \ \ "en_us" +menutrans &Find\ More\ Languages \ \ \ & +let g:menutrans_set_lang_to = ' ' +">>>---------------- Folds +menutrans &Enable/Disable\ foldszi &\ \ \ zi +menutrans &View\ Cursor\ Linezv \ \ \ &zv +menutrans Vie&w\ Cursor\ Line\ onlyzMzx \ &\ \ \ z\ Shift+M\ zx +menutrans C&lose\ more\ foldszm \ &\ \ zm +menutrans &Close\ all\ foldszM \ &\ \ z\ Shift+M +menutrans &Open\ all\ foldszR \ &\ \ z\ Shift+R +menutrans O&pen\ more\ foldszr &\ \ \ zr +menutrans Fold\ Met&hod &\ \ +menutrans Create\ &Foldzf &\ \ zf +menutrans &Delete\ Foldzd &\ \ zd +menutrans Delete\ &All\ FoldszD \ &\ \ z\ Shift+D +menutrans Fold\ col&umn\ width &\ \ \ \ +">>>->>>----------- Tools/Folds/Fold Method +menutrans M&anual \ & +menutrans I&ndent \ \ & +menutrans E&xpression \ \ & +menutrans S&yntax \ \ & +menutrans &Diff \ \ \ \ +menutrans Ma&rker \ \ & +">>>--------------- Sub of Tools/Diff +menutrans &Update &\ \ +menutrans &Get\ Block \ &\ \ +menutrans &Put\ Block \ &\ \ +">>>--------------- Tools/Error window +menutrans &Update:cwin &:cwin +menutrans &Close:cclose &:cclose +menutrans &Open:copen &:copen +" +" +" Syntax menu +" +menutrans &Show\ File\ Types\ in\ menu &\ \ \ \ +menutrans Set\ '&syntax'\ only &\ \ 'syntax' +menutrans Set\ '&filetype'\ too \ &\ 'filetype' +menutrans &Off &\ +menutrans &Manual \ \ & +menutrans A&utomatic \ \ & +menutrans on/off\ for\ &This\ file \ \ \ &\ +menutrans Co&lor\ test \ &\ +menutrans &Highlight\ test \ \ & +menutrans &Convert\ to\ HTML &\ \ \ \ HTML +" +" +" Buffers menu +" +menutrans &Refresh\ menu &\ \ +menutrans &Delete &\ +menutrans &Alternate &\ +menutrans &Next &\ +menutrans &Previous &\ +" +" +" Submenu of Window menu +" +menutrans &New^Wn &Ctrl+W\ n +menutrans S&plit^Ws \ \ &Ctrl+W\ s +menutrans Split\ &Vertically^Wv \ \ &Ctrl+W\ v +menutrans Sp&lit\ To\ #^W^^ &\ \ \ \ Ctrl+W\ Ctrl+^ +menutrans Split\ File\ E&xplorer \ +" +menutrans &Close^Wc &\ \ Ctrl+W\ c +menutrans Close\ &Other(s)^Wo &\ \ Ctrl+W\ o +" +menutrans Move\ &To & +menutrans Rotate\ &Up^WR \ &Ctrl+W\ Shift+R +menutrans Rotate\ &Down^Wr \ &Ctrl+W\ r +" +menutrans &Equal\ Size^W= \ &Ctrl+W\ = +menutrans &Max\ Height^W_ \ &Ctrl+W\ _ +menutrans M&in\ Height^W1_ \ &Ctrl+W\ 1_ +menutrans Max\ &Width^W\| \ &Ctrl+W\ \| +menutrans Min\ Widt&h^W1\| \ &Ctrl+W\ 1\| +">>>----------------- Submenu of Window/Move To +menutrans &Top^WK &Ctrl+W\ Shift+K +menutrans &Bottom^WJ &Ctrl+W\ Shift+J +menutrans &Left\ side^WH &Ctrl+W\ Shift+H +menutrans &Right\ side^WL &Ctrl+W\ Shift+L +" +" +" The popup menu +" +" +menutrans &Undo & +menutrans Cu&t & +menutrans &Copy & +menutrans &Paste & +menutrans &Delete & +menutrans Select\ Blockwise \ +menutrans Select\ &Word \ & +menutrans Select\ &Line \ & +menutrans Select\ &Block \ & +menutrans Select\ &All &\ +menutrans Select\ &Sentence \ & +menutrans Select\ Pa&ragraph \ & +" +" The Spelling popup menu +" +let g:menutrans_spell_change_ARG_to = '\ "%s"' +let g:menutrans_spell_add_ARG_to_word_list = '\ "%s"\ \ ' +let g:menutrans_spell_ignore_ARG = '\ "%s"' +" +" The GUI toolbar +" +if has("toolbar") + if exists("*Do_toolbar_tmenu") + delfun Do_toolbar_tmenu + endif + def g:Do_toolbar_tmenu() + tmenu ToolBar.New + tmenu ToolBar.Open + tmenu ToolBar.Save + tmenu ToolBar.SaveAll + tmenu ToolBar.Print + tmenu ToolBar.Undo + tmenu ToolBar.Redo + tmenu ToolBar.Cut + tmenu ToolBar.Copy + tmenu ToolBar.Paste + tmenu ToolBar.Find ... + tmenu ToolBar.FindNext + tmenu ToolBar.FindPrev + tmenu ToolBar.Replace ... + tmenu ToolBar.NewSesn + tmenu ToolBar.LoadSesn + tmenu ToolBar.SaveSesn + tmenu ToolBar.RunScript Vim + tmenu ToolBar.Shell + tmenu ToolBar.Make + tmenu ToolBar.RunCtags + tmenu ToolBar.TagJump + tmenu ToolBar.Help + tmenu ToolBar.FindHelp + tmenu ToolBar.WinClose + tmenu ToolBar.WinMax + tmenu ToolBar.WinMin + tmenu ToolBar.WinSplit + tmenu ToolBar.WinVSplit + tmenu ToolBar.WinMaxWidth + tmenu ToolBar.WinMinWidth + enddef +endif +" +" +" Dialog texts +" +" Find in help dialog +" +let g:menutrans_help_dialog = " , .\n\n , i_ (, i_CTRL-X)\n , c_ (, c_)\n , ' (, 'shftwidth')" +" +" Search path dialog +" +let g:menutrans_path_dialog = " , " +" +" Tag files dialog +" +let g:menutrans_tags_dialog = " " +" +" Text width dialog +" +let g:menutrans_textwidth_dialog = " \n , 0" +" +" File format dialog +" +let g:menutrans_fileformat_dialog = " " +let g:menutrans_fileformat_choices = "&1. Unix\n&2. Dos\n&3. Mac\n (&C)" +" +let menutrans_no_file = "[]" + +" Menus to handle Russian encodings +" Thanks to Pavlo Bohmat for the idea +" vassily ragosin +" +an 10.355 &File.-SEP- +an 10.360.20 &File.\ \ \.\.\..CP1251 :browse e ++enc=cp1251 +an 10.360.30 &File.\ \ \.\.\..CP866 :browse e ++enc=cp866 +an 10.360.30 &File.\ \ \.\.\..KOI8-R :browse e ++enc=koi8-r +an 10.360.40 &File.\ \ \.\.\..UTF-8 :browse e ++enc=utf-8 +an 10.365.20 &File.\ \ \.\.\..CP1251 :browse w ++enc=cp1251 +an 10.365.30 &File.\ \ \.\.\..CP866 :browse w ++enc=cp866 +an 10.365.30 &File.\ \ \.\.\..KOI8-R :browse w ++enc=koi8-r +an 10.365.40 &File.\ \ \.\.\..UTF-8 :browse w ++enc=utf-8 +" + +let &cpo = s:keepcpo +unlet s:keepcpo diff --git a/runtime/lang/menu_ru_ru.koi8-r.vim b/runtime/lang/menu_ru_ru.koi8-r.vim index 10eb68ae39..a6e8bdad3b 100644 --- a/runtime/lang/menu_ru_ru.koi8-r.vim +++ b/runtime/lang/menu_ru_ru.koi8-r.vim @@ -1,23 +1,25 @@ " Menu Translations: Russian -" Maintainer: Sergey Alyoshin -" Previous Maintainer: Vassily Ragosin -" Last Change: 16 May 2018 +" Maintainer: Restorer, +" Previous Maintainer: Sergey Alyoshin, +" vassily ragosin, +" Last Change: 23 Aug 2023 " Generated from menu_ru_ru.utf-8.vim, DO NOT EDIT -" URL: cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim +" URL: https://github.com/RestorerZ/RuVim " -" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $ " " Adopted for RuVim project by Vassily Ragosin. -" First translation: Tim Alexeevsky , -" based on ukrainian translation by Bohdan Vlasyuk +" First translation: Tim Alexeevsky, , +" based on ukrainian translation by Bohdan Vlasyuk, " " " Quit when menu translations have already been done. " +" Check is +" if exists("did_menu_trans") finish endif -let did_menu_trans = 1 +let g:did_menu_trans = 1 let s:keepcpo= &cpo set cpo&vim @@ -25,256 +27,256 @@ scriptencoding koi8-r " Top menutrans &File & -menutrans &Edit & -menutrans &Tools & -menutrans &Syntax & +menutrans &Edit & +menutrans &Tools & +menutrans &Syntax & menutrans &Buffers & menutrans &Window & -menutrans &Help & +menutrans &Help & " " " -" Help menu -menutrans &Overview & -menutrans &User\ Manual &\ -menutrans &How-To\ Links &\ \ \.\.\. -menutrans &Find\.\.\. & +" Submenu of menu Help +menutrans &Overview &\ F1 +menutrans &User\ Manual &\ +menutrans &How-to\ links & +menutrans &Find\.\.\. &\.\.\. "-------------------- -menutrans &Credits & -menutrans Co&pying & -menutrans &Sponsor/Register &/ -menutrans O&rphans & +menutrans &Credits & +menutrans Co&pying & +menutrans &Sponsor/Register &\ \ +menutrans O&rphans & "-------------------- -menutrans &Version &\ \ -menutrans &About & +menutrans &Version &\ +menutrans &About &\ " " -" File menu +" Submenu of File menu menutrans &Open\.\.\.:e &\.\.\.:e -menutrans Sp&lit-Open\.\.\.:sp &\ \.\.\.:sp -menutrans Open\ Tab\.\.\.:tabnew \ &\.\.\.:tabnew -menutrans &New:enew &:enew +menutrans Sp&lit-Open\.\.\.:sp &\ \ \ \.\.\.:sp +menutrans Open\ &Tab\.\.\.:tabnew &\ \ \ \.\.\.:tabnew +menutrans &New:enew &:enew menutrans &Close:close &:close "-------------------- menutrans &Save:w &:w -menutrans Save\ &As\.\.\.:sav \ &\.\.\.:sav +menutrans Save\ &As\.\.\.:sav &\ \.\.\.:sav "-------------------- -menutrans Split\ &Diff\ With\.\.\. &\ \.\.\. -menutrans Split\ Patched\ &By\.\.\. \ \ \ &\.\.\. +menutrans Split\ &Diff\ with\.\.\. &\ \.\.\. +menutrans Split\ Patched\ &By\.\.\. &\ \ \.\.\. "-------------------- -menutrans &Print & -menutrans Sa&ve-Exit:wqa &\ \ :wqa -menutrans E&xit:qa &:qa +menutrans &Print &\.\.\. +menutrans Sa&ve-Exit:wqa &\ \ :wqa +menutrans E&xit:qa &:qa " " -" Edit menu -menutrans &Undou &u -menutrans &Redo^R &^R +" Submenu of Edit menu +menutrans &Undou &u +menutrans &Redo^R &Ctrl+R menutrans Rep&eat\. &\. "-------------------- menutrans Cu&t"+x &"+x menutrans &Copy"+y &"+y -menutrans &Paste"+gP &"+gP -menutrans Put\ &Before[p \ &[p -menutrans Put\ &After]p \ &]p +menutrans &Paste"+gP &"+g\ Shift+P +menutrans Put\ &Before[p \ &[p +menutrans Put\ &After]p \ &]p menutrans &Deletex &x -menutrans &Select\ AllggVG &\ ӣggVG +menutrans &Select\ AllggVG &\ ӣgg\ Shift+V\ Shift+G "-------------------- -" Athena GUI only -menutrans &Find/ &/ -menutrans Find\ and\ Rep&lace:%s \ \ &:%s -" End Athena GUI only -menutrans &Find\.\.\./ &\.\.\./ -menutrans Find\ and\ Rep&lace\.\.\. \ \ &\.\.\. -menutrans Find\ and\ Rep&lace\.\.\.:%s \ \ &\.\.\.:%s -menutrans Find\ and\ Rep&lace\.\.\.:s \ \ &\.\.\.:s +" if has("win32") || has("gui_gtk") || has("gui_kde") || has("gui_motif") +menutrans &Find\.\.\. &\.\.\. +menutrans Find\ and\ Rep&lace\.\.\. &\.\.\. +" else +menutrans &Find/ &/ +menutrans Find\ and\ Rep&lace:%s &:%s +menutrans Find\ and\ Rep&lace:s &:s "-------------------- -menutrans Settings\ &Window \ \ & -menutrans Startup\ &Settings \ & -menutrans &Global\ Settings &\ -menutrans F&ile\ Settings \ & -menutrans C&olor\ Scheme &\ -menutrans &Keymap \ & -menutrans Select\ Fo&nt\.\.\. \ &\.\.\. +menutrans Settings\ &Window \ &\.\.\. +menutrans Startup\ &Settings \ & +menutrans &Global\ Settings &\ +menutrans F&ile\ Settings &\ \ +menutrans Show\ C&olor\ Schemes\ in\ Menu \ \ \ &\ +menutrans C&olor\ Scheme \ & +menutrans Show\ &Keymaps\ in\ Menu \ \ \ \ & +menutrans &Keymap &\ +menutrans None \ +menutrans Select\ Fo&nt\.\.\. &\.\.\. ">>>----------------- Edit/Global settings -menutrans Toggle\ Pattern\ &Highlight:set\ hls! \ &\ :set\ hls! -menutrans Toggle\ &Ignoring\ Case:set\ ic! &\ :set\ ic! -menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! \ \ &:set\ sm! -menutrans &Context\ Lines &\ \ -menutrans &Virtual\ Edit &\ -menutrans Toggle\ Insert\ &Mode:set\ im! \ &:set\ im! -menutrans Toggle\ Vi\ C&ompatibility:set\ cp! &\ \ Vi:set\ cp! -menutrans Search\ &Path\.\.\. &\ \ \ \.\.\. -menutrans Ta&g\ Files\.\.\. \ &\.\.\. +menutrans Toggle\ Pattern\ &Highlight:set\ hls! \ &:set\ hls! +menutrans Toggle\ &Ignoring\ Case:set\ ic! &\ :set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! \ \ &:set\ sm! +menutrans &Context\ lines \ & +menutrans &Virtual\ Edit &\ +menutrans Toggle\ Insert\ &Mode:set\ im! \ &:set\ im! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! &\ \ \ Vi:set\ cp! +menutrans Search\ &Path\.\.\. &\ \ \ \.\.\. +menutrans Ta&g\ Files\.\.\. &\ \.\.\. " -menutrans Toggle\ &Toolbar &\ -menutrans Toggle\ &Bottom\ Scrollbar \ \ & -menutrans Toggle\ &Left\ Scrollbar \ \ & -menutrans Toggle\ &Right\ Scrollbar \ \ & +menutrans Toggle\ &Toolbar \ \ & +menutrans Toggle\ &Bottom\ Scrollbar \ \ \ & +menutrans Toggle\ &Left\ Scrollbar \ \ \ & +menutrans Toggle\ &Right\ Scrollbar \ \ \ & ">>>->>>------------- Edit/Global settings/Virtual edit -menutrans Never -menutrans Block\ Selection \ \ -menutrans Insert\ Mode \ \ -menutrans Block\ and\ Insert \ \ \ \ \ \ -menutrans Always \ +menutrans Never \ \ \ +menutrans Block\ Selection \ \ \ \ +menutrans Insert\ mode \ \ \ +menutrans Block\ and\ Insert \ \ \ \ \ \ +menutrans Always \ \ \ ">>>----------------- Edit/File settings -menutrans Toggle\ Line\ &Numbering:set\ nu! &\ :set\ nu! -menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! &\ \ :set\ nru! -menutrans Toggle\ &List\ Mode:set\ list! &\ \ :set\ list! -menutrans Toggle\ Line\ &Wrapping:set\ wrap! &\ \ :set\ wrap! -menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! \ &\ :set\ lbr! -menutrans Toggle\ Tab\ &Expanding-tab:set\ et! &\ \ :set\ et! -menutrans Toggle\ &Auto\ Indenting:set\ ai! \ \ &:set\ ai! -menutrans Toggle\ &C-Style\ Indenting:set\ cin! \ \ \ &\ C:set\ cin! +menutrans Toggle\ Line\ &Numbering:set\ nu! \ &\ :set\ nu! +menutrans Toggle\ relati&ve\ Line\ Numbering:set\ rnu! \ &\ \ :set\ nru! +menutrans Toggle\ &List\ Mode:set\ list! \ &\ :set\ list! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! &\ \ \ \ :set\ wrap! +menutrans Toggle\ W&rapping\ at\ word:set\ lbr! \ \ \ &\ :set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! \ \ &\ \ :set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! \ \ \ \ \ &:set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! \ \ \ \ &\ :set\ cin! ">>>--- -menutrans &Shiftwidth &\ -menutrans Soft\ &Tabstop \ & -menutrans Te&xt\ Width\.\.\. &\ \.\.\. -menutrans &File\ Format\.\.\. &\ \.\.\. +menutrans &Shiftwidth &\ +menutrans Soft\ &Tabstop \ & +menutrans Te&xt\ Width\.\.\. &\ \.\.\. +menutrans &File\ Format\.\.\. &\ \.\.\. " " " -" Tools menu -menutrans &Jump\ to\ This\ Tagg^] &\ \ g^] -menutrans Jump\ &Back^T &\ ^T -menutrans Build\ &Tags\ File \ \ & +" Submenu of Tools menu +menutrans &Jump\ to\ this\ tagg^] &\ \ g\ Ctrl+] +menutrans Jump\ &back^T &\ Ctrl+T +menutrans Build\ &Tags\ File \ \ \ & "------------------- -menutrans &Folding & -menutrans &Spelling & -menutrans &Diff &\ (diff) +menutrans &Folding &\ +menutrans &Spelling & +menutrans &Diff &\ "------------------- -menutrans &Make:make &:make -menutrans &List\ Errors:cl \ &:cl -menutrans L&ist\ Messages:cl! \ &:cl! -menutrans &Next\ Error:cn &\ :cn -menutrans &Previous\ Error:cp &\ :cp -menutrans &Older\ List:cold \ &\ \ :cold -menutrans N&ewer\ List:cnew \ &\ \ :cnew -menutrans Error\ &Window &\ -menutrans Se&t\ Compiler \ & -menutrans Show\ Compiler\ Se&ttings\ in\ Menu &\ \ &\ \ +menutrans &Make:make &:make +menutrans &List\ Errors:cl \ &:cl +menutrans L&ist\ Messages:cl! &\ \ :cl! +menutrans &Next\ Error:cn &\ \ \ :cn +menutrans &Previous\ Error:cp &\ \ \ :cp +menutrans &Older\ List:cold &\ \ :cold +menutrans N&ewer\ List:cnew &\ \ :cnew +menutrans Error\ &Window &\ \ \ +menutrans Show\ Compiler\ Se&ttings\ in\ Menu \ \ \ & +menutrans Se&T\ Compiler \ & "------------------- -menutrans &Convert\ to\ HEX:%!xxd &\ \ HEX:%!xxd -menutrans Conve&rt\ Back:%!xxd\ -r \ &\ HEX:%!xxd\ -r +menutrans &Convert\ to\ HEX:%!xxd &\ \ HEX:%!xxd +menutrans Conve&rt\ back:%!xxd\ -r \ &\ HEX:%!xxd\ -r ">>>---------------- Tools/Spelling -menutrans &Spell\ Check\ On &\ \ -menutrans Spell\ Check\ &Off &\ \ -menutrans To\ &Next\ Error]s &\ ]s -menutrans To\ &Previous\ Error[s &\ [s -menutrans Suggest\ &Correctionsz= \ &z= -menutrans &Repeat\ Correction:spellrepall &\ \ \ spellrepall +menutrans &Spell\ Check\ On \ & +menutrans Spell\ Check\ &Off &\ \ +menutrans To\ &Next\ error]s &\ ]s +menutrans To\ &Previous\ error[s &\ [s +menutrans Suggest\ &Correctionsz= &\ z= +menutrans &Repeat\ correction:spellrepall \ &:spellrepall "------------------- -menutrans Set\ Language\ to\ "en" \ \ "en" -menutrans Set\ Language\ to\ "en_au" \ \ "en_au" -menutrans Set\ Language\ to\ "en_ca" \ \ "en_ca" -menutrans Set\ Language\ to\ "en_gb" \ \ "en_gb" -menutrans Set\ Language\ to\ "en_nz" \ \ "en_nz" -menutrans Set\ Language\ to\ "en_us" \ \ "en_us" -menutrans &Find\ More\ Languages &\ \ -let g:menutrans_set_lang_to = ' ' -" -" -" The Spelling popup menu -" -" -let g:menutrans_spell_change_ARG_to = '\ "%s"\ ' -let g:menutrans_spell_add_ARG_to_word_list = '\ "%s"\ \ ' -let g:menutrans_spell_ignore_ARG = '\ "%s"' +menutrans Set\ language\ to\ "en" \ \ \ "en" +menutrans Set\ language\ to\ "en_au" \ \ \ "en_au" +menutrans Set\ language\ to\ "en_ca" \ \ \ "en_ca" +menutrans Set\ language\ to\ "en_gb" \ \ \ "en_gb" +menutrans Set\ language\ to\ "en_nz" \ \ \ "en_nz" +menutrans Set\ language\ to\ "en_us" \ \ \ "en_us" +menutrans &Find\ More\ Languages \ \ \ & +let g:menutrans_set_lang_to = ' ' ">>>---------------- Folds -menutrans &Enable/Disable\ Foldszi /\ &zi -menutrans &View\ Cursor\ Linezv \ \ \ &zv -menutrans Vie&w\ Cursor\ Line\ OnlyzMzx \ &\ \ \ zMzx -menutrans C&lose\ More\ Foldszm \ &\ zm -menutrans &Close\ All\ FoldszM \ &\ zM -menutrans &Open\ All\ FoldszR &\ \ zR -menutrans O&pen\ More\ Foldszr &\ \ zr -menutrans Fold\ Met&hod &\ -menutrans Create\ &Foldzf &\ zf -menutrans &Delete\ Foldzd &\ zd -menutrans Delete\ &All\ FoldszD \ &\ zD -menutrans Fold\ col&umn\ Width &\ \ +menutrans &Enable/Disable\ foldszi &\ \ \ zi +menutrans &View\ Cursor\ Linezv \ \ \ &zv +menutrans Vie&w\ Cursor\ Line\ onlyzMzx \ &\ \ \ z\ Shift+M\ zx +menutrans C&lose\ more\ foldszm \ &\ \ zm +menutrans &Close\ all\ foldszM \ &\ \ z\ Shift+M +menutrans &Open\ all\ foldszR \ &\ \ z\ Shift+R +menutrans O&pen\ more\ foldszr &\ \ \ zr +menutrans Fold\ Met&hod &\ \ +menutrans Create\ &Foldzf &\ \ zf +menutrans &Delete\ Foldzd &\ \ zd +menutrans Delete\ &All\ FoldszD \ &\ \ z\ Shift+D +menutrans Fold\ col&umn\ width &\ \ \ \ ">>>->>>----------- Tools/Folds/Fold Method -menutrans M&anual & -menutrans I&ndent & -menutrans E&xpression & -menutrans S&yntax & -menutrans Ma&rker & -">>>--------------- Tools/Diff -menutrans &Update & -menutrans &Get\ Block \ &\ -menutrans &Put\ Block \ &\ -">>>--------------- Tools/Diff/Error window -menutrans &Update:cwin &:cwin -menutrans &Close:cclose &:cclose -menutrans &Open:copen &:copen +menutrans M&anual \ & +menutrans I&ndent \ \ & +menutrans E&xpression \ \ &ޣ +menutrans S&yntax \ \ & +menutrans &Diff \ \ \ \ +menutrans Ma&rker \ \ & +">>>--------------- Sub of Tools/Diff +menutrans &Update &\ \ +menutrans &Get\ Block \ &\ \ +menutrans &Put\ Block \ &\ \ +">>>--------------- Tools/Error window +menutrans &Update:cwin &:cwin +menutrans &Close:cclose &:cclose +menutrans &Open:copen &:copen " " " Syntax menu " -menutrans &Show\ File\ Types\ in\ Menu \ \ \ \ & -menutrans Set\ '&syntax'\ only &\ \ \ 'syntax' -menutrans Set\ '&filetype'\ too \ &\ \ 'filetype' -menutrans &Off & -menutrans &Manual & -menutrans A&utomatic & -menutrans On/Off\ for\ &This\ File /\ \ &\ -menutrans Co&lor\ Test \ & -menutrans &Highlight\ Test \ & -menutrans &Convert\ to\ HTML &\ HTML\ \ +menutrans &Show\ File\ Types\ in\ menu &\ \ \ \ +menutrans Set\ '&syntax'\ only &\ \ 'syntax' +menutrans Set\ '&filetype'\ too \ &\ 'filetype' +menutrans &Off &\ +menutrans &Manual \ \ & +menutrans A&utomatic \ \ & +menutrans on/off\ for\ &This\ file \ \ \ &\ +menutrans Co&lor\ test \ &\ +menutrans &Highlight\ test \ \ & +menutrans &Convert\ to\ HTML &\ \ \ \ HTML " " " Buffers menu " -menutrans &Refresh\ menu &\ -menutrans Delete & -menutrans &Alternate & -menutrans &Next & -menutrans &Previous & -menutrans [No\ File] [\ ] +menutrans &Refresh\ menu &\ \ +menutrans &Delete &\ +menutrans &Alternate &\ +menutrans &Next &\ +menutrans &Previous &\ " " -" Window menu +" Submenu of Window menu " -menutrans &New^Wn &\ ^Wn -menutrans S&plit^Ws &\ ^Ws -menutrans Sp&lit\ To\ #^W^^ \ &\ \ \ \ ^W^^ -menutrans Split\ &Vertically^Wv \ \ &^Wv -menutrans Split\ File\ E&xplorer \ \ \ &\ +menutrans &New^Wn &Ctrl+W\ n +menutrans S&plit^Ws \ \ &Ctrl+W\ s +menutrans Split\ &Vertically^Wv \ \ &Ctrl+W\ v +menutrans Sp&lit\ To\ #^W^^ &\ \ \ \ Ctrl+W\ Ctrl+^ +menutrans Split\ File\ E&xplorer \ " -menutrans &Close^Wc &\ \ ^Wc -menutrans Close\ &Other(s)^Wo \ &\ ^Wo +menutrans &Close^Wc &\ \ Ctrl+W\ c +menutrans Close\ &Other(s)^Wo &\ \ Ctrl+W\ o " -menutrans Move\ &To & -menutrans Rotate\ &Up^WR \ &^WR -menutrans Rotate\ &Down^Wr \ &^Wr +menutrans Move\ &To & +menutrans Rotate\ &Up^WR \ &Ctrl+W\ Shift+R +menutrans Rotate\ &Down^Wr \ &Ctrl+W\ r " -menutrans &Equal\ Size^W= &\ ^W= -menutrans &Max\ Height^W_ \ &^W_ -menutrans M&in\ Height^W1_ \ &^W1_ -menutrans Max\ &Width^W\| \ &^W\| -menutrans Min\ Widt&h^W1\| &\ ^W1\| -">>>----------------- Window/Move To -menutrans &Top^WK &^WK -menutrans &Bottom^WJ &^WJ -menutrans &Left\ Side^WH &^WH -menutrans &Right\ Side^WL &^WL +menutrans &Equal\ Size^W= \ &Ctrl+W\ = +menutrans &Max\ Height^W_ \ &Ctrl+W\ _ +menutrans M&in\ Height^W1_ \ &Ctrl+W\ 1_ +menutrans Max\ &Width^W\| \ &Ctrl+W\ \| +menutrans Min\ Widt&h^W1\| \ &Ctrl+W\ 1\| +">>>----------------- Submenu of Window/Move To +menutrans &Top^WK &Ctrl+W\ Shift+K +menutrans &Bottom^WJ &Ctrl+W\ Shift+J +menutrans &Left\ side^WH &Ctrl+W\ Shift+H +menutrans &Right\ side^WL &Ctrl+W\ Shift+L " " " The popup menu " " -menutrans &Undo & -menutrans Cu&t & -menutrans &Copy & -menutrans &Paste & -menutrans &Delete & -menutrans Select\ Blockwise \ -menutrans Select\ &Word \ & -menutrans Select\ &Sentence \ & -menutrans Select\ Pa&ragraph \ & -menutrans Select\ &Line \ & -menutrans Select\ &Block \ & -menutrans Select\ &All \ &ӣ +menutrans &Undo & +menutrans Cu&t & +menutrans &Copy & +menutrans &Paste & +menutrans &Delete & +menutrans Select\ Blockwise \ +menutrans Select\ &Word \ & +menutrans Select\ &Line \ & +menutrans Select\ &Block \ & +menutrans Select\ &All &\ ӣ +menutrans Select\ &Sentence \ & +menutrans Select\ Pa&ragraph \ & +" +" The Spelling popup menu +" +let g:menutrans_spell_change_ARG_to = '\ "%s"' +let g:menutrans_spell_add_ARG_to_word_list = '\ "%s"\ \ ' +let g:menutrans_spell_ignore_ARG = '\ "%s"' " " The GUI toolbar " @@ -282,29 +284,39 @@ if has("toolbar") if exists("*Do_toolbar_tmenu") delfun Do_toolbar_tmenu endif - fun Do_toolbar_tmenu() - tmenu ToolBar.Open - tmenu ToolBar.Save - tmenu ToolBar.SaveAll - tmenu ToolBar.Print - tmenu ToolBar.Undo - tmenu ToolBar.Redo - tmenu ToolBar.Cut - tmenu ToolBar.Copy - tmenu ToolBar.Paste - tmenu ToolBar.FindNext - tmenu ToolBar.FindPrev - tmenu ToolBar.Replace ... - tmenu ToolBar.LoadSesn - tmenu ToolBar.SaveSesn - tmenu ToolBar.RunScript Vim - tmenu ToolBar.Make - tmenu ToolBar.Shell - tmenu ToolBar.RunCtags - tmenu ToolBar.TagJump - tmenu ToolBar.Help - tmenu ToolBar.FindHelp - endfun + def g:Do_toolbar_tmenu() + tmenu ToolBar.New + tmenu ToolBar.Open + tmenu ToolBar.Save + tmenu ToolBar.SaveAll + tmenu ToolBar.Print + tmenu ToolBar.Undo + tmenu ToolBar.Redo + tmenu ToolBar.Cut + tmenu ToolBar.Copy + tmenu ToolBar.Paste + tmenu ToolBar.Find ... + tmenu ToolBar.FindNext + tmenu ToolBar.FindPrev + tmenu ToolBar.Replace ... + tmenu ToolBar.NewSesn + tmenu ToolBar.LoadSesn + tmenu ToolBar.SaveSesn + tmenu ToolBar.RunScript Vim + tmenu ToolBar.Shell + tmenu ToolBar.Make + tmenu ToolBar.RunCtags + tmenu ToolBar.TagJump + tmenu ToolBar.Help + tmenu ToolBar.FindHelp + tmenu ToolBar.WinClose + tmenu ToolBar.WinMax + tmenu ToolBar.WinMin + tmenu ToolBar.WinSplit + tmenu ToolBar.WinVSplit + tmenu ToolBar.WinMaxWidth + tmenu ToolBar.WinMinWidth + enddef endif " " @@ -312,26 +324,41 @@ endif " " Find in help dialog " -let g:menutrans_help_dialog = " :\n\n i_ (, i_CTRL-X)\n c_ (, _)\n ' (, 'shiftwidth')" +let g:menutrans_help_dialog = " , .\n\n , i_ (, i_CTRL-X)\n , c_ (, c_)\n , ' (, 'shftwidth')" " -" Searh path dialog +" Search path dialog " -let g:menutrans_path_dialog = " .\n ." +let g:menutrans_path_dialog = " , " " " Tag files dialog " -let g:menutrans_tags_dialog = " ( ).\n" +let g:menutrans_tags_dialog = " " " " Text width dialog " -let g:menutrans_textwidth_dialog = " .\n 0." +let g:menutrans_textwidth_dialog = " \n , 0" " " File format dialog " -let g:menutrans_fileformat_dialog = " ." -let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\n&" +let g:menutrans_fileformat_dialog = " " +let g:menutrans_fileformat_choices = "&1. Unix\n&2. Dos\n&3. Mac\n (&C)" +" +let menutrans_no_file = "[]" + +" Menus to handle Russian encodings +" Thanks to Pavlo Bohmat for the idea +" vassily ragosin +" +an 10.355 &File.-SEP- +an 10.360.20 &File.\ \ \.\.\..CP1251 :browse e ++enc=cp1251 +an 10.360.30 &File.\ \ \.\.\..CP866 :browse e ++enc=cp866 +an 10.360.30 &File.\ \ \.\.\..KOI8-R :browse e ++enc=koi8-r +an 10.360.40 &File.\ \ \.\.\..UTF-8 :browse e ++enc=utf-8 +an 10.365.20 &File.\ \ \.\.\..CP1251 :browse w ++enc=cp1251 +an 10.365.30 &File.\ \ \.\.\..CP866 :browse w ++enc=cp866 +an 10.365.30 &File.\ \ \.\.\..KOI8-R :browse w ++enc=koi8-r +an 10.365.40 &File.\ \ \.\.\..UTF-8 :browse w ++enc=utf-8 " -let menutrans_no_file = "[ ]" let &cpo = s:keepcpo unlet s:keepcpo diff --git a/runtime/lang/menu_ru_ru.utf-8.vim b/runtime/lang/menu_ru_ru.utf-8.vim index c28c1819bf..92e05f259c 100644 --- a/runtime/lang/menu_ru_ru.utf-8.vim +++ b/runtime/lang/menu_ru_ru.utf-8.vim @@ -1,23 +1,25 @@ " Menu Translations: Russian -" Maintainer: Sergey Alyoshin -" Previous Maintainer: Vassily Ragosin -" Last Change: 16 May 2018 +" Maintainer: Restorer, +" Previous Maintainer: Sergey Alyoshin, +" vassily ragosin, +" Last Change: 23 Aug 2023 " Original translations -" URL: cvs://cvs.sf.net:/cvsroot/ruvim/extras/menu/menu_ru_ru.vim +" URL: https://github.com/RestorerZ/RuVim " -" $Id: menu_ru_ru.vim,v 1.1 2004/06/13 16:09:10 vimboss Exp $ " " Adopted for RuVim project by Vassily Ragosin. -" First translation: Tim Alexeevsky , -" based on ukrainian translation by Bohdan Vlasyuk +" First translation: Tim Alexeevsky, , +" based on ukrainian translation by Bohdan Vlasyuk, " " " Quit when menu translations have already been done. " +" Check is +" if exists("did_menu_trans") finish endif -let did_menu_trans = 1 +let g:did_menu_trans = 1 let s:keepcpo= &cpo set cpo&vim @@ -25,256 +27,256 @@ scriptencoding utf-8 " Top menutrans &File &Файл -menutrans &Edit П&равка -menutrans &Tools &Инструменты -menutrans &Syntax &Синтаксис +menutrans &Edit &Правка +menutrans &Tools С&ервис +menutrans &Syntax Син&таксис menutrans &Buffers &Буферы menutrans &Window &Окно -menutrans &Help С&правка +menutrans &Help &Справка " " " -" Help menu -menutrans &Overview &Обзор -menutrans &User\ Manual Руково&дство\ пользователя -menutrans &How-To\ Links &Как\ это\ сделать\.\.\. -menutrans &Find\.\.\. &Поиск +" Submenu of menu Help +menutrans &Overview О&бщий\ обзорF1 +menutrans &User\ Manual &Руководство\ пользователя +menutrans &How-to\ links &Инструкции +menutrans &Find\.\.\. &Найти\.\.\. "-------------------- -menutrans &Credits &Благодарности -menutrans Co&pying &Распространение -menutrans &Sponsor/Register Помо&щь/Регистрация -menutrans O&rphans &Сироты +menutrans &Credits Со&авторы +menutrans Co&pying &Лицензия +menutrans &Sponsor/Register Сод&ействие\ и\ регистрация +menutrans O&rphans &Благотворительность "-------------------- -menutrans &Version &Информация\ о\ программе -menutrans &About &Заставка +menutrans &Version &Текущая\ версия +menutrans &About &О\ программе " " -" File menu +" Submenu of File menu menutrans &Open\.\.\.:e &Открыть\.\.\.:e -menutrans Sp&lit-Open\.\.\.:sp По&делить\ окно\.\.\.:sp -menutrans Open\ Tab\.\.\.:tabnew Открыть\ в&кладку\.\.\.:tabnew -menutrans &New:enew &Новый:enew +menutrans Sp&lit-Open\.\.\.:sp От&крыть\ в\ новом\ окне\.\.\.:sp +menutrans Open\ &Tab\.\.\.:tabnew Откры&ть\ в\ новой\ вкладке\.\.\.:tabnew +menutrans &New:enew Созд&ать:enew menutrans &Close:close &Закрыть:close "-------------------- menutrans &Save:w &Сохранить:w -menutrans Save\ &As\.\.\.:sav Сохранить\ &как\.\.\.:sav +menutrans Save\ &As\.\.\.:sav Со&хранить\ как\.\.\.:sav "-------------------- -menutrans Split\ &Diff\ With\.\.\. Ср&авнить\ с\.\.\. -menutrans Split\ Patched\ &By\.\.\. Сравнить\ с\ применением\ зап&латки\.\.\. +menutrans Split\ &Diff\ with\.\.\. Сра&внить\ с\.\.\. +menutrans Split\ Patched\ &By\.\.\. Сравн&ить\ и\ исправить\.\.\. "-------------------- -menutrans &Print На&печатать -menutrans Sa&ve-Exit:wqa Вы&ход\ с\ сохранением:wqa -menutrans E&xit:qa &Выход:qa +menutrans &Print &Печать\.\.\. +menutrans Sa&ve-Exit:wqa Сохра&нить\ и\ выйти:wqa +menutrans E&xit:qa В&ыход:qa " " -" Edit menu -menutrans &Undou О&тменитьu -menutrans &Redo^R В&ернуть^R +" Submenu of Edit menu +menutrans &Undou &Отменитьu +menutrans &Redo^R В&ернутьCtrl+R menutrans Rep&eat\. Повторит&ь\. "-------------------- menutrans Cu&t"+x &Вырезать"+x menutrans &Copy"+y &Копировать"+y -menutrans &Paste"+gP Вк&леить"+gP -menutrans Put\ &Before[p Вклеить\ пере&д[p -menutrans Put\ &After]p Вклеить\ по&сле]p +menutrans &Paste"+gP Вст&авить"+g\ Shift+P +menutrans Put\ &Before[p Поместить\ п&еред[p +menutrans Put\ &After]p Поместить\ по&сле]p menutrans &Deletex &Удалитьx -menutrans &Select\ AllggVG В&ыделить\ всёggVG +menutrans &Select\ AllggVG В&ыделить\ всёgg\ Shift+V\ Shift+G "-------------------- -" Athena GUI only -menutrans &Find/ &Поиск/ -menutrans Find\ and\ Rep&lace:%s Поиск\ и\ &замена:%s -" End Athena GUI only -menutrans &Find\.\.\./ &Поиск\.\.\./ -menutrans Find\ and\ Rep&lace\.\.\. Поиск\ и\ &замена\.\.\. -menutrans Find\ and\ Rep&lace\.\.\.:%s Поиск\ и\ &замена\.\.\.:%s -menutrans Find\ and\ Rep&lace\.\.\.:s Поиск\ и\ &замена\.\.\.:s +" if has("win32") || has("gui_gtk") || has("gui_kde") || has("gui_motif") +menutrans &Find\.\.\. &Найти\.\.\. +menutrans Find\ and\ Rep&lace\.\.\. &Заменить\.\.\. +" else +menutrans &Find/ &Найти/ +menutrans Find\ and\ Rep&lace:%s &Заменить:%s +menutrans Find\ and\ Rep&lace:s &Заменить:s "-------------------- -menutrans Settings\ &Window Окно\ настройки\ &опций -menutrans Startup\ &Settings Настройки\ запус&ка -menutrans &Global\ Settings &Глобальные\ настройки -menutrans F&ile\ Settings Настройки\ &файлов -menutrans C&olor\ Scheme &Цветовая\ схема -menutrans &Keymap Раскладка\ кл&авиатуры -menutrans Select\ Fo&nt\.\.\. Выбор\ &шрифта\.\.\. +menutrans Settings\ &Window Все\ &параметры\.\.\. +menutrans Startup\ &Settings Параметры\ запус&ка +menutrans &Global\ Settings О&бщие\ параметры +menutrans F&ile\ Settings Пара&метры\ текущего\ буфера +menutrans Show\ C&olor\ Schemes\ in\ Menu Показать\ меню\ выбора\ цве&товой\ схемы +menutrans C&olor\ Scheme Цветовая\ с&хема +menutrans Show\ &Keymaps\ in\ Menu Показать\ меню\ выбора\ раскладки\ к&лавиатуры +menutrans &Keymap &Раскладка\ клавиатуры +menutrans None Не\ использовать +menutrans Select\ Fo&nt\.\.\. &Шрифт\.\.\. ">>>----------------- Edit/Global settings -menutrans Toggle\ Pattern\ &Highlight:set\ hls! Подсветка\ &найденных\ соответствий:set\ hls! -menutrans Toggle\ &Ignoring\ Case:set\ ic! &Регистронезависимый\ поиск:set\ ic! -menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Показывать\ парные\ &элементы:set\ sm! -menutrans &Context\ Lines Стр&ок\ вокруг\ курсора -menutrans &Virtual\ Edit Вир&туальное\ редактирование -menutrans Toggle\ Insert\ &Mode:set\ im! Режим\ &Вставки:set\ im! -menutrans Toggle\ Vi\ C&ompatibility:set\ cp! &Совместимость\ с\ Vi:set\ cp! -menutrans Search\ &Path\.\.\. &Путь\ для\ поиска\ файлов\.\.\. -menutrans Ta&g\ Files\.\.\. Файлы\ &меток\.\.\. +menutrans Toggle\ Pattern\ &Highlight:set\ hls! Подсветка\ сов&падений:set\ hls! +menutrans Toggle\ &Ignoring\ Case:set\ ic! &Регистронезависимый\ поиск:set\ ic! +menutrans Toggle\ &Showing\ Matched\ Pairs:set\ sm! Подсветка\ парных\ &элементов:set\ sm! +menutrans &Context\ lines Контекстных\ стр&ок +menutrans &Virtual\ Edit Вир&туальное\ редактирование +menutrans Toggle\ Insert\ &Mode:set\ im! Режим\ &вставки:set\ im! +menutrans Toggle\ Vi\ C&ompatibility:set\ cp! &Совместимость\ с\ редактором\ Vi:set\ cp! +menutrans Search\ &Path\.\.\. &Каталоги\ для\ поиска\ файлов\.\.\. +menutrans Ta&g\ Files\.\.\. И&ндексные\ файлы\.\.\. " -menutrans Toggle\ &Toolbar &Инструментальная\ панель -menutrans Toggle\ &Bottom\ Scrollbar Полоса\ прокрутки\ вни&зу -menutrans Toggle\ &Left\ Scrollbar Полоса\ прокрутки\ с&лева -menutrans Toggle\ &Right\ Scrollbar Полоса\ прокрутки\ спр&ава +menutrans Toggle\ &Toolbar Показ\ панели\ &инструментов +menutrans Toggle\ &Bottom\ Scrollbar Показ\ полосы\ прокрутки\ вни&зу +menutrans Toggle\ &Left\ Scrollbar Показ\ полосы\ прокрутки\ с&лева +menutrans Toggle\ &Right\ Scrollbar Показ\ полосы\ прокрутки\ спр&ава ">>>->>>------------- Edit/Global settings/Virtual edit -menutrans Never Выключено -menutrans Block\ Selection При\ выделении\ блока -menutrans Insert\ Mode В\ режиме\ Вставки -menutrans Block\ and\ Insert При\ выделении\ блока\ и\ в\ режиме\ Вставки -menutrans Always Включено\ всегда +menutrans Never Выключено\ во\ всех\ режимах +menutrans Block\ Selection Включено\ в\ режиме\ визуального\ блока +menutrans Insert\ mode Включено\ в\ режиме\ вставки +menutrans Block\ and\ Insert Включено\ в\ режимах\ визуального\ блока\ и\ вставки +menutrans Always Включено\ во\ всех\ режимах ">>>----------------- Edit/File settings -menutrans Toggle\ Line\ &Numbering:set\ nu! &Нумерация\ строк:set\ nu! -menutrans Toggle\ Relati&ve\ Line\ Numbering:set\ rnu! Относите&льная\ нумерация\ строк:set\ nru! -menutrans Toggle\ &List\ Mode:set\ list! Отобра&жение\ невидимых\ символов:set\ list! -menutrans Toggle\ Line\ &Wrapping:set\ wrap! &Перенос\ длинных\ строк:set\ wrap! -menutrans Toggle\ W&rapping\ at\ Word:set\ lbr! Перенос\ &целых\ слов:set\ lbr! -menutrans Toggle\ Tab\ &Expanding-tab:set\ et! Про&белы\ вместо\ табуляции:set\ et! -menutrans Toggle\ &Auto\ Indenting:set\ ai! Автоматическое\ форматирование\ &отступов:set\ ai! -menutrans Toggle\ &C-Style\ Indenting:set\ cin! Форматирование\ отступов\ в\ &стиле\ C:set\ cin! +menutrans Toggle\ Line\ &Numbering:set\ nu! Показ\ &нумерации\ строк:set\ nu! +menutrans Toggle\ relati&ve\ Line\ Numbering:set\ rnu! Показ\ относите&льной\ нумерации\ строк:set\ nru! +menutrans Toggle\ &List\ Mode:set\ list! Показ\ не&печатаемых\ знаков:set\ list! +menutrans Toggle\ Line\ &Wrapping:set\ wrap! &Разбивка\ строк\ по\ границе\ окна:set\ wrap! +menutrans Toggle\ W&rapping\ at\ word:set\ lbr! Разбивка\ строк\ по\ &границе\ слов:set\ lbr! +menutrans Toggle\ Tab\ &Expanding:set\ et! Замена\ символов\ &табуляции\ на\ пробелы:set\ et! +menutrans Toggle\ &Auto\ Indenting:set\ ai! Установка\ отступа\ как\ у\ текущей\ &строки:set\ ai! +menutrans Toggle\ &C-Style\ Indenting:set\ cin! Установка\ отступа\ как\ в\ &языке\ Си:set\ cin! ">>>--- -menutrans &Shiftwidth Вели&чина\ отступа -menutrans Soft\ &Tabstop Ширина\ &табуляции -menutrans Te&xt\ Width\.\.\. &Ширина\ текста\.\.\. -menutrans &File\ Format\.\.\. &Формат\ файла\.\.\. +menutrans &Shiftwidth Вели&чина\ отступа +menutrans Soft\ &Tabstop Ширина\ &табуляции +menutrans Te&xt\ Width\.\.\. &Ширина\ текста\.\.\. +menutrans &File\ Format\.\.\. &Формат\ файла\.\.\. " " " -" Tools menu -menutrans &Jump\ to\ This\ Tagg^] &Перейти\ к\ меткеg^] -menutrans Jump\ &Back^T &Вернуться\ назад^T -menutrans Build\ &Tags\ File Создать\ файл\ ме&ток +" Submenu of Tools menu +menutrans &Jump\ to\ this\ tagg^] &Перейти\ по\ указателюg\ Ctrl+] +menutrans Jump\ &back^T &Вернуться\ назадCtrl+T +menutrans Build\ &Tags\ File Создать\ файл\ с\ &индексами "------------------- -menutrans &Folding &Складки -menutrans &Spelling Пр&авописание -menutrans &Diff &Отличия\ (diff) +menutrans &Folding С&труктура\ текста +menutrans &Spelling Пр&авописание +menutrans &Diff &Сравнение\ текста "------------------- -menutrans &Make:make Ко&мпилировать:make -menutrans &List\ Errors:cl Список\ о&шибок:cl -menutrans L&ist\ Messages:cl! Список\ соо&бщений:cl! -menutrans &Next\ Error:cn Следу&ющая\ ошибка:cn -menutrans &Previous\ Error:cp П&редыдущая\ ошибка:cp -menutrans &Older\ List:cold Более\ стар&ый\ список\ ошибок:cold -menutrans N&ewer\ List:cnew Более\ све&жий\ список\ ошибок:cnew -menutrans Error\ &Window Ок&но\ ошибок -menutrans Se&t\ Compiler Выбор\ &компилятора -menutrans Show\ Compiler\ Se&ttings\ in\ Menu Пока&зать\ настройки\ компи&лятора\ в\ меню +menutrans &Make:make Ко&мпиляция:make +menutrans &List\ Errors:cl Распознанные\ о&шибки:cl +menutrans L&ist\ Messages:cl! Вес&ь\ список\ результатов:cl! +menutrans &Next\ Error:cn Следу&ющая\ запись\ из\ списка:cn +menutrans &Previous\ Error:cp Пр&едыдущая\ запись\ из\ списка:cp +menutrans &Older\ List:cold Пред&ыдущий\ список\ результатов:cold +menutrans N&ewer\ List:cnew С&ледующий\ список\ результатов:cnew +menutrans Error\ &Window Ок&но\ со\ списком\ результатов +menutrans Show\ Compiler\ Se&ttings\ in\ Menu Показать\ меню\ выбора\ &компилятора +menutrans Se&T\ Compiler Выбрать\ &компилятор "------------------- -menutrans &Convert\ to\ HEX:%!xxd П&еревести\ в\ HEX:%!xxd -menutrans Conve&rt\ Back:%!xxd\ -r Перевести\ и&з\ HEX:%!xxd\ -r +menutrans &Convert\ to\ HEX:%!xxd Прео&бразовать\ в\ HEX:%!xxd +menutrans Conve&rt\ back:%!xxd\ -r Преобразовать\ и&з\ HEX:%!xxd\ -r ">>>---------------- Tools/Spelling -menutrans &Spell\ Check\ On &Вкл\ проверку\ правописания -menutrans Spell\ Check\ &Off Вы&кл\ проверку\ правописания -menutrans To\ &Next\ Error]s &Следующая\ ошибка]s -menutrans To\ &Previous\ Error[s &Предыдущая\ ошибка[s -menutrans Suggest\ &Correctionsz= Предложить\ исп&равленияz= -menutrans &Repeat\ Correction:spellrepall Пов&торить\ исправление\ для\ всехspellrepall +menutrans &Spell\ Check\ On Выполнять\ &проверку +menutrans Spell\ Check\ &Off &Не\ выполнять\ проверку +menutrans To\ &Next\ error]s С&ледующая\ ошибка]s +menutrans To\ &Previous\ error[s Пр&едыдущая\ ошибка[s +menutrans Suggest\ &Correctionsz= Вариант&ы\ написанияz= +menutrans &Repeat\ correction:spellrepall Заменить\ &все:spellrepall "------------------- -menutrans Set\ Language\ to\ "en" Установить\ язык\ "en" -menutrans Set\ Language\ to\ "en_au" Установить\ язык\ "en_au" -menutrans Set\ Language\ to\ "en_ca" Установить\ язык\ "en_ca" -menutrans Set\ Language\ to\ "en_gb" Установить\ язык\ "en_gb" -menutrans Set\ Language\ to\ "en_nz" Установить\ язык\ "en_nz" -menutrans Set\ Language\ to\ "en_us" Установить\ язык\ "en_us" -menutrans &Find\ More\ Languages &Найти\ больше\ языков -let g:menutrans_set_lang_to = 'Установить язык' -" -" -" The Spelling popup menu -" -" -let g:menutrans_spell_change_ARG_to = 'Исправить\ "%s"\ на' -let g:menutrans_spell_add_ARG_to_word_list = 'Добавить\ "%s"\ в\ словарь' -let g:menutrans_spell_ignore_ARG = 'Пропустить\ "%s"' +menutrans Set\ language\ to\ "en" Проверка\ для\ языка\ "en" +menutrans Set\ language\ to\ "en_au" Проверка\ для\ языка\ "en_au" +menutrans Set\ language\ to\ "en_ca" Проверка\ для\ языка\ "en_ca" +menutrans Set\ language\ to\ "en_gb" Проверка\ для\ языка\ "en_gb" +menutrans Set\ language\ to\ "en_nz" Проверка\ для\ языка\ "en_nz" +menutrans Set\ language\ to\ "en_us" Проверка\ для\ языка\ "en_us" +menutrans &Find\ More\ Languages Найти\ для\ других\ &языков +let g:menutrans_set_lang_to = 'Проверка для языка' ">>>---------------- Folds -menutrans &Enable/Disable\ Foldszi Вкл/выкл\ &складкиzi -menutrans &View\ Cursor\ Linezv Открыть\ строку\ с\ &курсоромzv -menutrans Vie&w\ Cursor\ Line\ OnlyzMzx Открыть\ &только\ строку\ с\ курсоромzMzx -menutrans C&lose\ More\ Foldszm Закрыть\ &больше\ складокzm -menutrans &Close\ All\ FoldszM Закрыть\ &все\ складкиzM -menutrans &Open\ All\ FoldszR Откр&ыть\ все\ складкиzR -menutrans O&pen\ More\ Foldszr Отк&рыть\ больше\ складокzr -menutrans Fold\ Met&hod &Метод\ складок -menutrans Create\ &Foldzf Со&здать\ складкуzf -menutrans &Delete\ Foldzd У&далить\ складкуzd -menutrans Delete\ &All\ FoldszD Удалить\ вс&е\ складкиzD -menutrans Fold\ col&umn\ Width &Ширина\ колонки\ складок +menutrans &Enable/Disable\ foldszi &Показать\ или\ убрать\ структуруzi +menutrans &View\ Cursor\ Linezv Просмотр\ строки\ под\ &курсоромzv +menutrans Vie&w\ Cursor\ Line\ onlyzMzx Просмотр\ &только\ строки\ под\ курсоромz\ Shift+M\ zx +menutrans C&lose\ more\ foldszm Свернуть\ вло&женные\ блоки\ структурыzm +menutrans &Close\ all\ foldszM Свернуть\ &все\ блоки\ структурыz\ Shift+M +menutrans &Open\ all\ foldszR Развернуть\ в&се\ блоки\ структурыz\ Shift+R +menutrans O&pen\ more\ foldszr Ра&звернуть\ вложенный\ блок\ структурыzr +menutrans Fold\ Met&hod &Метод\ разметки\ структуры +menutrans Create\ &Foldzf Со&здать\ блок\ структурыzf +menutrans &Delete\ Foldzd &Убрать\ блок\ структурыzd +menutrans Delete\ &All\ FoldszD Убрать\ вс&е\ блоки\ структурыz\ Shift+D +menutrans Fold\ col&umn\ width &Ширина\ столбца\ со\ значками\ структуры ">>>->>>----------- Tools/Folds/Fold Method -menutrans M&anual Вру&чную -menutrans I&ndent О&тступ -menutrans E&xpression &Выражение -menutrans S&yntax &Синтаксис -menutrans Ma&rker &Маркеры -">>>--------------- Tools/Diff -menutrans &Update О&бновить -menutrans &Get\ Block Изменить\ &этот\ буфер -menutrans &Put\ Block Изменить\ &другой\ буфер -">>>--------------- Tools/Diff/Error window -menutrans &Update:cwin О&бновить:cwin -menutrans &Close:cclose &Закрыть:cclose -menutrans &Open:copen &Открыть:copen +menutrans M&anual Разметка\ вру&чную +menutrans I&ndent На\ основе\ о&тступов +menutrans E&xpression На\ основе\ р&асчётов +menutrans S&yntax На\ основе\ &синтаксиса +menutrans &Diff На\ основе\ различий\ в\ текстах +menutrans Ma&rker На\ основе\ &маркеров +">>>--------------- Sub of Tools/Diff +menutrans &Update О&бновить\ содержимое\ окон +menutrans &Get\ Block Перенести\ &в\ текущий\ буфер +menutrans &Put\ Block Перенести\ &из\ текущего\ буфера +">>>--------------- Tools/Error window +menutrans &Update:cwin О&бновить:cwin +menutrans &Close:cclose &Закрыть:cclose +menutrans &Open:copen &Открыть:copen " " " Syntax menu " -menutrans &Show\ File\ Types\ in\ Menu Показать\ меню\ выбора\ типа\ &файла -menutrans Set\ '&syntax'\ only &Изменять\ только\ значение\ 'syntax' -menutrans Set\ '&filetype'\ too Изменять\ &также\ значение\ 'filetype' -menutrans &Off &Отключить -menutrans &Manual Вру&чную -menutrans A&utomatic &Автоматически -menutrans On/Off\ for\ &This\ File Вкл/выкл\ для\ &этого\ файла -menutrans Co&lor\ Test Проверка\ &цветов -menutrans &Highlight\ Test Проверка\ под&светки -menutrans &Convert\ to\ HTML С&делать\ HTML\ с\ подсветкой +menutrans &Show\ File\ Types\ in\ menu &Показать\ меню\ выбора\ типа\ файла +menutrans Set\ '&syntax'\ only А&ктивировать\ параметр\ 'syntax' +menutrans Set\ '&filetype'\ too Активировать\ пара&метр\ 'filetype' +menutrans &Off &Отключить\ подсветку +menutrans &Manual Включение\ подсветки\ вру&чную +menutrans A&utomatic Включение\ подсветки\ &автоматически +menutrans on/off\ for\ &This\ file Изменить\ режим\ для\ &текущего\ файла +menutrans Co&lor\ test Проверить\ поддер&живаемые\ цвета +menutrans &Highlight\ test Показать\ группы\ под&светки +menutrans &Convert\ to\ HTML Прео&бразовать\ текущий\ файл\ в\ HTML " " " Buffers menu " -menutrans &Refresh\ menu О&бновить\ меню -menutrans Delete У&далить -menutrans &Alternate &Соседний -menutrans &Next С&ледующий -menutrans &Previous &Предыдущий -menutrans [No\ File] [Нет\ файла] +menutrans &Refresh\ menu &Обновить\ список\ буферов +menutrans &Delete &Закрыть\ буфер +menutrans &Alternate &Соседний\ буфер +menutrans &Next С&ледующий\ буфер +menutrans &Previous &Предыдущий\ буфер " " -" Window menu +" Submenu of Window menu " -menutrans &New^Wn &Новое\ окно^Wn -menutrans S&plit^Ws &Разделить\ окно^Ws -menutrans Sp&lit\ To\ #^W^^ Открыть\ &соседний\ файл\ в\ новом\ окне^W^^ -menutrans Split\ &Vertically^Wv Разделить\ по\ &вертикали^Wv -menutrans Split\ File\ E&xplorer Открыть\ проводник\ по\ &файловой\ системе +menutrans &New^Wn &СоздатьCtrl+W\ n +menutrans S&plit^Ws Разделить\ по\ &горизонталиCtrl+W\ s +menutrans Split\ &Vertically^Wv Разделить\ по\ &вертикалиCtrl+W\ v +menutrans Sp&lit\ To\ #^W^^ С&оседний\ файл\ в\ новом\ окнеCtrl+W\ Ctrl+^ +menutrans Split\ File\ E&xplorer Диспетчер\ файлов " -menutrans &Close^Wc &Закрыть\ это\ окно^Wc -menutrans Close\ &Other(s)^Wo Закрыть\ &остальные\ окна^Wo +menutrans &Close^Wc &Закрыть\ текущее\ окноCtrl+W\ c +menutrans Close\ &Other(s)^Wo З&акрыть\ другие\ окнаCtrl+W\ o " -menutrans Move\ &To &Переместить -menutrans Rotate\ &Up^WR Сдвинуть\ ввер&х^WR -menutrans Rotate\ &Down^Wr Сдвинуть\ в&низ^Wr +menutrans Move\ &To &Переместить +menutrans Rotate\ &Up^WR Сдвинуть\ ввер&хCtrl+W\ Shift+R +menutrans Rotate\ &Down^Wr Сдвинуть\ в&низCtrl+W\ r " -menutrans &Equal\ Size^W= О&динаковый\ размер^W= -menutrans &Max\ Height^W_ Максимальная\ в&ысота^W_ -menutrans M&in\ Height^W1_ Минимальная\ высо&та^W1_ -menutrans Max\ &Width^W\| Максимальная\ &ширина^W\| -menutrans Min\ Widt&h^W1\| Минимал&ьная\ ширина^W1\| -">>>----------------- Window/Move To -menutrans &Top^WK В&верх^WK -menutrans &Bottom^WJ В&низ^WJ -menutrans &Left\ Side^WH В&лево^WH -menutrans &Right\ Side^WL В&право^WL +menutrans &Equal\ Size^W= Выравнивание\ раз&мераCtrl+W\ = +menutrans &Max\ Height^W_ Максимальная\ в&ысотаCtrl+W\ _ +menutrans M&in\ Height^W1_ Минимальная\ высо&таCtrl+W\ 1_ +menutrans Max\ &Width^W\| Максимальная\ &ширинаCtrl+W\ \| +menutrans Min\ Widt&h^W1\| Минимальная\ ш&иринаCtrl+W\ 1\| +">>>----------------- Submenu of Window/Move To +menutrans &Top^WK В&верхCtrl+W\ Shift+K +menutrans &Bottom^WJ В&низCtrl+W\ Shift+J +menutrans &Left\ side^WH В&левоCtrl+W\ Shift+H +menutrans &Right\ side^WL В&правоCtrl+W\ Shift+L " " " The popup menu " " -menutrans &Undo О&тменить -menutrans Cu&t &Вырезать -menutrans &Copy &Копировать -menutrans &Paste Вк&леить -menutrans &Delete &Удалить -menutrans Select\ Blockwise Блоковое\ выделение -menutrans Select\ &Word Выделить\ &слово -menutrans Select\ &Sentence Выделить\ &предложение -menutrans Select\ Pa&ragraph Выделить\ пара&граф -menutrans Select\ &Line Выделить\ ст&року -menutrans Select\ &Block Выделить\ &блок -menutrans Select\ &All Выделить\ &всё +menutrans &Undo &Отменить +menutrans Cu&t &Вырезать +menutrans &Copy &Копировать +menutrans &Paste Вст&авить +menutrans &Delete &Удалить +menutrans Select\ Blockwise Блоковое\ выделение +menutrans Select\ &Word Выделить\ с&лово +menutrans Select\ &Line Выделить\ с&троку +menutrans Select\ &Block Выделить\ &блок +menutrans Select\ &All В&ыделить\ всё +menutrans Select\ &Sentence Выделить\ предло&жение +menutrans Select\ Pa&ragraph Выделить\ аб&зац +" +" The Spelling popup menu +" +let g:menutrans_spell_change_ARG_to = 'Исправить\ "%s"' +let g:menutrans_spell_add_ARG_to_word_list = 'Добавить\ "%s"\ в\ словарь' +let g:menutrans_spell_ignore_ARG = 'Пропустить\ "%s"' " " The GUI toolbar " @@ -282,29 +284,39 @@ if has("toolbar") if exists("*Do_toolbar_tmenu") delfun Do_toolbar_tmenu endif - fun Do_toolbar_tmenu() - tmenu ToolBar.Open Открыть файл - tmenu ToolBar.Save Сохранить файл - tmenu ToolBar.SaveAll Сохранить все файлы - tmenu ToolBar.Print Напечатать - tmenu ToolBar.Undo Отменить - tmenu ToolBar.Redo Вернуть - tmenu ToolBar.Cut Вырезать - tmenu ToolBar.Copy Копировать - tmenu ToolBar.Paste Вклеить - tmenu ToolBar.FindNext Найти следующее - tmenu ToolBar.FindPrev Найти предыдущее - tmenu ToolBar.Replace Найти или заменить... - tmenu ToolBar.LoadSesn Загрузить сеанс редактирования - tmenu ToolBar.SaveSesn Сохранить сеанс редактирования - tmenu ToolBar.RunScript Выполнить сценарий Vim - tmenu ToolBar.Make Компиляция - tmenu ToolBar.Shell Оболочка - tmenu ToolBar.RunCtags Создать файл меток - tmenu ToolBar.TagJump Перейти к метке - tmenu ToolBar.Help Справка - tmenu ToolBar.FindHelp Найти справку - endfun + def g:Do_toolbar_tmenu() + tmenu ToolBar.New Создать документ + tmenu ToolBar.Open Открыть файл + tmenu ToolBar.Save Сохранить файл + tmenu ToolBar.SaveAll Сохранить все файлы + tmenu ToolBar.Print Печать + tmenu ToolBar.Undo Отменить + tmenu ToolBar.Redo Вернуть + tmenu ToolBar.Cut Вырезать + tmenu ToolBar.Copy Копировать + tmenu ToolBar.Paste Вставить + tmenu ToolBar.Find Найти... + tmenu ToolBar.FindNext Найти следующее + tmenu ToolBar.FindPrev Найти предыдущее + tmenu ToolBar.Replace Заменить... + tmenu ToolBar.NewSesn Создать сеанс редактирования + tmenu ToolBar.LoadSesn Загрузить сеанс редактирования + tmenu ToolBar.SaveSesn Сохранить сеанс редактирования + tmenu ToolBar.RunScript Выполнить командный файл программы Vim + tmenu ToolBar.Shell Командная оболочка + tmenu ToolBar.Make Компиляция + tmenu ToolBar.RunCtags Создать файл с индексами + tmenu ToolBar.TagJump Перейти по указателю + tmenu ToolBar.Help Справка + tmenu ToolBar.FindHelp Поиск в документации + tmenu ToolBar.WinClose Закрыть текущее окно + tmenu ToolBar.WinMax Максимальная высота текущего окна + tmenu ToolBar.WinMin Минимальная высота текущего окна + tmenu ToolBar.WinSplit Разделить окно по горизонтали + tmenu ToolBar.WinVSplit Разделить окно по вертикали + tmenu ToolBar.WinMaxWidth Максимальная ширина текущего окна + tmenu ToolBar.WinMinWidth Минимальная ширина текущего окна + enddef endif " " @@ -312,26 +324,41 @@ endif " " Find in help dialog " -let g:menutrans_help_dialog = "Введите команду или слово для поиска:\n\nДобавьте i_ для поиска команд режима Вставки (например, i_CTRL-X)\nДобавьте c_ для поиска команд Обычного режима (например, с_)\nДобавьте ' для поиска справки по опции (например, 'shiftwidth')" +let g:menutrans_help_dialog = "Наберите команду или слово, которые требуется найти в документации.\n\nЧтобы найти команды режима вставки, используйте приставку i_ (например, i_CTRL-X)\nЧтобы найти команды командной строки, используйте приставку c_ (например, c_)\nЧтобы найти информацию о параметрах, используйте символ ' (например, 'shftwidth')" " -" Searh path dialog +" Search path dialog " -let g:menutrans_path_dialog = "Укажите путь для поиска файлов.\nИмена каталогов разделяются запятыми." +let g:menutrans_path_dialog = "Укажите через запятую наименования каталогов, где будет выполняться поиск файлов" " " Tag files dialog " -let g:menutrans_tags_dialog = "Введите имена файлов меток (через запятую).\n" +let g:menutrans_tags_dialog = "Укажите через запятую наименования файлов индексов" " " Text width dialog " -let g:menutrans_textwidth_dialog = "Введите ширину текста для форматирования.\nДля отмены форматирования введите 0." +let g:menutrans_textwidth_dialog = "Укажите количество символов для установки ширины текста\nЧтобы отменить форматирование, укажите 0" " " File format dialog " -let g:menutrans_fileformat_dialog = "Выберите формат файла." -let g:menutrans_fileformat_choices = "&Unix\n&Dos\n&Mac\nО&тмена" +let g:menutrans_fileformat_dialog = "Выберите формат файла" +let g:menutrans_fileformat_choices = "&1. Unix\n&2. Dos\n&3. Mac\nОтмена (&C)" +" +let menutrans_no_file = "[Безымянный]" + +" Menus to handle Russian encodings +" Thanks to Pavlo Bohmat for the idea +" vassily ragosin +" +an 10.355 &File.-SEP- +an 10.360.20 &File.Открыть\ в\ кодировке\.\.\..CP1251 :browse e ++enc=cp1251 +an 10.360.30 &File.Открыть\ в\ кодировке\.\.\..CP866 :browse e ++enc=cp866 +an 10.360.30 &File.Открыть\ в\ кодировке\.\.\..KOI8-R :browse e ++enc=koi8-r +an 10.360.40 &File.Открыть\ в\ кодировке\.\.\..UTF-8 :browse e ++enc=utf-8 +an 10.365.20 &File.Сохранить\ с\ кодировкой\.\.\..CP1251 :browse w ++enc=cp1251 +an 10.365.30 &File.Сохранить\ с\ кодировкой\.\.\..CP866 :browse w ++enc=cp866 +an 10.365.30 &File.Сохранить\ с\ кодировкой\.\.\..KOI8-R :browse w ++enc=koi8-r +an 10.365.40 &File.Сохранить\ с\ кодировкой\.\.\..UTF-8 :browse w ++enc=utf-8 " -let menutrans_no_file = "[Нет файла]" so $VIMRUNTIME/lang/macvim_menu/menu_ru_ru.apple.vim so $VIMRUNTIME/lang/macvim_menu/menu_ru_ru.custom.vim diff --git a/runtime/lang/menu_ru_ru.vim b/runtime/lang/menu_ru_ru.vim index b5e4b79c67..17bf0a443c 100644 --- a/runtime/lang/menu_ru_ru.vim +++ b/runtime/lang/menu_ru_ru.vim @@ -1,3 +1,14 @@ " Menu Translations: Russian -source :p:h/menu_ru_ru.utf-8.vim +if ('utf-8' ==? &enc) && filereadable(expand(':p:h') . '/menu_ru_ru.utf-8.vim') + source :p:h/menu_ru_ru.utf-8.vim +elseif ('cp1251' ==? &enc) && filereadable(expand(':p:h') . '/menu_ru_ru.cp1251.vim') + source :p:h/menu_ru_ru.cp1251.vim +" elseif ('cp866' ==? &enc) && filereadable(expand(':p:h') . '/menu_ru_ru.cp866.vim') +" source :p:h/menu_ru_ru.cp866.vim +elseif ('koi8-r' ==? &enc) && filereadable(expand(':p:h') . '/menu_ru_ru.koi8-r.vim') + source :p:h/menu_ru_ru.koi8-r.vim +else + echomsg 'Could not find the menu file matching the current encoding' +endif + diff --git a/runtime/menu.vim b/runtime/menu.vim index f99fd3712e..0d5ee96b3e 100644 --- a/runtime/menu.vim +++ b/runtime/menu.vim @@ -178,7 +178,7 @@ if !has("gui_macvim") an 10.310 &File.&Open\.\.\.:e :browse confirm e endif an 10.320 &File.Sp&lit-Open\.\.\.:sp :browse sp -an 10.320 &File.Open\ Tab\.\.\.:tabnew :browse tabnew +an 10.320 &File.Open\ &Tab\.\.\.:tabnew :browse tabnew if !has("gui_macvim") an 10.325 &File.&New:enew :confirm enew an 10.330 &File.&Close:close diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 7b4b273b0e..72626e3e06 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: The Vim Project -" Last Change: 2023 Aug 10 +" Last Change: 2023 Aug 31 " Former Maintainer: Bram Moolenaar " If there already is an option window, jump to that one. @@ -518,7 +518,7 @@ call OptionG("swb", &swb) call AddOption("splitbelow", gettext("a new window is put below the current one")) call BinOptionG("sb", &sb) call AddOption("splitkeep", gettext("determines scroll behavior for split windows")) -call BinOptionG("spk", &spk) +call OptionG("spk", &spk) call AddOption("splitright", gettext("a new window is put right of the current one")) call BinOptionG("spr", &spr) call AddOption("scrollbind", gettext("this window scrolls together with other bound windows")) diff --git a/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim b/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim index 5eda29047d..52e80c142e 100644 --- a/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim +++ b/runtime/pack/dist/opt/editexisting/plugin/editexisting.vim @@ -1,6 +1,6 @@ " Vim Plugin: Edit the file with an existing Vim if possible -" Maintainer: Bram Moolenaar -" Last Change: 2022 Jun 17 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 13 " To use add ":packadd! editexisting" in your vimrc file. diff --git a/runtime/pack/dist/opt/editorconfig/.editorconfig b/runtime/pack/dist/opt/editorconfig/.editorconfig new file mode 100644 index 0000000000..7eed9e111d --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/.editorconfig @@ -0,0 +1,27 @@ +root = true + +[*] +end_of_line = lf +charset = utf-8 +max_line_length = 80 + +[*.{vim,sh}] +indent_style = space +indent_size = 4 +insert_final_newline = true +trim_trailing_whitespace = true +max_line_length = 80 + +[*.rb] +indent_style = space +indent_size = 2 +insert_final_newline = true +trim_trailing_whitespace = true +max_line_length = 120 + +[*.yml] +indent_style = space +indent_size = 2 + +[*.{bat,vbs,ps1}] +end_of_line = CRLF diff --git a/runtime/pack/dist/opt/editorconfig/CONTRIBUTORS b/runtime/pack/dist/opt/editorconfig/CONTRIBUTORS new file mode 100644 index 0000000000..b799668c87 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/CONTRIBUTORS @@ -0,0 +1,6 @@ +Contributors to the EditorConfig Vim Plugin: + +Hong Xu +Trey Hunner +Kent Frazier +Chris White diff --git a/runtime/pack/dist/opt/editorconfig/LICENSE b/runtime/pack/dist/opt/editorconfig/LICENSE new file mode 100644 index 0000000000..ed9286e0aa --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/LICENSE @@ -0,0 +1,26 @@ +Unless otherwise stated, all files are distributed under the Simplified BSD +license included below. + +Copyright (c) 2011-2019 EditorConfig Team +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/runtime/pack/dist/opt/editorconfig/LICENSE.PSF b/runtime/pack/dist/opt/editorconfig/LICENSE.PSF new file mode 100755 index 0000000000..36eb8e0d3b --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/LICENSE.PSF @@ -0,0 +1,53 @@ +Some code in editorconfig-vim is derived from code licensed under the +PSF license. The following is the text of that license, retrieved 2019-05-05 +from https://docs.python.org/2.6/license.html#terms-and-conditions-for-accessing-or-otherwise-using-python + +PSF LICENSE AGREEMENT FOR PYTHON 2.6.9 + +1. This LICENSE AGREEMENT is between the Python Software Foundation +(``PSF''), and the Individual or Organization (``Licensee'') accessing and +otherwise using Python 2.6.9 software in source or binary form and its +associated documentation. + +2. Subject to the terms and conditions of this License Agreement, PSF +hereby grants Licensee a nonexclusive, royalty-free, world-wide +license to reproduce, analyze, test, perform and/or display publicly, +prepare derivative works, distribute, and otherwise use Python 2.6.9 +alone or in any derivative version, provided, however, that PSF's +License Agreement and PSF's notice of copyright, i.e., ``Copyright (c) +2001-2010 Python Software Foundation; All Rights Reserved'' are +retained in Python 2.6.9 alone or in any derivative version prepared +by Licensee. + +3. In the event Licensee prepares a derivative work that is based on +or incorporates Python 2.6.9 or any part thereof, and wants to make +the derivative work available to others as provided herein, then +Licensee hereby agrees to include in any such work a brief summary of +the changes made to Python 2.6.9. + +4. PSF is making Python 2.6.9 available to Licensee on an ``AS IS'' +basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED. +BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND DISCLAIMS ANY +REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS FOR ANY +PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.6.9 WILL NOT INFRINGE +ANY THIRD PARTY RIGHTS. + +5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON +2.6.9 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS +A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.6.9, +OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF. + +6. This License Agreement will automatically terminate upon a material +breach of its terms and conditions. + +7. Nothing in this License Agreement shall be deemed to create any +relationship of agency, partnership, or joint venture between PSF and +Licensee. This License Agreement does not grant permission to use PSF +trademarks or trade name in a trademark sense to endorse or promote +products or services of Licensee, or any third party. + +8. By copying, installing or otherwise using Python 2.6.9, Licensee +agrees to be bound by the terms and conditions of this License +Agreement. + +# vi: set ft=: diff --git a/runtime/pack/dist/opt/editorconfig/README.md b/runtime/pack/dist/opt/editorconfig/README.md new file mode 100644 index 0000000000..961c9ae2d2 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/README.md @@ -0,0 +1,148 @@ +# EditorConfig Vim Plugin + +[![Travis Build Status](https://img.shields.io/travis/cxw42/editorconfig-vim.svg?logo=travis)](https://travis-ci.org/editorconfig/editorconfig-vim) +[![Appveyor Build Status](https://img.shields.io/appveyor/ci/cxw42/editorconfig-vim.svg?logo=appveyor)](https://ci.appveyor.com/project/cxw42/editorconfig-vim) + +This is an [EditorConfig][] plugin for Vim. This plugin can be found on both +[GitHub][] and [Vim online][]. + +## Installation + +To install this plugin, you can use one of the following ways: + +### Install with the archive + +Download the [archive][] and extract it into your Vim runtime directory +(`~/.vim` on UNIX/Linux and `$VIM_INSTALLATION_FOLDER\vimfiles` on windows). +You should have 4 sub-directories in this runtime directory now: "autoload", +"doc", "ftdetect" and "plugin". + +### Install as Vim8 plugin + +Install as a Vim 8 plugin. Note `local` can be any name, but some path +element must be present. On Windows, instead of `~/.vim` use +`$VIM_INSTALLATION_FOLDER\vimfiles`. +```shell +mkdir -p ~/.vim/pack/local/start +cd ~/.vim/pack/local/start +git clone https://github.com/editorconfig/editorconfig-vim.git +``` + +### Install with [pathogen][] + +Use pathogen (the git repository of this plugin is +https://github.com/editorconfig/editorconfig-vim.git) + +### Install with [Vundle][] + +Use Vundle by adding to your `.vimrc` Vundle plugins section: + +```viml +Plugin 'editorconfig/editorconfig-vim' +``` + +Then call `:PluginInstall`. + +### Install with [vim-plug][] + +Use vim-plug by adding to your `.vimrc` in your plugin section: + +```viml +Plug 'editorconfig/editorconfig-vim' +``` + +Source your `.vimrc` by calling `:source $MYVIMRC`. + +Then call `:PlugInstall`. + +### No external editorconfig core library is required + +Previous versions of this plugin also required a Python "core". +The core included the code to parse `.editorconfig` files. +This plugin **includes** the core, so you don't need to download the +core separately. + +## Supported properties + +The EditorConfig Vim plugin supports the following EditorConfig [properties][]: + +* `indent_style` +* `indent_size` +* `tab_width` +* `end_of_line` +* `charset` +* `insert_final_newline` (Feature `+fixendofline`, available on Vim 7.4.785+, + or [PreserveNoEOL][] is required for this property) +* `trim_trailing_whitespace` +* `max_line_length` +* `root` (only used by EditorConfig core) + +## Selected Options + +The supported options are documented in [editorconfig.txt][] +and can be viewed by executing the following: `:help editorconfig`. You may +need to execute `:helptags ALL` so that Vim is aware of editorconfig.txt. + +### Excluded patterns + +To ensure that this plugin works well with [Tim Pope's fugitive][], use the +following patterns array: + +```viml +let g:EditorConfig_exclude_patterns = ['fugitive://.*'] +``` + +If you wanted to avoid loading EditorConfig for any remote files over ssh: + +```viml +let g:EditorConfig_exclude_patterns = ['scp://.*'] +``` + +Of course these two items could be combined into the following: + +```viml +let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*'] +``` + +### Disable for a specific filetype + +You can disable this plugin for a specific buffer by setting +`b:EditorConfig_disable`. Therefore, you can disable the +plugin for all buffers of a specific filetype. For example, to disable +EditorConfig for all git commit messages (filetype `gitcommit`): + +```viml +au FileType gitcommit let b:EditorConfig_disable = 1 +``` + +### Disable rules + +In very rare cases, +you might need to override some project-specific EditorConfig rules in global +or local vimrc in some cases, e.g., to resolve conflicts of trailing whitespace +trimming and buffer autosaving. This is not recommended, but you can: + +```viml +let g:EditorConfig_disable_rules = ['trim_trailing_whitespace'] +``` + +You are able to disable any supported EditorConfig properties. + +## Bugs and Feature Requests + +Feel free to submit bugs, feature requests, and other issues to the +[issue tracker][]. Be sure you have read the [contribution guidelines][]! + +[EditorConfig]: http://editorconfig.org +[GitHub]: https://github.com/editorconfig/editorconfig-vim +[PreserveNoEOL]: http://www.vim.org/scripts/script.php?script_id=4550 +[Tim Pope's fugitive]: https://github.com/tpope/vim-fugitive +[Vim online]: http://www.vim.org/scripts/script.php?script_id=3934 +[Vundle]: https://github.com/gmarik/Vundle.vim +[archive]: https://github.com/editorconfig/editorconfig-vim/archive/master.zip +[contribution guidelines]: https://github.com/editorconfig/editorconfig/blob/master/CONTRIBUTING.md#submitting-an-issue +[issue tracker]: https://github.com/editorconfig/editorconfig-vim/issues +[pathogen]: https://github.com/tpope/vim-pathogen +[properties]: http://github.com/editorconfig/editorconfig/wiki/EditorConfig-Properties +[editorconfig.txt]: https://github.com/editorconfig/editorconfig-vim/blob/master/doc/editorconfig.txt +[vim-plug]: https://github.com/junegunn/vim-plug diff --git a/runtime/pack/dist/opt/editorconfig/autoload/editorconfig.vim b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig.vim new file mode 100644 index 0000000000..1f61a3300c --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig.vim @@ -0,0 +1,60 @@ +" autoload/editorconfig.vim: EditorConfig native Vimscript plugin +" Copyright (c) 2011-2019 EditorConfig Team +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. +" + +if v:version < 700 + finish +endif + +let s:saved_cpo = &cpo +set cpo&vim + +" {{{1 variables +let s:hook_list = [] + +function! editorconfig#AddNewHook(func) " {{{1 + " Add a new hook + + call add(s:hook_list, a:func) +endfunction + +function! editorconfig#ApplyHooks(config) abort " {{{1 + " apply hooks + + for Hook in s:hook_list + let l:hook_ret = Hook(a:config) + + if type(l:hook_ret) != type(0) && l:hook_ret != 0 + " TODO print some debug info here + endif + endfor +endfunction + +" }}} + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vim: fdm=marker fdc=3 diff --git a/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core.vim b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core.vim new file mode 100644 index 0000000000..6885e17cf0 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core.vim @@ -0,0 +1,147 @@ +" autoload/editorconfig_core.vim: top-level functions for +" editorconfig-core-vimscript and editorconfig-vim. + +" Copyright (c) 2018-2020 EditorConfig Team, including Chris White {{{1 +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. }}}1 + +let s:saved_cpo = &cpo +set cpo&vim + +" Variables {{{1 + +" Note: we create this variable in every script that accesses it. Normally, I +" would put this in plugin/editorconfig.vim. However, in some of my tests, +" the command-line testing environment did not load plugin/* in the normal +" way. Therefore, I do the check everywhere so I don't have to special-case +" the command line. + +if !exists('g:editorconfig_core_vimscript_debug') + let g:editorconfig_core_vimscript_debug = 0 +endif +" }}}1 + +" The latest version of the specification that we support. +" See discussion at https://github.com/editorconfig/editorconfig/issues/395 +function! editorconfig_core#version() + return [0,13,0] +endfunction + +" === CLI =============================================================== {{{1 + +" For use from the command line. Output settings for in_name to +" the buffer named out_name. If an optional argument is provided, it is the +" name of the config file to use (default '.editorconfig'). +" TODO support multiple files +" +" filename (if any) +" @param names {Dictionary} The names of the files to use for this run +" - output [required] Where the editorconfig settings should be written +" - target [required] A string or list of strings to process. Each +" must be a full path. +" - dump [optional] If present, write debug info to this file +" @param job {Dictionary} What to do - same format as the input of +" editorconfig_core#handler#get_configurations(), +" except without the target member. + +function! editorconfig_core#currbuf_cli(names, job) " out_name, in_name, ... + let l:output = [] + + " Preprocess the job + let l:job = deepcopy(a:job) + + if has_key(l:job, 'version') " string to list + let l:ver = split(editorconfig_core#util#strip(l:job.version), '\v\.') + for l:idx in range(len(l:ver)) + let l:ver[l:idx] = str2nr(l:ver[l:idx]) + endfor + + let l:job.version = l:ver + endif + + " TODO provide version output from here instead of the shell script +" if string(a:names) ==? 'version' +" return +" endif +" + if type(a:names) != type({}) || type(a:job) != type({}) + throw 'Need two Dictionary arguments' + endif + + if has_key(a:names, 'dump') + execute 'redir! > ' . fnameescape(a:names.dump) + echom 'Names: ' . string(a:names) + echom 'Job: ' . string(l:job) + let g:editorconfig_core_vimscript_debug = 1 + endif + + if type(a:names['target']) == type([]) + let l:targets = a:names.target + else + let l:targets = [a:names.target] + endif + + for l:target in l:targets + + " Pre-process quoting weirdness so we are more flexible in the face + " of CMake+CTest+BAT+Powershell quoting. + + " Permit wrapping in double-quotes + let l:target = substitute(l:target, '\v^"(.*)"$', '\1', '') + + " Permit empty ('') entries in l:targets + if strlen(l:target)<1 + continue + endif + + if has_key(a:names, 'dump') + echom 'Trying: ' . string(l:target) + endif + + let l:job.target = l:target + let l:options = editorconfig_core#handler#get_configurations(l:job) + + if has_key(a:names, 'dump') + echom 'editorconfig_core#currbuf_cli result: ' . string(l:options) + endif + + if len(l:targets) > 1 + let l:output += [ '[' . l:target . ']' ] + endif + + for [ l:key, l:value ] in items(l:options) + let l:output += [ l:key . '=' . l:value ] + endfor + + endfor "foreach target + + " Write the output file + call writefile(l:output, a:names.output) +endfunction "editorconfig_core#currbuf_cli + +" }}}1 + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vi: set fdm=marker fo-=ro: diff --git a/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/fnmatch.vim b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/fnmatch.vim new file mode 100644 index 0000000000..ef9ced9fdc --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/fnmatch.vim @@ -0,0 +1,467 @@ +" autoload/editorconfig_core/fnmatch.vim: Globbing for +" editorconfig-vim. Ported from the Python core's fnmatch.py. + +" Copyright (c) 2012-2019 EditorConfig Team {{{1 +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. }}}1 + +"Filename matching with shell patterns. +" +"fnmatch(FILENAME, PATH, PATTERN) matches according to the local convention. +"fnmatchcase(FILENAME, PATH, PATTERN) always takes case in account. +" +"The functions operate by translating the pattern into a regular +"expression. They cache the compiled regular expressions for speed. +" +"The function translate(PATTERN) returns a regular expression +"corresponding to PATTERN. (It does not compile it.) + +let s:saved_cpo = &cpo +set cpo&vim + +" variables {{{1 +if !exists('g:editorconfig_core_vimscript_debug') + let g:editorconfig_core_vimscript_debug = 0 +endif +" }}}1 +" === Regexes =========================================================== {{{1 +let s:LEFT_BRACE = '\v[\\]@8= 128) ? ' . + \ 'printf("%%U%08x", char2nr(submatch(1))) : ' . + \ '("\\" . submatch(1))' . + \ ')' +lockvar s:replacement_expr + +" Escaper for very-magic regexes +function! s:re_escape(text) + return substitute(a:text, '\v([^0-9a-zA-Z_])', s:replacement_expr, 'g') +endfunction + +"def translate(pat, nested=0): +" Translate a shell PATTERN to a regular expression. +" There is no way to quote meta-characters. +function! editorconfig_core#fnmatch#translate(pat, ...) + let l:nested = 0 + if a:0 + let l:nested = a:1 + endif + + if g:editorconfig_core_vimscript_debug + echom '- fnmatch#translate: pattern ' . a:pat + echom printf( + \ '- %d chars', strlen(substitute(a:pat, ".", "x", "g"))) + call s:dump_chars(a:pat) + endif + + let l:pat = a:pat " TODO remove if we wind up not needing this + + " Note: the Python sets MULTILINE and DOTALL, but Vim has \_. + " instead of DOTALL, and \_^ / \_$ instead of MULTILINE. + + let l:is_escaped = 0 + + " Find out whether the pattern has balanced braces. + let l:left_braces=[] + let l:right_braces=[] + call substitute(l:pat, s:LEFT_BRACE, '\=add(l:left_braces, 1)', 'g') + call substitute(l:pat, s:RIGHT_BRACE, '\=add(l:right_braces, 1)', 'g') + " Thanks to http://jeromebelleman.gitlab.io/posts/productivity/vimsub/ + let l:matching_braces = (len(l:left_braces) == len(l:right_braces)) + + " Unicode support (#2). Indexing l:pat[l:index] returns bytes, per + " https://github.com/neovim/neovim/issues/68#issue-28114985 . + " Instead, use split() per vimdoc to break the input string into an + " array of *characters*, and process that. + let l:characters = split(l:pat, '\zs') + + let l:index = 0 " character index + let l:length = len(l:characters) + let l:brace_level = 0 + let l:in_brackets = 0 + + let l:result = '' + let l:numeric_groups = [] + while l:index < l:length + let l:current_char = l:characters[l:index] + let l:index += 1 + +" if g:editorconfig_core_vimscript_debug +" echom ' - fnmatch#translate: ' . l:current_char . '@' . +" \ (l:index-1) . '; result ' . l:result +" endif + + if l:current_char ==# '*' + let l:pos = l:index + if l:pos < l:length && l:characters[l:pos] ==# '*' + let l:result .= '\_.*' + let l:index += 1 " skip the second star + else + let l:result .= '[^/]*' + endif + + elseif l:current_char ==# '?' + let l:result .= '\_[^/]' + + elseif l:current_char ==# '[' + if l:in_brackets + let l:result .= '\[' + else + let l:pos = l:index + let l:has_slash = 0 + while l:pos < l:length && l:characters[l:pos] != ']' + if l:characters[l:pos] ==# '/' && l:characters[l:pos-1] !=# '\' + let has_slash = 1 + break + endif + let l:pos += 1 + endwhile + if l:has_slash + " POSIX IEEE 1003.1-2017 sec. 2.13.3: '/' cannot occur + " in a bracket expression, so [/] matches a literal + " three-character string '[' . '/' . ']'. + let l:result .= '\[' + \ . s:re_escape(join(l:characters[l:index : l:pos-1], '')) + \ . '\/' + " escape the slash + let l:index = l:pos + 1 + " resume after the slash + else + if l:index < l:length && l:characters[l:index] =~# '\v%(\^|\!)' + let l:index += 1 + let l:result .= '[^' + else + let l:result .= '[' + endif + let l:in_brackets = 1 + endif + endif + + elseif l:current_char ==# '-' + if l:in_brackets + let l:result .= l:current_char + else + let l:result .= '\' . l:current_char + endif + + elseif l:current_char ==# ']' + if l:in_brackets && !l:is_escaped + let l:result .= ']' + let l:in_brackets = 0 + elseif l:is_escaped + let l:result .= '\]' + let l:is_escaped = 0 + else + let l:result .= '\]' + endif + + elseif l:current_char ==# '{' + let l:pos = l:index + let l:has_comma = 0 + while l:pos < l:length && (l:characters[l:pos] !=# '}' || l:is_escaped) + if l:characters[l:pos] ==# ',' && ! l:is_escaped + let l:has_comma = 1 + break + endif + let l:is_escaped = l:characters[l:pos] ==# '\' && ! l:is_escaped + let l:pos += 1 + endwhile + if ! l:has_comma && l:pos < l:length + let l:num_range = + \ matchlist(join(l:characters[l:index : l:pos-1], ''), + \ s:NUMERIC_RANGE) + if len(l:num_range) > 0 " Remember the ranges + call add(l:numeric_groups, [ 0+l:num_range[1], 0+l:num_range[2] ]) + let l:result .= '([+-]?\d+)' + else + let l:inner_xlat = editorconfig_core#fnmatch#translate( + \ join(l:characters[l:index : l:pos-1], ''), 1) + let l:inner_result = l:inner_xlat[0] + let l:inner_groups = l:inner_xlat[1] + let l:result .= '\{' . l:inner_result . '\}' + let l:numeric_groups += l:inner_groups + endif + let l:index = l:pos + 1 + elseif l:matching_braces + let l:result .= '%(' + let l:brace_level += 1 + else + let l:result .= '\{' + endif + + elseif l:current_char ==# ',' + if l:brace_level > 0 && ! l:is_escaped + let l:result .= '|' + else + let l:result .= '\,' + endif + + elseif l:current_char ==# '}' + if l:brace_level > 0 && ! l:is_escaped + let l:result .= ')' + let l:brace_level -= 1 + else + let l:result .= '\}' + endif + + elseif l:current_char ==# '/' + if join(l:characters[l:index : (l:index + 2)], '') ==# '**/' + let l:result .= '%(/|/\_.*/)' + let l:index += 3 + else + let l:result .= '\/' + endif + + elseif l:current_char != '\' + let l:result .= s:re_escape(l:current_char) + endif + + if l:current_char ==# '\' + if l:is_escaped + let l:result .= s:re_escape(l:current_char) + endif + let l:is_escaped = ! l:is_escaped + else + let l:is_escaped = 0 + endif + + endwhile + + if ! l:nested + let l:result .= '\_$' + endif + + return [l:result, l:numeric_groups] +endfunction " #editorconfig_core#fnmatch#translate + +let s:_cache = {} +function! s:cached_translate(pat) + if ! has_key(s:_cache, a:pat) + "regex = re.compile(res) + let s:_cache[a:pat] = + \ editorconfig_core#fnmatch#translate(a:pat) + " we don't compile the regex + endif + return s:_cache[a:pat] +endfunction " cached_translate + +" }}}1 +" === Matching functions ================================================ {{{1 + +function! editorconfig_core#fnmatch#fnmatch(name, path, pattern) +"def fnmatch(name, pat): +" """Test whether FILENAME matches PATH/PATTERN. +" +" Patterns are Unix shell style: +" +" - ``*`` matches everything except path separator +" - ``**`` matches everything +" - ``?`` matches any single character +" - ``[seq]`` matches any character in seq +" - ``[!seq]`` matches any char not in seq +" - ``{s1,s2,s3}`` matches any of the strings given (separated by commas) +" +" An initial period in FILENAME is not special. +" Both FILENAME and PATTERN are first case-normalized +" if the operating system requires it. +" If you don't want this, use fnmatchcase(FILENAME, PATTERN). +" """ +" + " Note: This throws away the backslash in '\.txt' on Cygwin, but that + " makes sense since it's Windows under the hood. + " We don't care about shellslash since we're going to change backslashes + " to slashes in just a moment anyway. + let l:localname = fnamemodify(a:name, ':p') + + if editorconfig_core#util#is_win() " normalize + let l:localname = substitute(tolower(l:localname), '\v\\', '/', 'g') + let l:path = substitute(tolower(a:path), '\v\\', '/', 'g') + let l:pattern = tolower(a:pattern) + else + let l:localname = l:localname + let l:path = a:path + let l:pattern = a:pattern + endif + + if g:editorconfig_core_vimscript_debug + echom '- fnmatch#fnmatch testing <' . l:localname . '> against <' . + \ l:pattern . '> wrt <' . l:path . '>' + endif + + return editorconfig_core#fnmatch#fnmatchcase(l:localname, l:path, l:pattern) +endfunction " fnmatch + +function! editorconfig_core#fnmatch#fnmatchcase(name, path, pattern) +"def fnmatchcase(name, pat): +" """Test whether FILENAME matches PATH/PATTERN, including case. +" +" This is a version of fnmatch() which doesn't case-normalize +" its arguments. +" """ +" + let [regex, num_groups] = s:cached_translate(a:pattern) + + let l:escaped_path = s:re_escape(a:path) + let l:regex = '\v' . l:escaped_path . l:regex + + if g:editorconfig_core_vimscript_debug + echom '- fnmatch#fnmatchcase: regex ' . l:regex + call s:dump_chars(l:regex) + echom '- fnmatch#fnmatchcase: checking ' . a:name + call s:dump_chars(a:name) + endif + + let l:match_groups = matchlist(a:name, l:regex)[1:] " [0] = full match + + if g:editorconfig_core_vimscript_debug + echom printf(' Got %d matches', len(l:match_groups)) + endif + + if len(l:match_groups) == 0 + return 0 + endif + + " Check numeric ranges + let pattern_matched = 1 + for l:idx in range(0,len(l:match_groups)) + let l:num = l:match_groups[l:idx] + if l:num ==# '' + break + endif + + let [min_num, max_num] = num_groups[l:idx] + if (min_num > (0+l:num)) || ((0+l:num) > max_num) + let pattern_matched = 0 + break + endif + + " Reject leading zeros without sign. This is very odd --- + " see editorconfig/editorconfig#371. + if match(l:num, '\v^0') != -1 + let pattern_matched = 0 + break + endif + endfor + + if g:editorconfig_core_vimscript_debug + echom '- fnmatch#fnmatchcase: ' . (pattern_matched ? 'matched' : 'did not match') + endif + + return pattern_matched +endfunction " fnmatchcase + +" }}}1 +" === Copyright notices ================================================= {{{1 +" Based on code from fnmatch.py file distributed with Python 2.6. +" Portions Copyright (c) 2001-2010 Python Software Foundation; +" All Rights Reserved. Licensed under PSF License (see LICENSE.PSF file). +" +" Changes to original fnmatch: +" +" - translate function supports ``*`` and ``**`` similarly to fnmatch C library +" }}}1 + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vi: set fdm=marker: diff --git a/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/handler.vim b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/handler.vim new file mode 100644 index 0000000000..c9a66e1694 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/handler.vim @@ -0,0 +1,183 @@ +" autoload/editorconfig_core/handler.vim: Main worker for +" editorconfig-core-vimscript and editorconfig-vim. +" Modified from the Python core's handler.py. + +" Copyright (c) 2012-2019 EditorConfig Team {{{1 +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. }}}1 + +let s:saved_cpo = &cpo +set cpo&vim + +" Return full filepath for filename in each directory in and above path. {{{1 +" Input path must be an absolute path. +" TODO shellslash/shellescape? +function! s:get_filenames(path, config_filename) + let l:path = a:path + let l:path_list = [] + while 1 + call add(l:path_list, editorconfig_core#util#path_join(l:path, a:config_filename)) + let l:newpath = fnamemodify(l:path, ':h') + if l:path ==? l:newpath || !strlen(l:path) + break + endif + let l:path = l:newpath + endwhile + return l:path_list +endfunction " get_filenames + +" }}}1 +" === Main ============================================================== {{{1 + +" Find EditorConfig files and return all options matching target_filename. +" Throws on failure. +" @param job {Dictionary} required 'target'; optional 'config' and 'version' +function! editorconfig_core#handler#get_configurations(job) + " TODO? support VERSION checks? + +" Special exceptions that may be raised by this function include: +" - ``VersionError``: self.version is invalid EditorConfig version +" - ``PathError``: self.filepath is not a valid absolute filepath +" - ``ParsingError``: improperly formatted EditorConfig file found + + let l:job = deepcopy(a:job) + if has_key(l:job, 'config') + let l:config_filename = l:job.config + else + let l:config_filename = '.editorconfig' + let l:job.config = l:config_filename + endif + + if has_key(l:job, 'version') + let l:version = l:job.version + else + let l:version = editorconfig_core#version() + let l:job.version = l:version + endif + + let l:target_filename = l:job.target + + "echom 'Beginning job ' . string(l:job) + if !s:check_assertions(l:job) + throw "Assertions failed" + endif + + let l:fullpath = fnamemodify(l:target_filename,':p') + let l:path = fnamemodify(l:fullpath, ':h') + let l:conf_files = s:get_filenames(l:path, l:config_filename) + + " echom 'fullpath ' . l:fullpath + " echom 'path ' . l:path + + let l:retval = {} + + " Attempt to find and parse every EditorConfig file in filetree + for l:conf_fn in l:conf_files + "echom 'Trying ' . l:conf_fn + let l:parsed = editorconfig_core#ini#read_ini_file(l:conf_fn, l:target_filename) + if !has_key(l:parsed, 'options') + continue + endif + " echom ' Has options' + + " Merge new EditorConfig file's options into current options + let l:old_options = l:retval + let l:retval = l:parsed.options + " echom 'Old options ' . string(l:old_options) + " echom 'New options ' . string(l:retval) + call extend(l:retval, l:old_options, 'force') + + " Stop parsing if parsed file has a ``root = true`` option + if l:parsed.root + break + endif + endfor + + call s:preprocess_values(l:job, l:retval) + return l:retval +endfunction " get_configurations + +function! s:check_assertions(job) +" TODO +" """Raise error if filepath or version have invalid values""" + +" # Raise ``PathError`` if filepath isn't an absolute path +" if not os.path.isabs(self.filepath): +" raise PathError("Input file must be a full path name.") + + " Throw if version specified is greater than current + let l:v = a:job.version + let l:us = editorconfig_core#version() + " echom 'Comparing requested version ' . string(l:v) . + " \ ' to our version ' . string(l:us) + if l:v[0] > l:us[0] || l:v[1] > l:us[1] || l:v[2] > l:us[2] + throw 'Required version ' . string(l:v) . + \ ' is greater than the current version ' . string(l:us) + endif + + return 1 " All OK if we got here +endfunction " check_assertions + +" }}}1 + +" Preprocess option values for consumption by plugins. {{{1 +" Modifies its argument in place. +function! s:preprocess_values(job, opts) + + " Lowercase option value for certain options + for l:name in ['end_of_line', 'indent_style', 'indent_size', + \ 'insert_final_newline', 'trim_trailing_whitespace', + \ 'charset'] + if has_key(a:opts, l:name) + let a:opts[l:name] = tolower(a:opts[l:name]) + endif + endfor + + " Set indent_size to "tab" if indent_size is unspecified and + " indent_style is set to "tab", provided we are at least v0.10.0. + if get(a:opts, 'indent_style', '') ==? "tab" && + \ !has_key(a:opts, 'indent_size') && + \ ( a:job.version[0]>0 || a:job.version[1] >=10 ) + let a:opts['indent_size'] = 'tab' + endif + + " Set tab_width to indent_size if indent_size is specified and + " tab_width is unspecified + if has_key(a:opts, 'indent_size') && !has_key(a:opts, 'tab_width') && + \ get(a:opts, 'indent_size', '') !=? "tab" + let a:opts['tab_width'] = a:opts['indent_size'] + endif + + " Set indent_size to tab_width if indent_size is "tab" + if has_key(a:opts, 'indent_size') && has_key(a:opts, 'tab_width') && + \ get(a:opts, 'indent_size', '') ==? "tab" + let a:opts['indent_size'] = a:opts['tab_width'] + endif +endfunction " preprocess_values + +" }}}1 + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vi: set fdm=marker fdl=1: diff --git a/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim new file mode 100644 index 0000000000..55d2dee4ea --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/ini.vim @@ -0,0 +1,264 @@ +" autoload/editorconfig_core/ini.vim: Config-file parser for +" editorconfig-core-vimscript and editorconfig-vim. +" Modifed from the Python core's ini.py. + +" Copyright (c) 2012-2019 EditorConfig Team {{{2 +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. }}}2 + +let s:saved_cpo = &cpo +set cpo&vim + +" variables {{{2 +if !exists('g:editorconfig_core_vimscript_debug') + let g:editorconfig_core_vimscript_debug = 0 +endif +" }}}2 +" === Constants, including regexes ====================================== {{{2 +" Regular expressions for parsing section headers and options. +" Allow ``]`` and escaped ``;`` and ``#`` characters in section headers. +" In fact, allow \ to escape any single character - it needs to cover at +" least \ * ? [ ! ] { }. +unlockvar s:SECTCRE s:OPTCRE s:MAX_SECTION_NAME s:MAX_PROPERTY_NAME s:MAX_PROPERTY_VALUE +let s:SECTCRE = '\v^\s*\[(%([^\\#;]|\\.)+)\]' + +" Regular expression for parsing option name/values. +" Allow any amount of whitespaces, followed by separator +" (either ``:`` or ``=``), followed by any amount of whitespace and then +" any characters to eol +let s:OPTCRE = '\v\s*([^:=[:space:]][^:=]*)\s*([:=])\s*(.*)$' + +let s:MAX_SECTION_NAME = 4096 +let s:MAX_PROPERTY_NAME = 1024 +let s:MAX_PROPERTY_VALUE = 4096 + +lockvar s:SECTCRE s:OPTCRE s:MAX_SECTION_NAME s:MAX_PROPERTY_NAME s:MAX_PROPERTY_VALUE + +" }}}2 +" === Main ============================================================== {{{1 + +" Read \p config_filename and return the options applicable to +" \p target_filename. This is the main entry point in this file. +function! editorconfig_core#ini#read_ini_file(config_filename, target_filename) + if !filereadable(a:config_filename) + return {} + endif + + try + let l:lines = readfile(a:config_filename) + if &encoding !=? 'utf-8' + " strip BOM + if len(l:lines) > 0 && l:lines[0][:2] ==# "\xEF\xBB\xBF" + let l:lines[0] = l:lines[0][3:] + endif + " convert from UTF-8 to 'encoding' + call map(l:lines, 'iconv(v:val, "utf-8", &encoding)') + endif + let result = s:parse(a:config_filename, a:target_filename, l:lines) + catch + " rethrow, but with a prefix since throw 'Vim...' fails. + throw 'Could not read editorconfig file at ' . v:throwpoint . ': ' . string(v:exception) + endtry + + return result +endfunction + +function! s:parse(config_filename, target_filename, lines) +" Parse a sectioned setup file. +" The sections in setup file contains a title line at the top, +" indicated by a name in square brackets (`[]'), plus key/value +" options lines, indicated by `name: value' format lines. +" Continuations are represented by an embedded newline then +" leading whitespace. Blank lines, lines beginning with a '#', +" and just about everything else are ignored. + + let l:in_section = 0 + let l:matching_section = 0 + let l:optname = '' + let l:lineno = 0 + let l:e = [] " Errors, if any + + let l:options = {} " Options applicable to this file + let l:is_root = 0 " Whether a:config_filename declares root=true + + while 1 + if l:lineno == len(a:lines) + break + endif + + let l:line = a:lines[l:lineno] + let l:lineno = l:lineno + 1 + + " comment or blank line? + if editorconfig_core#util#strip(l:line) ==# '' + continue + endif + if l:line =~# '\v^[#;]' + continue + endif + + " is it a section header? + if g:editorconfig_core_vimscript_debug + echom "Header? <" . l:line . ">" + endif + + let l:mo = matchlist(l:line, s:SECTCRE) + if len(l:mo) + let l:sectname = l:mo[1] + let l:in_section = 1 + if strlen(l:sectname) > s:MAX_SECTION_NAME + " Section name too long => ignore the section + let l:matching_section = 0 + else + let l:matching_section = s:matches_filename( + \ a:config_filename, a:target_filename, l:sectname) + endif + + if g:editorconfig_core_vimscript_debug + echom 'In section ' . l:sectname . ', which ' . + \ (l:matching_section ? 'matches' : 'does not match') + \ ' file ' . a:target_filename . ' (config ' . + \ a:config_filename . ')' + endif + + " So sections can't start with a continuation line + let l:optname = '' + + " Is it an option line? + else + let l:mo = matchlist(l:line, s:OPTCRE) + if len(l:mo) + let l:optname = mo[1] + let l:optval = mo[3] + + if g:editorconfig_core_vimscript_debug + echom printf('Saw raw opt <%s>=<%s>', l:optname, l:optval) + endif + + let l:optval = editorconfig_core#util#strip(l:optval) + " allow empty values + if l:optval ==? '""' + let l:optval = '' + endif + let l:optname = s:optionxform(l:optname) + if !l:in_section && optname ==? 'root' + let l:is_root = (optval ==? 'true') + endif + if g:editorconfig_core_vimscript_debug + echom printf('Saw opt <%s>=<%s>', l:optname, l:optval) + endif + + if l:matching_section && + \ strlen(l:optname) <= s:MAX_PROPERTY_NAME && + \ strlen(l:optval) <= s:MAX_PROPERTY_VALUE + let l:options[l:optname] = l:optval + endif + else + " a non-fatal parsing error occurred. set up the + " exception but keep going. the exception will be + " raised at the end of the file and will contain a + " list of all bogus lines + call add(e, "Parse error in '" . a:config_filename . "' at line " . + \ l:lineno . ": '" . l:line . "'") + endif + endif + endwhile + + " if any parsing errors occurred, raise an exception + if len(l:e) + throw string(l:e) + endif + + return {'root': l:is_root, 'options': l:options} +endfunction! + +" }}}1 +" === Helpers =========================================================== {{{1 + +" Preprocess option names +function! s:optionxform(optionstr) + let l:result = substitute(a:optionstr, '\v\s+$', '', 'g') " rstrip + return tolower(l:result) +endfunction + +" Return true if \p glob matches \p target_filename +function! s:matches_filename(config_filename, target_filename, glob) +" config_dirname = normpath(dirname(config_filename)).replace(sep, '/') + let l:config_dirname = fnamemodify(a:config_filename, ':p:h') . '/' + + if editorconfig_core#util#is_win() + " Regardless of whether shellslash is set, make everything slashes + let l:config_dirname = + \ tolower(substitute(l:config_dirname, '\v\\', '/', 'g')) + endif + + let l:glob = substitute(a:glob, '\v\\([#;])', '\1', 'g') + + " Take account of the path to the editorconfig file. + " editorconfig-core-c/src/lib/editorconfig.c says: + " "Pattern would be: /dir/of/editorconfig/file[double_star]/[section] if + " section does not contain '/', or /dir/of/editorconfig/file[section] + " if section starts with a '/', or /dir/of/editorconfig/file/[section] if + " section contains '/' but does not start with '/'." + + if stridx(l:glob, '/') != -1 " contains a slash + if l:glob[0] ==# '/' + let l:glob = l:glob[1:] " trim leading slash + endif +" This will be done by fnmatch +" let l:glob = l:config_dirname . l:glob + else " does not contain a slash + let l:config_dirname = l:config_dirname[:-2] + " Trim trailing slash + let l:glob = '**/' . l:glob + endif + + if g:editorconfig_core_vimscript_debug + echom '- ini#matches_filename: checking <' . a:target_filename . + \ '> against <' . l:glob . '> with respect to config file <' . + \ a:config_filename . '>' + echom '- ini#matches_filename: config_dirname is ' . l:config_dirname + endif + + return editorconfig_core#fnmatch#fnmatch(a:target_filename, + \ l:config_dirname, l:glob) +endfunction " matches_filename + +" }}}1 +" === Copyright notices ================================================= {{{2 +" Based on code from ConfigParser.py file distributed with Python 2.6. +" Portions Copyright (c) 2001-2010 Python Software Foundation; +" All Rights Reserved. Licensed under PSF License (see LICENSE.PSF file). +" +" Changes to original ConfigParser: +" +" - Special characters can be used in section names +" - Octothorpe can be used for comments (not just at beginning of line) +" - Only track INI options in sections that match target filename +" - Stop parsing files with when ``root = true`` is found +" }}}2 + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vi: set fdm=marker fdl=1: diff --git a/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/util.vim b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/util.vim new file mode 100644 index 0000000000..c4df04af17 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/autoload/editorconfig_core/util.vim @@ -0,0 +1,84 @@ +" util.vim: part of editorconfig-core-vimscript and editorconfig-vim. +" Copyright (c) 2018-2019 EditorConfig Team, including Chris White {{{1 +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. }}}1 + +let s:saved_cpo = &cpo +set cpo&vim + +" A verbatim copy of ingo#fs#path#Separator() {{{1 +" from https://github.com/vim-scripts/ingo-library/blob/558132e2221db3af26dc2f2c6756d092d48a459f/autoload/ingo/fs/path.vim +" distributed under the Vim license. +function! editorconfig_core#util#Separator() + return (exists('+shellslash') && ! &shellslash ? '\' : '/') +endfunction " }}}1 + +" path_join(): ('a','b')->'a/b'; ('a/','b')->'a/b'. {{{1 +function! editorconfig_core#util#path_join(a, b) + " TODO shellescape/shellslash? + "echom 'Joining <' . a:a . '> and <' . a:b . '>' + "echom 'Length is ' . strlen(a:a) + "echom 'Last char is ' . char2nr(a:a[-1]) + if a:a !~# '\v%(\/|\\)$' + return a:a . editorconfig_core#util#Separator() . a:b + else + return a:a . a:b + endif +endfunction " }}}1 + +" is_win() by xolox {{{1 +" The following function is modified from +" https://github.com/xolox/vim-misc/blob/master/autoload/xolox/misc/os.vim +" Copyright (c) 2015 Peter Odding +" +" Permission is hereby granted, free of charge, to any person obtaining a copy +" of this software and associated documentation files (the "Software"), to deal +" in the Software without restriction, including without limitation the rights +" to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +" copies of the Software, and to permit persons to whom the Software is +" furnished to do so, subject to the following conditions: +" +" The above copyright notice and this permission notice shall be included in all +" copies or substantial portions of the Software. +" +" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +" AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +" OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +" SOFTWARE. +function! editorconfig_core#util#is_win() + " Returns 1 (true) when on Microsoft Windows, 0 (false) otherwise. + return has('win16') || has('win32') || has('win64') +endfunction " }}}1 + +" strip() {{{1 +function! editorconfig_core#util#strip(s) + return substitute(a:s, '\v^\s+|\s+$','','g') +endfunction " }}}1 + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vi: set fdm=marker: diff --git a/runtime/pack/dist/opt/editorconfig/doc/editorconfig.txt b/runtime/pack/dist/opt/editorconfig/doc/editorconfig.txt new file mode 100644 index 0000000000..2b5f572b6f --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/doc/editorconfig.txt @@ -0,0 +1,233 @@ +*editorconfig.txt* EditorConfig plugin for Vim + +File: editorconfig.txt +Version: 1.1.1 +Maintainer: EditorConfig Team +Description: EditorConfig vim plugin + +License: + Copyright (c) 2011-2019 EditorConfig Team + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + +CONTENTS~ + *editorconfig-contents* +---------------------------------------------------------------------------- +1. Overview |editorconfig-overview| +2. Installation |editorconfig-installation| +3. Commands |editorconfig-commands| +4. Settings |editorconfig-settings| +5. Advanced |editorconfig-advanced| + + +OVERVIEW~ + *editorconfig-overview* +---------------------------------------------------------------------------- +This is the EditorConfig plugin for vim. + + +INSTALLATION~ + *editorconfig-installation* +---------------------------------------------------------------------------- +Follow the instructions in the README.md file to install this plugin. + +COMMANDS~ + *editorconfig-commands* +---------------------------------------------------------------------------- + + *:EditorConfigReload* +Command: + :EditorConfigReload + +Reload the EditorConfig conf files. When `.editorconfig` files are modified, +this command could prevent you to reload the current edited file to load the +new configuration. + +SETTINGS~ + *editorconfig-settings* +---------------------------------------------------------------------------- + *g:EditorConfig_core_mode* +Specify the mode of EditorConfig core. Generally it is OK to leave this option +empty. Currently, the supported modes are "vim_core" (default) and +"external_command". + + vim_core: Use the included VimScript EditorConfig Core. + external_command: Run external EditorConfig Core. + +If "g:EditorConfig_core_mode" is not specified, this plugin will automatically +choose "vim_core". + +If you choose "external_command" mode, you must also set +|g:EditorConfig_exec_path|. + +Changes to "g:EditorConfig_core_mode" will not take effect until Vim +is restarted. + + *b:EditorConfig_disable* +This is a buffer-local variable that disables the EditorConfig plugin for a +single buffer. + +Example: Disable EditorConfig for the current buffer: +> + let b:EditorConfig_disable = 1 +< +Example: Disable EditorConfig for all git commit messages: +> + au FileType gitcommit let b:EditorConfig_disable = 1 +< + + *g:EditorConfig_exclude_patterns* +This is a list contains file path patterns which will be ignored by +EditorConfig plugin. When the path of the opened buffer (i.e. +"expand('%:p')") matches any of the patterns in the list, EditorConfig will +not load for this file. The default is an empty list. + +Example: Avoid loading EditorConfig for any remote files over ssh +> + let g:EditorConfig_exclude_patterns = ['scp://.*'] +< + + *g:EditorConfig_exec_path* +The file path to the EditorConfig core executable. You can set this value in +your |vimrc| like this: +> + let g:EditorConfig_exec_path = 'Path to your EditorConfig Core executable' +< +The default value is empty. + +If "g:EditorConfig_exec_path" is not set, the plugin will use the "vim_core" +mode regardless of the setting of |g:EditorConfig_core_mode|. + +Changes to "g:EditorConfig_exec_path" will not take effect until Vim +is restarted. + + *g:EditorConfig_max_line_indicator* +The way to show the line where the maximal length is reached. Accepted values +are "line", "fill", "exceeding" and "fillexceeding", otherwise there will be +no max line indicator. + + "line": the right column of the max line length column will be + highlighted on all lines, by adding +1 to 'colorcolumn'. + + "fill": all the columns to the right of the max line length + column will be highlighted on all lines, by setting + 'colorcolumn' to a list starting from "max_line_length + + 1" to the number of columns on the screen. + + "exceeding": the right column of the max line length column will be + highlighted on lines that exceed the max line length, by + adding a match for the ColorColumn group. + + "fillexceeding": all the columns to the right of the max line length + column will be highlighted on lines that exceed the max + line length, by adding a match for the ColorColumn group. + + "none": no max line length indicator will be shown. Recommended + when you do not want any indicator to be shown, but any + value other than those listed above also work as "none". + +To set this option, add any of the following lines to your |vimrc| file: +> + let g:EditorConfig_max_line_indicator = "line" + let g:EditorConfig_max_line_indicator = "fill" + let g:EditorConfig_max_line_indicator = "exceeding" + let g:EditorConfig_max_line_indicator = "fillexceeding" + let g:EditorConfig_max_line_indicator = "none" +< +The default value is "line". + + *g:EditorConfig_enable_for_new_buf* +Set this to 1 if you want EditorConfig plugin to set options +for new empty buffers too. +Path to .editorconfig will be determined based on CWD (see |getcwd()|) +> + let g:EditorConfig_enable_for_new_buf = 1 +< +This option defaults to 0. + + *g:EditorConfig_preserve_formatoptions* +Set this to 1 if you don't want your formatoptions modified when +max_line_length is set: +> + let g:EditorConfig_preserve_formatoptions = 1 +< +This option defaults to 0. + + *g:EditorConfig_softtabstop_space* +When spaces are used for indent, Vim's 'softtabstop' feature will make the +backspace key delete one indent level. If you turn off that feature (by +setting the option to 0), only a single space will be deleted. +This option defaults to 1, which enables 'softtabstop' and uses the +'shiftwidth' value for it. You can also set this to -1 to automatically follow +the current 'shiftwidth' value (since Vim 7.3.693). Or set this to [] if +EditorConfig should not touch 'softtabstop' at all. + + *g:EditorConfig_softtabstop_tab* +When tabs are used for indent, Vim's 'softtabstop' feature only applies to +backspacing over existing runs of spaces. +This option defaults to 1, so backspace will delete one indent level worth of +spaces; -1 does the same but automatically follows the current 'shiftwidth' +value. Set this to 0 to have backspace delete just a single space character. +Or set this to [] if EditorConfig should not touch 'softtabstop' at all. + + *g:EditorConfig_verbose* +Set this to 1 if you want debug info printed: +> + let g:EditorConfig_verbose = 1 +< + +ADVANCED~ + *editorconfig-advanced* +---------------------------------------------------------------------------- + *editorconfig-hook* + *EditorConfig#AddNewHook()* +While this plugin offers several builtin supported properties (as mentioned +here: https://github.com/editorconfig/editorconfig-vim#supported-properties), +we are also able to add our own hooks to support additional EditorConfig +properties, including those not in the EditorConfig standard. For example, we +are working on an Objective-C project, and all our "*.m" files should be +Objective-C source files. However, vim sometimes detect "*.m" files as MATLAB +source files, which causes incorrect syntax highlighting, code indentation, +etc. To solve the case, we could write the following code into the |vimrc| +file: +> + function! FiletypeHook(config) + if has_key(a:config, 'vim_filetype') + let &filetype = a:config['vim_filetype'] + endif + + return 0 " Return 0 to show no error happened + endfunction + + call editorconfig#AddNewHook(function('FiletypeHook')) +< +And add the following code to your .editorconfig file: +> + [*.m] + vim_filetype = objc +< +Then try to open an Objective-C file, you will find the |filetype| is set to +"objc". + +vim:ft=help:tw=78 diff --git a/runtime/pack/dist/opt/editorconfig/doc/tags b/runtime/pack/dist/opt/editorconfig/doc/tags new file mode 100644 index 0000000000..713fa07f03 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/doc/tags @@ -0,0 +1,20 @@ +:EditorConfigReload editorconfig.txt /*:EditorConfigReload* +EditorConfig#AddNewHook() editorconfig.txt /*EditorConfig#AddNewHook()* +b:EditorConfig_disable editorconfig.txt /*b:EditorConfig_disable* +editorconfig-advanced editorconfig.txt /*editorconfig-advanced* +editorconfig-commands editorconfig.txt /*editorconfig-commands* +editorconfig-contents editorconfig.txt /*editorconfig-contents* +editorconfig-hook editorconfig.txt /*editorconfig-hook* +editorconfig-installation editorconfig.txt /*editorconfig-installation* +editorconfig-overview editorconfig.txt /*editorconfig-overview* +editorconfig-settings editorconfig.txt /*editorconfig-settings* +editorconfig.txt editorconfig.txt /*editorconfig.txt* +g:EditorConfig_core_mode editorconfig.txt /*g:EditorConfig_core_mode* +g:EditorConfig_enable_for_new_buf editorconfig.txt /*g:EditorConfig_enable_for_new_buf* +g:EditorConfig_exclude_patterns editorconfig.txt /*g:EditorConfig_exclude_patterns* +g:EditorConfig_exec_path editorconfig.txt /*g:EditorConfig_exec_path* +g:EditorConfig_max_line_indicator editorconfig.txt /*g:EditorConfig_max_line_indicator* +g:EditorConfig_preserve_formatoptions editorconfig.txt /*g:EditorConfig_preserve_formatoptions* +g:EditorConfig_softtabstop_space editorconfig.txt /*g:EditorConfig_softtabstop_space* +g:EditorConfig_softtabstop_tab editorconfig.txt /*g:EditorConfig_softtabstop_tab* +g:EditorConfig_verbose editorconfig.txt /*g:EditorConfig_verbose* diff --git a/runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim b/runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim new file mode 100644 index 0000000000..d1f8e00a58 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/ftdetect/editorconfig.vim @@ -0,0 +1 @@ +autocmd BufNewFile,BufRead .editorconfig setfiletype dosini diff --git a/runtime/pack/dist/opt/editorconfig/mkzip.sh b/runtime/pack/dist/opt/editorconfig/mkzip.sh new file mode 100755 index 0000000000..fe5b2e3c33 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/mkzip.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +zip -r editorconfig-vim-$*.zip autoload/* doc/* ftdetect/* plugin/* diff --git a/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim b/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim new file mode 100644 index 0000000000..18addefa48 --- /dev/null +++ b/runtime/pack/dist/opt/editorconfig/plugin/editorconfig.vim @@ -0,0 +1,614 @@ +" plugin/editorconfig.vim: EditorConfig native Vimscript plugin file +" Copyright (c) 2011-2019 EditorConfig Team +" All rights reserved. +" +" Redistribution and use in source and binary forms, with or without +" modification, are permitted provided that the following conditions are met: +" +" 1. Redistributions of source code must retain the above copyright notice, +" this list of conditions and the following disclaimer. +" 2. Redistributions in binary form must reproduce the above copyright notice, +" this list of conditions and the following disclaimer in the documentation +" and/or other materials provided with the distribution. +" +" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +" ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +" LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +" POSSIBILITY OF SUCH DAMAGE. +" + +" check for Vim versions and duplicate script loading. +if v:version < 700 || exists("g:loaded_EditorConfig") + finish +endif +let g:loaded_EditorConfig = 1 + +let s:saved_cpo = &cpo +set cpo&vim + +" variables {{{1 + +" Make sure the globals all exist +if !exists('g:EditorConfig_exec_path') + let g:EditorConfig_exec_path = '' +endif + +if !exists('g:EditorConfig_verbose') + let g:EditorConfig_verbose = 0 +endif + +if !exists('g:EditorConfig_preserve_formatoptions') + let g:EditorConfig_preserve_formatoptions = 0 +endif + +if !exists('g:EditorConfig_max_line_indicator') + let g:EditorConfig_max_line_indicator = 'line' +endif + +if !exists('g:EditorConfig_exclude_patterns') + let g:EditorConfig_exclude_patterns = [] +endif + +if !exists('g:EditorConfig_disable_rules') + let g:EditorConfig_disable_rules = [] +endif + +if !exists('g:EditorConfig_enable_for_new_buf') + let g:EditorConfig_enable_for_new_buf = 0 +endif + +if !exists('g:EditorConfig_softtabstop_space') + let g:EditorConfig_softtabstop_space = 1 +endif + +if !exists('g:EditorConfig_softtabstop_tab') + let g:EditorConfig_softtabstop_tab = 1 +endif + +" Copy some of the globals into script variables --- changes to these +" globals won't affect the plugin until the plugin is reloaded. +if exists('g:EditorConfig_core_mode') && !empty(g:EditorConfig_core_mode) + let s:editorconfig_core_mode = g:EditorConfig_core_mode +else + let s:editorconfig_core_mode = '' +endif + +if exists('g:EditorConfig_exec_path') && !empty(g:EditorConfig_exec_path) + let s:editorconfig_exec_path = g:EditorConfig_exec_path +else + let s:editorconfig_exec_path = '' +endif + +let s:initialized = 0 + +" }}}1 + +" shellslash handling {{{1 +function! s:DisableShellSlash(bufnr) " {{{2 + " disable shellslash for proper escaping of Windows paths + + " In Windows, 'shellslash' also changes the behavior of 'shellescape'. + " It makes 'shellescape' behave like in UNIX environment. So ':setl + " noshellslash' before evaluating 'shellescape' and restore the + " settings afterwards when 'shell' does not contain 'sh' somewhere. + let l:shell = getbufvar(a:bufnr, '&shell') + if has('win32') && empty(matchstr(l:shell, 'sh')) + let s:old_shellslash = getbufvar(a:bufnr, '&shellslash') + setbufvar(a:bufnr, '&shellslash', 0) + endif +endfunction " }}}2 + +function! s:ResetShellSlash(bufnr) " {{{2 + " reset shellslash to the user-set value, if any + if exists('s:old_shellslash') + setbufvar(a:bufnr, '&shellslash', s:old_shellslash) + unlet! s:old_shellslash + endif +endfunction " }}}2 +" }}}1 + +" Mode initialization functions {{{1 + +function! s:InitializeVimCore() +" Initialize vim core. Returns 1 on failure; 0 on success +" At the moment, all we need to do is to check that it is installed. + try + let l:vim_core_ver = editorconfig_core#version() + catch + return 1 + endtry + return 0 +endfunction + +function! s:InitializeExternalCommand() +" Initialize external_command mode + + if empty(s:editorconfig_exec_path) + echo 'Please specify a g:EditorConfig_exec_path' + return 1 + endif + + if g:EditorConfig_verbose + echo 'Checking for external command ' . s:editorconfig_exec_path . ' ...' + endif + + if !executable(s:editorconfig_exec_path) + echo 'File ' . s:editorconfig_exec_path . ' is not executable.' + return 1 + endif + + return 0 +endfunction +" }}}1 + +function! s:Initialize() " Initialize the plugin. {{{1 + " Returns truthy on error, falsy on success. + + if empty(s:editorconfig_core_mode) + let s:editorconfig_core_mode = 'vim_core' " Default core choice + endif + + if s:editorconfig_core_mode ==? 'external_command' + if s:InitializeExternalCommand() + echohl WarningMsg + echo 'EditorConfig: Failed to initialize external_command mode. ' . + \ 'Falling back to vim_core mode.' + echohl None + let s:editorconfig_core_mode = 'vim_core' + endif + endif + + if s:editorconfig_core_mode ==? 'vim_core' + if s:InitializeVimCore() + echohl ErrorMsg + echo 'EditorConfig: Failed to initialize vim_core mode. ' . + \ 'The plugin will not function.' + echohl None + return 1 + endif + + elseif s:editorconfig_core_mode ==? 'external_command' + " Nothing to do here, but this elseif is required to avoid + " external_command falling into the else clause. + + else " neither external_command nor vim_core + echohl ErrorMsg + echo "EditorConfig: I don't know how to use mode " . s:editorconfig_core_mode + echohl None + return 1 + endif + + let s:initialized = 1 + return 0 +endfunction " }}}1 + +function! s:GetFilenames(path, filename) " {{{1 +" Yield full filepath for filename in each directory in and above path + + let l:path_list = [] + let l:path = a:path + while 1 + let l:path_list += [l:path . '/' . a:filename] + let l:newpath = fnamemodify(l:path, ':h') + if l:path == l:newpath + break + endif + let l:path = l:newpath + endwhile + return l:path_list +endfunction " }}}1 + +function! s:UseConfigFiles(from_autocmd) abort " Apply config to the current buffer {{{1 + " from_autocmd is truthy if called from an autocmd, falsy otherwise. + + " Get the properties of the buffer we are working on + if a:from_autocmd + let l:bufnr = str2nr(expand('')) + let l:buffer_name = expand(':p') + let l:buffer_path = expand(':p:h') + else + let l:bufnr = bufnr('%') + let l:buffer_name = expand('%:p') + let l:buffer_path = expand('%:p:h') + endif + call setbufvar(l:bufnr, 'editorconfig_tried', 1) + + " Only process normal buffers (do not treat help files as '.txt' files) + " When starting Vim with a directory, the buftype might not yet be set: + " Therefore, also check if buffer_name is a directory. + if index(['', 'acwrite'], &buftype) == -1 || isdirectory(l:buffer_name) + return + endif + + if empty(l:buffer_name) + if g:EditorConfig_enable_for_new_buf + let l:buffer_name = getcwd() . "/." + else + if g:EditorConfig_verbose + echo 'Skipping EditorConfig for unnamed buffer' + endif + return + endif + endif + + if getbufvar(l:bufnr, 'EditorConfig_disable', 0) + if g:EditorConfig_verbose + echo 'EditorConfig disabled --- skipping buffer "' . l:buffer_name . '"' + endif + return + endif + + " Ignore specific patterns + for pattern in g:EditorConfig_exclude_patterns + if l:buffer_name =~ pattern + if g:EditorConfig_verbose + echo 'Skipping EditorConfig for buffer "' . l:buffer_name . + \ '" based on pattern "' . pattern . '"' + endif + return + endif + endfor + + " Check if any .editorconfig does exist + let l:conf_files = s:GetFilenames(l:buffer_path, '.editorconfig') + let l:conf_found = 0 + for conf_file in conf_files + if filereadable(conf_file) + let l:conf_found = 1 + break + endif + endfor + if !l:conf_found + return + endif + + if !s:initialized + if s:Initialize() + return + endif + endif + + if g:EditorConfig_verbose + echo 'Applying EditorConfig ' . s:editorconfig_core_mode . + \ ' on file "' . l:buffer_name . '"' + endif + + if s:editorconfig_core_mode ==? 'vim_core' + if s:UseConfigFiles_VimCore(l:bufnr, l:buffer_name) == 0 + call setbufvar(l:bufnr, 'editorconfig_applied', 1) + endif + elseif s:editorconfig_core_mode ==? 'external_command' + call s:UseConfigFiles_ExternalCommand(l:bufnr, l:buffer_name) + call setbufvar(l:bufnr, 'editorconfig_applied', 1) + else + echohl Error | + \ echo "Unknown EditorConfig Core: " . + \ s:editorconfig_core_mode | + \ echohl None + endif +endfunction " }}}1 + +" Custom commands, and autoloading {{{1 + +" Autocommands, and function to enable/disable the plugin {{{2 +function! s:EditorConfigEnable(should_enable) + augroup editorconfig + autocmd! + if a:should_enable + autocmd BufNewFile,BufReadPost,BufFilePost * call s:UseConfigFiles(1) + autocmd VimEnter,BufNew * call s:UseConfigFiles(1) + endif + augroup END +endfunction + +" }}}2 + +" Commands {{{2 +command! EditorConfigEnable call s:EditorConfigEnable(1) +command! EditorConfigDisable call s:EditorConfigEnable(0) + +command! EditorConfigReload call s:UseConfigFiles(0) " Reload EditorConfig files +" }}}2 + +" On startup, enable the autocommands +call s:EditorConfigEnable(1) + +" }}}1 + +" UseConfigFiles function for different modes {{{1 + +function! s:UseConfigFiles_VimCore(bufnr, target) +" Use the vimscript EditorConfig core + try + let l:config = editorconfig_core#handler#get_configurations( + \ { 'target': a:target } ) + call s:ApplyConfig(a:bufnr, l:config) + return 0 " success + catch + return 1 " failure + endtry +endfunction + +function! s:UseConfigFiles_ExternalCommand(bufnr, target) +" Use external EditorConfig core (e.g., the C core) + + call s:DisableShellSlash(a:bufnr) + let l:exec_path = shellescape(s:editorconfig_exec_path) + call s:ResetShellSlash(a:bufnr) + + call s:SpawnExternalParser(a:bufnr, l:exec_path, a:target) +endfunction + +function! s:SpawnExternalParser(bufnr, cmd, target) " {{{2 +" Spawn external EditorConfig. Used by s:UseConfigFiles_ExternalCommand() + + let l:cmd = a:cmd + + if empty(l:cmd) + throw 'No cmd provided' + endif + + let l:config = {} + + call s:DisableShellSlash(a:bufnr) + let l:cmd = l:cmd . ' ' . shellescape(a:target) + call s:ResetShellSlash(a:bufnr) + + let l:parsing_result = split(system(l:cmd), '\v[\r\n]+') + + " if editorconfig core's exit code is not zero, give out an error + " message + if v:shell_error != 0 + echohl ErrorMsg + echo 'Failed to execute "' . l:cmd . '". Exit code: ' . + \ v:shell_error + echo '' + echo 'Message:' + echo l:parsing_result + echohl None + return + endif + + if g:EditorConfig_verbose + echo 'Output from EditorConfig core executable:' + echo l:parsing_result + endif + + for one_line in l:parsing_result + let l:eq_pos = stridx(one_line, '=') + + if l:eq_pos == -1 " = is not found. Skip this line + continue + endif + + let l:eq_left = strpart(one_line, 0, l:eq_pos) + if l:eq_pos + 1 < strlen(one_line) + let l:eq_right = strpart(one_line, l:eq_pos + 1) + else + let l:eq_right = '' + endif + + let l:config[l:eq_left] = l:eq_right + endfor + + call s:ApplyConfig(a:bufnr, l:config) +endfunction " }}}2 + +" }}}1 + +" Set the buffer options {{{1 +function! s:SetCharset(bufnr, charset) abort " apply config['charset'] + + " Remember the buffer's state so we can set `nomodifed` at the end + " if appropriate. + let l:orig_fenc = getbufvar(a:bufnr, "&fileencoding") + let l:orig_enc = getbufvar(a:bufnr, "&encoding") + let l:orig_modified = getbufvar(a:bufnr, "&modified") + + if a:charset == "utf-8" + call setbufvar(a:bufnr, '&fileencoding', 'utf-8') + call setbufvar(a:bufnr, '&bomb', 0) + elseif a:charset == "utf-8-bom" + call setbufvar(a:bufnr, '&fileencoding', 'utf-8') + call setbufvar(a:bufnr, '&bomb', 1) + elseif a:charset == "latin1" + call setbufvar(a:bufnr, '&fileencoding', 'latin1') + call setbufvar(a:bufnr, '&bomb', 0) + elseif a:charset == "utf-16be" + call setbufvar(a:bufnr, '&fileencoding', 'utf-16be') + call setbufvar(a:bufnr, '&bomb', 1) + elseif a:charset == "utf-16le" + call setbufvar(a:bufnr, '&fileencoding', 'utf-16le') + call setbufvar(a:bufnr, '&bomb', 1) + endif + + let l:new_fenc = getbufvar(a:bufnr, "&fileencoding") + + " If all we did was change the fileencoding from the default to a copy + " of the default, we didn't actually modify the file. + if !l:orig_modified && (l:orig_fenc ==# '') && (l:new_fenc ==# l:orig_enc) + if g:EditorConfig_verbose + echo 'Setting nomodified on buffer ' . a:bufnr + endif + call setbufvar(a:bufnr, '&modified', 0) + endif +endfunction + +function! s:ApplyConfig(bufnr, config) abort + if g:EditorConfig_verbose + echo 'Options: ' . string(a:config) + endif + + if s:IsRuleActive('indent_style', a:config) + if a:config["indent_style"] == "tab" + call setbufvar(a:bufnr, '&expandtab', 0) + elseif a:config["indent_style"] == "space" + call setbufvar(a:bufnr, '&expandtab', 1) + endif + endif + + if s:IsRuleActive('tab_width', a:config) + let l:tabstop = str2nr(a:config["tab_width"]) + call setbufvar(a:bufnr, '&tabstop', l:tabstop) + else + " Grab the current ts so we can use it below + let l:tabstop = getbufvar(a:bufnr, '&tabstop') + endif + + if s:IsRuleActive('indent_size', a:config) + " if indent_size is 'tab', set shiftwidth to tabstop; + " if indent_size is a positive integer, set shiftwidth to the integer + " value + if a:config["indent_size"] == "tab" + call setbufvar(a:bufnr, '&shiftwidth', l:tabstop) + if type(g:EditorConfig_softtabstop_tab) != type([]) + call setbufvar(a:bufnr, '&softtabstop', + \ g:EditorConfig_softtabstop_tab > 0 ? + \ l:tabstop : g:EditorConfig_softtabstop_tab) + endif + else + let l:indent_size = str2nr(a:config["indent_size"]) + if l:indent_size > 0 + call setbufvar(a:bufnr, '&shiftwidth', l:indent_size) + if type(g:EditorConfig_softtabstop_space) != type([]) + call setbufvar(a:bufnr, '&softtabstop', + \ g:EditorConfig_softtabstop_space > 0 ? + \ l:indent_size : g:EditorConfig_softtabstop_space) + endif + endif + endif + + endif + + if s:IsRuleActive('end_of_line', a:config) && + \ getbufvar(a:bufnr, '&modifiable') + if a:config["end_of_line"] == "lf" + call setbufvar(a:bufnr, '&fileformat', 'unix') + elseif a:config["end_of_line"] == "crlf" + call setbufvar(a:bufnr, '&fileformat', 'dos') + elseif a:config["end_of_line"] == "cr" + call setbufvar(a:bufnr, '&fileformat', 'mac') + endif + endif + + if s:IsRuleActive('charset', a:config) && + \ getbufvar(a:bufnr, '&modifiable') + call s:SetCharset(a:bufnr, a:config["charset"]) + endif + + augroup editorconfig_trim_trailing_whitespace + autocmd! BufWritePre + if s:IsRuleActive('trim_trailing_whitespace', a:config) && + \ get(a:config, 'trim_trailing_whitespace', 'false') ==# 'true' + execute 'autocmd BufWritePre call s:TrimTrailingWhitespace()' + endif + augroup END + + if s:IsRuleActive('insert_final_newline', a:config) + if exists('+fixendofline') + if a:config["insert_final_newline"] == "false" + call setbufvar(a:bufnr, '&fixendofline', 0) + else + call setbufvar(a:bufnr, '&fixendofline', 1) + endif + elseif exists(':SetNoEOL') == 2 + if a:config["insert_final_newline"] == "false" + silent! SetNoEOL " Use the PreserveNoEOL plugin to accomplish it + endif + endif + endif + + " highlight the columns following max_line_length + if s:IsRuleActive('max_line_length', a:config) && + \ a:config['max_line_length'] != 'off' + let l:max_line_length = str2nr(a:config['max_line_length']) + + if l:max_line_length >= 0 + call setbufvar(a:bufnr, '&textwidth', l:max_line_length) + if g:EditorConfig_preserve_formatoptions == 0 + " setlocal formatoptions+=tc + let l:fo = getbufvar(a:bufnr, '&formatoptions') + if l:fo !~# 't' + let l:fo .= 't' + endif + if l:fo !~# 'c' + let l:fo .= 'c' + endif + call setbufvar(a:bufnr, '&formatoptions', l:fo) + endif + endif + + if exists('+colorcolumn') + if l:max_line_length > 0 + if g:EditorConfig_max_line_indicator == 'line' + " setlocal colorcolumn+=+1 + let l:cocol = getbufvar(a:bufnr, '&colorcolumn') + if !empty(l:cocol) + let l:cocol .= ',' + endif + let l:cocol .= '+1' + call setbufvar(a:bufnr, '&colorcolumn', l:cocol) + elseif g:EditorConfig_max_line_indicator == 'fill' && + \ l:max_line_length < getbufvar(a:bufnr, '&columns') + " Fill only if the columns of screen is large enough + call setbufvar(a:bufnr, '&colorcolumn', + \ join(range(l:max_line_length+1, + \ getbufvar(a:bufnr, '&columns')), + \ ',')) + elseif g:EditorConfig_max_line_indicator == 'exceeding' + call setbufvar(a:bufnr, '&colorcolumn', '') + for l:match in getmatches() + if get(l:match, 'group', '') == 'ColorColumn' + call matchdelete(get(l:match, 'id')) + endif + endfor + call matchadd('ColorColumn', + \ '\%' . (l:max_line_length + 1) . 'v.', 100) + elseif g:EditorConfig_max_line_indicator == 'fillexceeding' + let &l:colorcolumn = '' + for l:match in getmatches() + if get(l:match, 'group', '') == 'ColorColumn' + call matchdelete(get(l:match, 'id')) + endif + endfor + call matchadd('ColorColumn', + \ '\%'. (l:max_line_length + 1) . 'v.\+', -1) + endif + endif + endif + endif + + call editorconfig#ApplyHooks(a:config) +endfunction + +" }}}1 + +function! s:TrimTrailingWhitespace() " {{{1 + " Called from within a buffer-specific autocmd, so we can use '%' + if getbufvar('%', '&modifiable') + " don't lose user position when trimming trailing whitespace + let s:view = winsaveview() + try + silent! keeppatterns keepjumps %s/\s\+$//e + finally + call winrestview(s:view) + endtry + endif +endfunction " }}}1 + +function! s:IsRuleActive(name, config) " {{{1 + return index(g:EditorConfig_disable_rules, a:name) < 0 && + \ has_key(a:config, a:name) +endfunction "}}}1 + +let &cpo = s:saved_cpo +unlet! s:saved_cpo + +" vim: fdm=marker fdc=3 diff --git a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim index 466a77fd84..7d9b80f510 100644 --- a/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim +++ b/runtime/pack/dist/opt/termdebug/plugin/termdebug.vim @@ -2,7 +2,7 @@ " " Author: Bram Moolenaar " Copyright: Vim license applies, see ":help license" -" Last Change: 2023 Jun 24 +" Last Change: 2023 Aug 23 " " WORK IN PROGRESS - The basics works stable, more to come " Note: In general you need at least GDB 7.12 because this provides the @@ -229,13 +229,13 @@ endfunc func s:CloseBuffers() exe 'bwipe! ' . s:ptybuf exe 'bwipe! ' . s:commbuf - if s:asmbuf > 0 + if s:asmbuf > 0 && bufexists(s:asmbuf) exe 'bwipe! ' . s:asmbuf endif - if s:varbuf > 0 + if s:varbuf > 0 && bufexists(s:varbuf) exe 'bwipe! ' . s:varbuf endif - s:running = 0 + let s:running = 0 unlet! s:gdbwin endfunc @@ -453,6 +453,8 @@ func s:StartDebug_prompt(dict) exe 'bwipe! ' . s:promptbuf return endif + exe $'au BufUnload ++once ' .. + \ 'call job_stop(s:gdbjob, ''kill'')' " Mark the buffer modified so that it's not easy to close. set modified let s:gdb_channel = job_getchannel(s:gdbjob) @@ -617,9 +619,16 @@ endfunc func s:GdbOutCallback(channel, text) call ch_log('received from gdb: ' . a:text) + " Disassembly messages need to be forwarded as-is. + if s:parsing_disasm_msg + call s:CommOutput(a:channel, a:text) + return + end + " Drop the gdb prompt, we have our own. " Drop status and echo'd commands. - if a:text == '(gdb) ' || a:text == '^done' || a:text[0] == '&' + if a:text == '(gdb) ' || a:text == '^done' || + \ (a:text[0] == '&' && a:text !~ '^&"disassemble') return endif if a:text =~ '^\^error,msg=' @@ -647,8 +656,9 @@ func s:GdbOutCallback(channel, text) endfunc " Decode a message from gdb. "quotedText" starts with a ", return the text up -" to the next ", unescaping characters: +" to the next unescaped ", unescaping characters: " - remove line breaks (unless "literal" is v:true) +" - change \" to " " - change \\t to \t (unless "literal" is v:true) " - change \0xhh to \xhh (disabled for now) " - change \ooo to octal @@ -659,24 +669,25 @@ func s:DecodeMessage(quotedText, literal) return endif let msg = a:quotedText - \ ->substitute('^"\|".*', '', 'g') - " multi-byte characters arrive in octal form - " NULL-values must be kept encoded as those break the string otherwise + \ ->substitute('^"\|[^\\]\zs".*', '', 'g') + \ ->substitute('\\"', '"', 'g') + "\ multi-byte characters arrive in octal form + "\ NULL-values must be kept encoded as those break the string otherwise \ ->substitute('\\000', s:NullRepl, 'g') \ ->substitute('\\\o\o\o', {-> eval('"' .. submatch(0) .. '"')}, 'g') - " Note: GDB docs also mention hex encodings - the translations below work - " but we keep them out for performance-reasons until we actually see - " those in mi-returns - " \ ->substitute('\\0x\(\x\x\)', {-> eval('"\x' .. submatch(1) .. '"')}, 'g') - " \ ->substitute('\\0x00', s:NullRepl, 'g') + "\ Note: GDB docs also mention hex encodings - the translations below work + "\ but we keep them out for performance-reasons until we actually see + "\ those in mi-returns + "\ \ ->substitute('\\0x\(\x\x\)', {-> eval('"\x' .. submatch(1) .. '"')}, 'g') + "\ \ ->substitute('\\0x00', s:NullRepl, 'g') \ ->substitute('\\\\', '\', 'g') \ ->substitute(s:NullRepl, '\\000', 'g') if !a:literal - return msg + return msg \ ->substitute('\\t', "\t", 'g') \ ->substitute('\\n', '', 'g') else - return msg + return msg endif endfunc const s:NullRepl = 'XXXNULLXXX' @@ -709,15 +720,7 @@ func s:EndTermDebug(job, status) endif exe 'bwipe! ' . s:commbuf - if s:asmbuf > 0 - exe 'bwipe! ' . s:asmbuf - endif - if s:varbuf > 0 - exe 'bwipe! ' . s:varbuf - endif - let s:running = 0 unlet s:gdbwin - call s:EndDebugCommon() endfunc @@ -727,6 +730,13 @@ func s:EndDebugCommon() if exists('s:ptybuf') && s:ptybuf exe 'bwipe! ' . s:ptybuf endif + if s:asmbuf > 0 && bufexists(s:asmbuf) + exe 'bwipe! ' . s:asmbuf + endif + if s:varbuf > 0 && bufexists(s:varbuf) + exe 'bwipe! ' . s:varbuf + endif + let s:running = 0 " Restore 'signcolumn' in all buffers for which it was set. call win_gotoid(s:sourcewin) @@ -774,12 +784,8 @@ func s:EndPromptDebug(job, status) doauto User TermdebugStopPre endif - let curwinid = win_getid() - call win_gotoid(s:gdbwin) - set nomodified - close - if curwinid != s:gdbwin - call win_gotoid(curwinid) + if bufexists(s:promptbuf) + exe 'bwipe! ' . s:promptbuf endif call s:EndDebugCommon() @@ -789,7 +795,6 @@ endfunc " Disassembly window - added by Michael Sartain " -" - CommOutput: disassemble $pc " - CommOutput: &"disassemble $pc\n" " - CommOutput: ~"Dump of assembler code for function main(int, char**):\n" " - CommOutput: ~" 0x0000555556466f69 <+0>:\tpush rbp\n" @@ -799,7 +804,6 @@ endfunc " - CommOutput: ~"End of assembler dump.\n" " - CommOutput: ^done -" - CommOutput: disassemble $pc " - CommOutput: &"disassemble $pc\n" " - CommOutput: &"No function contains specified address.\n" " - CommOutput: ^error,msg="No function contains specified address." @@ -831,12 +835,12 @@ func s:HandleDisasmMsg(msg) call s:SendCommand('disassemble $pc,+100') endif let s:parsing_disasm_msg = 0 - elseif a:msg =~ '\&\"disassemble \$pc' + elseif a:msg =~ '^&"disassemble \$pc' if a:msg =~ '+100' " This is our second disasm attempt let s:parsing_disasm_msg = 2 endif - else + elseif a:msg !~ '^&"disassemble' let value = substitute(a:msg, '^\~\"[ ]*', '', '') let value = substitute(value, '^=>[ ]*', '', '') let value = substitute(value, '\\n\"\r$', '', '') @@ -920,9 +924,10 @@ func s:CommOutput(chan, msg) call s:HandleEvaluate(msg) elseif msg =~ '^\^error,msg=' call s:HandleError(msg) - elseif msg =~ '^disassemble' + elseif msg =~ '^&"disassemble' let s:parsing_disasm_msg = 1 let s:asm_lines = [] + call s:HandleDisasmMsg(msg) elseif msg =~ '^\^done,variables=' call s:HandleVariablesMsg(msg) endif @@ -965,6 +970,10 @@ func s:InstallCommands() command Continue call term_sendkeys(s:gdbbuf, "continue\r") endif + command -nargs=* Frame call s:Frame() + command -count=1 Up call s:Up() + command -count=1 Down call s:Down() + command -range -nargs=* Evaluate call s:Evaluate(, ) command Gdb call win_gotoid(s:gdbwin) command Program call s:GotoProgram() @@ -984,6 +993,25 @@ func s:InstallCommands() nnoremap K :Evaluate endif + let map = 1 + if exists('g:termdebug_config') + let map = get(g:termdebug_config, 'map_plus', 1) + endif + if map + let s:plus_map_saved = maparg('+', 'n', 0, 1) + nnoremap + $'{v:count1}Up' + endif + + let map = 1 + if exists('g:termdebug_config') + let map = get(g:termdebug_config, 'map_minus', 1) + endif + if map + let s:minus_map_saved = maparg('-', 'n', 0, 1) + nnoremap - $'{v:count1}Down' + endif + + if has('menu') && &mouse != '' call s:InstallWinbar(0) @@ -1040,6 +1068,9 @@ func s:DeleteCommands() delcommand Arguments delcommand Stop delcommand Continue + delcommand Frame + delcommand Up + delcommand Down delcommand Evaluate delcommand Gdb delcommand Program @@ -1056,6 +1087,22 @@ func s:DeleteCommands() endif unlet s:k_map_saved endif + if exists('s:plus_map_saved') + if empty(s:plus_map_saved) + nunmap + + else + call mapset(s:plus_map_saved) + endif + unlet s:plus_map_saved + endif + if exists('s:minus_map_saved') + if empty(s:minus_map_saved) + nunmap - + else + call mapset(s:minus_map_saved) + endif + unlet s:minus_map_saved + endif if has('menu') " Remove the WinBar entries from all windows where it was added. @@ -1172,6 +1219,37 @@ func s:Run(args) call s:SendResumingCommand('-exec-run') endfunc +" :Frame - go to a specfic frame in the stack +func s:Frame(arg) + " Note: we explicit do not use mi's command + " call s:SendCommand('-stack-select-frame "' . a:arg .'"') + " as we only get a "done" mi response and would have to open the file + " 'manually' - using cli command "frame" provides us with the mi response + " already parsed and allows for more formats + if a:arg =~ '^\d\+$' || a:arg == '' + " specify frame by number + call s:SendCommand('-interpreter-exec mi "frame ' . a:arg .'"') + elseif a:arg =~ '^0x[0-9a-fA-F]\+$' + " specify frame by stack address + call s:SendCommand('-interpreter-exec mi "frame address ' . a:arg .'"') + else + " specify frame by function name + call s:SendCommand('-interpreter-exec mi "frame function ' . a:arg .'"') + endif +endfunc + +" :Up - go a:count frames in the stack "higher" +func s:Up(count) + " the 'correct' one would be -stack-select-frame N, but we don't know N + call s:SendCommand($'-interpreter-exec console "up {a:count}"') +endfunc + +" :Down - go a:count frames in the stack "below" +func s:Down(count) + " the 'correct' one would be -stack-select-frame N, but we don't know N + call s:SendCommand($'-interpreter-exec console "down {a:count}"') +endfunc + func s:SendEval(expr) " check for "likely" boolean expressions, in which case we take it as lhs if a:expr =~ "[=!<>]=" @@ -1358,7 +1436,7 @@ func s:GotoAsmwinOrCreateIt() setlocal signcolumn=no setlocal modifiable - if s:asmbuf > 0 + if s:asmbuf > 0 && bufexists(s:asmbuf) exe 'buffer' . s:asmbuf else silent file Termdebug-asm-listing @@ -1420,7 +1498,7 @@ func s:GotoVariableswinOrCreateIt() setlocal signcolumn=no setlocal modifiable - if s:varbuf > 0 + if s:varbuf > 0 && bufexists(s:varbuf) exe 'buffer' . s:varbuf else silent file Termdebug-variables-listing diff --git a/runtime/plugin/vimballPlugin.vim b/runtime/plugin/vimballPlugin.vim index d7473a0296..cd14efa1be 100644 --- a/runtime/plugin/vimballPlugin.vim +++ b/runtime/plugin/vimballPlugin.vim @@ -28,10 +28,16 @@ com! -nargs=0 VimballList call vimball#Vimball(0) com! -nargs=* -complete=dir RmVimball call vimball#SaveSettings()|call vimball#RmVimball()|call vimball#RestoreSettings() augroup Vimball au! - au BufEnter *.vba,*.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif + au BufEnter *.vba,*.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz + \ if getline(1) =~ '^" Vimball Archiver' | + \ setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0, "Source this file to extract it! (:so %)")|endif | + \ endif au SourceCmd *.vba.gz,*.vba.bz2,*.vba.zip,*.vba.xz let s:origfile=expand("%")|if expand("%")!=expand("") | exe "1sp" fnameescape(expand(""))|endif|call vimball#Decompress(expand(""))|so %|if s:origfile!=expand("")|close|endif au SourceCmd *.vba if expand("%")!=expand("") | exe "1sp" fnameescape(expand(""))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif - au BufEnter *.vmb,*.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif + au BufEnter *.vmb,*.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz + \ if getline(1) =~ '^" Vimball Archiver' | + \ setlocal bt=nofile fmr=[[[,]]] fdm=marker|if &ff != 'unix'|setlocal ma ff=unix noma|endif|if line('$') > 1|call vimball#ShowMesg(0,"Source this file to extract it! (:so %)")|endif | + \ endif au SourceCmd *.vmb.gz,*.vmb.bz2,*.vmb.zip,*.vmb.xz let s:origfile=expand("%")|if expand("%")!=expand("") | exe "1sp" fnameescape(expand(""))|endif|call vimball#Decompress(expand(""))|so %|if s:origfile!=expand("")|close|endif au SourceCmd *.vmb if expand("%")!=expand("") | exe "1sp" fnameescape(expand(""))|call vimball#Vimball(1)|close|else|call vimball#Vimball(1)|endif augroup END @@ -41,3 +47,5 @@ augroup END " vim: fdm=marker let &cpo= s:keepcpo unlet s:keepcpo + +" vim: ts=4: diff --git a/runtime/scripts.vim b/runtime/scripts.vim index ced4c239b5..a8f2f72820 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -1,16 +1,12 @@ " Vim support file to detect file types in scripts " " Maintainer: The Vim Project -" Last Change: 2023 Aug 10 +" Last Change: 2023 Aug 27 " Former Maintainer: Bram Moolenaar " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by " the file contents. The autocommand is in $VIMRUNTIME/filetype.vim. -" -" Note that the pattern matches are done with =~# to avoid the value of the -" 'ignorecase' option making a difference. Where case is to be ignored use -" =~? instead. Do not use =~ anywhere. " Bail out when a FileType autocommand has already set the filetype. diff --git a/runtime/syntax/8th.vim b/runtime/syntax/8th.vim index ce27d10a44..643c9cb095 100644 --- a/runtime/syntax/8th.vim +++ b/runtime/syntax/8th.vim @@ -363,7 +363,7 @@ syn region eighthComment start="\zs\\" end="$" contains=eighthTodo if !exists("did_eighth_syntax_inits") let did_eighth_syntax_inits=1 - " The default methods for highlighting. Can be overriden later. + " The default methods for highlighting. Can be overridden later. hi def link eighthTodo Todo hi def link eighthOperators Operator hi def link eighthMath Number diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim index b232e826cd..6445b9438b 100644 --- a/runtime/syntax/a65.vim +++ b/runtime/syntax/a65.vim @@ -118,7 +118,7 @@ syn match a65Section "\(^\|\s\)\.)\($\|\s\)" " Strings syn match a65String "\".*\"" -" Programm Counter +" Program Counter syn region a65PC start="\*=" end="\>" keepend " HI/LO Byte diff --git a/runtime/syntax/bash.vim b/runtime/syntax/bash.vim index 75ab99938e..1e565c3022 100644 --- a/runtime/syntax/bash.vim +++ b/runtime/syntax/bash.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: bash -" Maintainer: Bram -" Last Change: 2019 Sep 27 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 13 " quit when a syntax file was already loaded if exists("b:current_syntax") diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim index fede3d97d5..dce9974903 100644 --- a/runtime/syntax/bindzone.vim +++ b/runtime/syntax/bindzone.vim @@ -33,7 +33,7 @@ syn match zoneDomain contained /[^[:space:]!"#$%&'()*+,\/:;<=>?@[\]\ syn match zoneSpecial contained /^[@*.]\s/ syn match zoneTTL contained /\s\@<=\d[0-9WwDdHhMmSs]*\(\s\|$\)\@=/ nextgroup=zoneClass,zoneRRType skipwhite syn keyword zoneClass contained IN CHAOS CH HS HESIOD nextgroup=zoneRRType,zoneTTL skipwhite -syn keyword zoneRRType contained A AAAA CAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM OPENPGPKEY PTR RP RRSIG SMIMEA SOA SPF SRV SSHFP TLSA TXT nextgroup=zoneRData skipwhite +syn keyword zoneRRType contained A AAAA APL CAA CERT CNAME DNAME DNSKEY DS HINFO LOC MX NAPTR NS NSEC NSEC3 NSEC3PARAM OPENPGPKEY PTR RP RRSIG SMIMEA SOA SPF SRV SSHFP TLSA TXT nextgroup=zoneRData skipwhite syn match zoneRData contained /[^;]*/ contains=zoneDomain,zoneIPAddr,zoneIP6Addr,zoneText,zoneNumber,zoneParen,zoneUnknown syn match zoneIPAddr contained /\<[0-9]\{1,3}\(\.[0-9]\{1,3}\)\{,3}\>/ @@ -60,7 +60,7 @@ syn match zoneIP6Addr contained /\<\(\x\{1,4}:\)\{1,7}:\(\s\|;\|$\)\@= syn match zoneText contained /"\([^"\\]\|\\.\)*"\(\s\|;\|$\)\@=/ syn match zoneNumber contained /\<[0-9]\+\(\s\|;\|$\)\@=/ -syn match zoneSerial contained /\<[0-9]\{9,10}\(\s\|;\|$\)\@=/ +syn match zoneSerial contained /\<[0-9]\{1,10}\(\s\|;\|$\)\@=/ syn match zoneErrParen /)/ syn region zoneParen contained start="(" end=")" contains=zoneSerial,zoneTTL,zoneNumber,zoneComment diff --git a/runtime/syntax/chaiscript.vim b/runtime/syntax/chaiscript.vim index 5a64bdb556..9925ba5138 100644 --- a/runtime/syntax/chaiscript.vim +++ b/runtime/syntax/chaiscript.vim @@ -61,7 +61,7 @@ syn region chaiscriptFunc matchgroup=chaiscriptFunc start="`" end="`" " Intentionally leaving out all of the normal, well known operators syn match chaiscriptOperator "\.\." -" Guard seperator as an operator +" Guard separator as an operator syn match chaiscriptOperator ":" " Comments diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim index f7616e4c6d..7340ac238e 100644 --- a/runtime/syntax/cmake.vim +++ b/runtime/syntax/cmake.vim @@ -335,7 +335,7 @@ syn keyword cmakeGeneratorExpressions contained syn case ignore syn keyword cmakeCommand - \ add_compile_options add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory break build_command cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue create_test_sourcelist ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload define_property enable_language enable_testing endfunction endmacro execute_process export file find_file find_library find_package find_path find_program fltk_wrap_ui function get_cmake_property get_directory_property get_filename_component get_property get_source_file_property get_target_property get_test_property include include_directories include_external_msproject include_guard include_regular_expression install link_directories list load_cache load_command macro mark_as_advanced math message option project qt_wrap_cpp qt_wrap_ui remove_definitions return separate_arguments set set_directory_properties set_property set_source_files_properties set_target_properties set_tests_properties site_name source_group string target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_libraries target_sources try_compile try_run unset variable_watch + \ add_compile_options add_compile_definitions add_custom_command add_custom_target add_definitions add_dependencies add_executable add_library add_subdirectory add_test aux_source_directory break build_command cmake_host_system_information cmake_minimum_required cmake_parse_arguments cmake_policy configure_file continue create_test_sourcelist ctest_build ctest_configure ctest_coverage ctest_empty_binary_directory ctest_memcheck ctest_read_custom_files ctest_run_script ctest_sleep ctest_start ctest_submit ctest_test ctest_update ctest_upload define_property enable_language enable_testing endfunction endmacro execute_process export file find_file find_library find_package find_path find_program fltk_wrap_ui function get_cmake_property get_directory_property get_filename_component get_property get_source_file_property get_target_property get_test_property include include_directories include_external_msproject include_guard include_regular_expression install link_directories list load_cache load_command macro mark_as_advanced math message option project qt_wrap_cpp qt_wrap_ui remove_definitions return separate_arguments set set_directory_properties set_property set_source_files_properties set_target_properties set_tests_properties site_name source_group string target_compile_definitions target_compile_features target_compile_options target_include_directories target_link_libraries target_sources try_compile try_run unset variable_watch \ nextgroup=cmakeArguments syn keyword cmakeCommandConditional diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim index 5e38ffaafe..12daa9b7b8 100644 --- a/runtime/syntax/crontab.vim +++ b/runtime/syntax/crontab.vim @@ -5,7 +5,7 @@ " License: This file can be redistribued and/or modified under the same terms " as Vim itself. " Filenames: /tmp/crontab.* used by "crontab -e" -" Last Change: 2015-01-20 +" Last Change: 2022-09-22 " " crontab line format: " Minutes Hours Days Months Days_of_Week Commands # comments @@ -15,20 +15,20 @@ if exists("b:current_syntax") finish endif -syntax match crontabNick "^\s*@\(reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\)\>" nextgroup=crontabCmd skipwhite +syntax match crontabNick "^\s*@\(reboot\|yearly\|annually\|monthly\|weekly\|daily\|midnight\|hourly\|every_minute\|every_second\)\>" nextgroup=crontabCmd skipwhite syntax match crontabVar "^\s*\k\w*\s*="me=e-1 syntax case ignore -syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite -syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite contained -syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained +syntax match crontabMin "^\s*[-~0-9/,.*]\+" nextgroup=crontabHr skipwhite +syntax match crontabHr "\s[-~0-9/,.*]\+" nextgroup=crontabDay skipwhite contained +syntax match crontabDay "\s[-~0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained -syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained +syntax match crontabMnth "\s[-~a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec -syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained +syntax match crontabDow "\s[-~a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained syntax keyword crontabDow7 contained sun mon tue wed thu fri sat syntax region crontabCmd start="\S" end="$" skipwhite contained keepend contains=crontabPercent diff --git a/runtime/syntax/euphoria4.vim b/runtime/syntax/euphoria4.vim index 5e668a7d67..baa0e8e7b9 100644 --- a/runtime/syntax/euphoria4.vim +++ b/runtime/syntax/euphoria4.vim @@ -27,7 +27,7 @@ syn keyword euphoria4Debug includes inline warning define " Keywords for conditional compilation - from $EUDIR/include/euphoria/keywords.e: syn keyword euphoria4PreProc elsedef elsifdef ifdef -" Keywords (Statments) - from $EUDIR/include/euphoria/keywords.e: +" Keywords (Statements) - from $EUDIR/include/euphoria/keywords.e: syn keyword euphoria4Keyword and as break by case constant continue do else syn keyword euphoria4Keyword elsif end entry enum exit export syn keyword euphoria4Keyword fallthru for function global goto if include diff --git a/runtime/syntax/flexwiki.vim b/runtime/syntax/flexwiki.vim index 6b15ab2d90..3b5f7ff573 100644 --- a/runtime/syntax/flexwiki.vim +++ b/runtime/syntax/flexwiki.vim @@ -67,10 +67,10 @@ syntax match flexwikiEmoticons /\((.)\|:[()|$@]\|:-[DOPS()\]|$@]\|;)\|:'(\) " Aggregate all the regular text highlighting into flexwikiText syntax cluster flexwikiText contains=flexwikiItalic,flexwikiBold,flexwikiCode,flexwikiDeEmphasis,flexwikiDelText,flexwikiInsText,flexwikiSuperScript,flexwikiSubScript,flexwikiCitation,flexwikiLink,flexwikiWord,flexwikiEmoticons -" single-line WikiPropertys +" single-line WikiProperties syntax match flexwikiSingleLineProperty /^:\?[A-Z_][_a-zA-Z0-9]\+:/ -" TODO: multi-line WikiPropertys +" TODO: multi-line WikiProperties " Header levels, 1-6 syntax match flexwikiH1 /^!.*$/ diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim index fe98634079..252116a187 100644 --- a/runtime/syntax/forth.vim +++ b/runtime/syntax/forth.vim @@ -1,10 +1,20 @@ " Vim syntax file -" Language: FORTH -" Current Maintainer: Johan Kotlinski -" Previous Maintainer: Christian V. J. Br�ssow -" Last Change: 2023-01-12 -" Filenames: *.fs,*.ft -" URL: https://github.com/jkotlinski/forth.vim +" Language: Forth +" Maintainer: Johan Kotlinski +" Previous Maintainer: Christian V. J. Brüssow +" Last Change: 2023 Aug 13 +" Filenames: *.f,*.fs,*.ft,*.fth,*.4th +" URL: https://github.com/jkotlinski/forth.vim + +" Supports the Forth-2012 Standard. +" +" Removed words from the earlier Forth-79, Forth-83 and Forth-94 standards are +" also included. +" +" These have been organised according to the version in which they were +" initially included and the version in which they were removed (obsolescent +" status is ignored). Words with "experimental" or "uncontrolled" status are +" not included unless they were later standardised. " quit when a syntax file was already loaded if exists("b:current_syntax") @@ -15,19 +25,15 @@ let s:cpo_save = &cpo set cpo&vim " Synchronization method -syn sync ccomment -syn sync maxlines=200 +exe "syn sync minlines=" .. get(g:, "forth_minlines", 50) -" I use gforth, so I set this to case ignore syn case ignore -" Some special, non-FORTH keywords -syn keyword forthTodo contained TODO FIXME XXX - " Characters allowed in keywords " I don't know if 128-255 are allowed in ANS-FORTH -setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255 +syn iskeyword 33-126,128-255 +" Space errors {{{1 " when wanted, highlight trailing white space if exists("forth_space_errors") if !exists("forth_no_trail_space_error") @@ -38,188 +44,369 @@ if exists("forth_space_errors") endif endif -" Keywords +" Core words {{{1 -" basic mathematical and logical operators -syn keyword forthOperators + - * / MOD /MOD NEGATE ABS MIN MAX -syn keyword forthOperators AND OR XOR NOT LSHIFT RSHIFT INVERT 2* 2/ 1+ -syn keyword forthOperators 1- 2+ 2- 8* UNDER+ -syn keyword forthOperators M+ */ */MOD M* UM* M*/ UM/MOD FM/MOD SM/REM -syn keyword forthOperators D+ D- DNEGATE DABS DMIN DMAX D2* D2/ -syn keyword forthOperators F+ F- F* F/ FNEGATE FABS FMAX FMIN FLOOR FROUND -syn keyword forthOperators F** FSQRT FEXP FEXPM1 FLN FLNP1 FLOG FALOG FSIN -syn keyword forthOperators FCOS FSINCOS FTAN FASIN FACOS FATAN FATAN2 FSINH -syn keyword forthOperators FCOSH FTANH FASINH FACOSH FATANH F2* F2/ 1/F -syn keyword forthOperators F~REL F~ABS F~ -syn keyword forthOperators 0< 0<= 0<> 0= 0> 0>= < <= <> = > >= U< U<= -syn keyword forthOperators U> U>= D0< D0<= D0<> D0= D0> D0>= D< D<= D<> -syn keyword forthOperators D= D> D>= DU< DU<= DU> DU>= WITHIN ?NEGATE -syn keyword forthOperators ?DNEGATE TRUE FALSE +" basic mathematical and logical operators {{{2 +syn keyword forthOperators * */ */MOD + - / /MOD 0< 0= 1+ 1- 2* 2/ < = > ABS +syn keyword forthOperators AND FM/MOD INVERT LSHIFT M* MAX MIN MOD NEGATE OR +syn keyword forthOperators RSHIFT SM/REM U< UM* UM/MOD XOR + " extension words +syn keyword forthOperators 0<> 0> <> U> WITHIN + " Forth-79 +syn keyword forthOperators U* U/ U/MOD + " Forth-79, Forth-83 +syn keyword forthOperators NOT + " Forth-83 +syn keyword forthOperators 2+ 2- -" various words that take an input and do something with it -syn keyword forthFunction . U. .R U.R +" non-standard basic mathematical and logical operators +syn keyword forthOperators 0<= 0>= 8* <= >= ?DNEGATE ?NEGATE U<= U>= UNDER+ -" stack manipulations -syn keyword forthStack DROP NIP DUP OVER TUCK SWAP ROT -ROT ?DUP PICK ROLL -syn keyword forthStack 2DROP 2NIP 2DUP 2OVER 2TUCK 2SWAP 2ROT 2-ROT -syn keyword forthStack 3DUP 4DUP 5DUP 3DROP 4DROP 5DROP 8DROP 4SWAP 4ROT -syn keyword forthStack 4-ROT 4TUCK 8SWAP 8DUP -syn keyword forthRStack >R R> R@ RDROP 2>R 2R> 2R@ 2RDROP -syn keyword forthRstack 4>R 4R> 4R@ 4RDROP -syn keyword forthFStack FDROP FNIP FDUP FOVER FTUCK FSWAP FROT +" various words that take an input and do something with it {{{2 +syn keyword forthFunction . U. + " extension words +syn keyword forthFunction .R U.R -" stack pointer manipulations -syn keyword forthSP SP@ SP! FP@ FP! RP@ RP! LP@ LP! DEPTH +" stack manipulations {{{2 +syn keyword forthStack 2DROP 2DUP 2OVER 2SWAP >R ?DUP DROP DUP OVER R> R@ ROT +syn keyword forthStack SWAP + " extension words +syn keyword forthStack NIP PICK ROLL TUCK +syn keyword forthRStack 2>R 2R> 2R@ -" address operations -syn keyword forthMemory @ ! +! C@ C! 2@ 2! F@ F! SF@ SF! DF@ DF! -syn keyword forthAdrArith CHARS CHAR+ CELLS CELL+ CELL ALIGN ALIGNED FLOATS -syn keyword forthAdrArith FLOAT+ FLOAT FALIGN FALIGNED SFLOATS SFLOAT+ -syn keyword forthAdrArith SFALIGN SFALIGNED DFLOATS DFLOAT+ DFALIGN DFALIGNED -syn keyword forthAdrArith MAXALIGN MAXALIGNED CFALIGN CFALIGNED -syn keyword forthAdrArith ADDRESS-UNIT-BITS ALLOT ALLOCATE HERE -syn keyword forthMemBlks MOVE ERASE CMOVE CMOVE> FILL BLANK UNUSED +" non-standard stack manipulations +syn keyword forthStack -ROT 3DROP 3DUP 4-ROT 4DROP 4DUP 4ROT 4SWAP 4TUCK +syn keyword forthStack 5DROP 5DUP 8DROP 8DUP 8SWAP +syn keyword forthRStack 4>R 4R> 4R@ 4RDROP RDROP -" conditionals -syn keyword forthCond IF ELSE ENDIF THEN CASE OF ENDOF ENDCASE ?DUP-IF -syn keyword forthCond ?DUP-0=-IF AHEAD CS-PICK CS-ROLL CATCH THROW WITHIN +" stack pointer manipulations {{{2 +syn keyword forthSP DEPTH -" iterations -syn keyword forthLoop BEGIN WHILE REPEAT UNTIL AGAIN -syn keyword forthLoop ?DO LOOP I J K +DO U+DO -DO U-DO DO +LOOP -LOOP -syn keyword forthLoop UNLOOP LEAVE ?LEAVE EXIT DONE FOR NEXT RECURSE +" non-standard stack pointer manipulations +syn keyword forthSP FP! FP@ LP! LP@ RP! RP@ SP! SP@ -" new words -syn match forthClassDef '\<:class\s*[^ \t]\+\>' -syn match forthObjectDef '\<:object\s*[^ \t]\+\>' -syn match forthColonDef '\<:m\?\s*[^ \t]\+\>' -syn keyword forthEndOfColonDef ; ;M ;m -syn keyword forthEndOfClassDef ;class -syn keyword forthEndOfObjectDef ;object -syn keyword forthDefine CONSTANT 2CONSTANT FCONSTANT VARIABLE 2VARIABLE -syn keyword forthDefine FVARIABLE CREATE USER VALUE TO DEFER IS IMMEDIATE -syn keyword forthDefine COMPILE-ONLY COMPILE RESTRICT INTERPRET POSTPONE EXECUTE -syn keyword forthDefine LITERAL CREATE-INTERPRET/COMPILE INTERPRETATION> -syn keyword forthDefine INT NAME?INT NAME>COMP -syn keyword forthDefine NAME>STRING STATE C; CVARIABLE BUFFER: MARKER -syn keyword forthDefine , 2, F, C, COMPILE, -syn match forthDefine "\[DEFINED]" -syn match forthDefine "\[UNDEFINED]" -syn match forthDefine "\[IF]" -syn match forthDefine "\[IFDEF]" -syn match forthDefine "\[IFUNDEF]" -syn match forthDefine "\[THEN]" -syn match forthDefine "\[ENDIF]" -syn match forthDefine "\[ELSE]" -syn match forthDefine "\[?DO]" -syn match forthDefine "\[DO]" -syn match forthDefine "\[LOOP]" -syn match forthDefine "\[+LOOP]" -syn match forthDefine "\[NEXT]" -syn match forthDefine "\[BEGIN]" -syn match forthDefine "\[UNTIL]" -syn match forthDefine "\[AGAIN]" -syn match forthDefine "\[WHILE]" -syn match forthDefine "\[REPEAT]" -syn match forthDefine "\[COMP']" -syn match forthDefine "'" -syn match forthDefine '\<\[\>' -syn match forthDefine "\[']" -syn match forthDefine '\[COMPILE]' -syn match forthDefine '\[CHAR]' +" address operations {{{2 +syn keyword forthMemory ! +! 2! 2@ @ C! C@ +syn keyword forthAdrArith ALIGN ALIGNED ALLOT CELL+ CELLS CHAR+ CHARS +syn keyword forthMemBlks FILL MOVE + " extension words +syn keyword forthMemBlks ERASE UNUSED -" debugging -syn keyword forthDebug PRINTDEBUGDATA PRINTDEBUGLINE -syn match forthDebug "\<\~\~\>" +" non-standard address operations +syn keyword forthAdrArith ADDRESS-UNIT-BITS CELL CFALIGN CFALIGNED FLOAT +syn keyword forthAdrArith MAXALIGN MAXALIGNED -" Assembler -syn keyword forthAssembler ASSEMBLER CODE END-CODE ;CODE FLUSH-ICACHE C, +" conditionals {{{2 +syn keyword forthCond ELSE IF THEN + " extension words +syn keyword forthCond CASE ENDCASE ENDOF OF -" basic character operations -syn keyword forthCharOps (.) CHAR EXPECT FIND WORD TYPE -TRAILING EMIT KEY -syn keyword forthCharOps KEY? TIB CR BL COUNT SPACE SPACES -" recognize 'char (' or '[char] (' correctly, so it doesn't +" non-standard conditionals +syn keyword forthCond ?DUP-0=-IF ?DUP-IF ENDIF + +" iterations {{{2 +syn keyword forthLoop +LOOP BEGIN DO EXIT I J LEAVE LOOP RECURSE REPEAT UNLOOP +syn keyword forthLoop UNTIL WHILE + " extension words +syn keyword forthLoop ?DO AGAIN + +" non-standard iterations +syn keyword forthLoop +DO -DO -LOOP ?LEAVE DONE FOR K NEXT U+DO U-DO + +" new words {{{2 +syn match forthColonDef "\<:\s*[^ \t]\+\>" +syn keyword forthEndOfColonDef ; +syn keyword forthDefine ' , C, CONSTANT CREATE DOES> EXECUTE IMMEDIATE LITERAL +syn keyword forthDefine POSTPONE STATE VARIABLE ] +syn match forthDefine "\<\[']\>" +syn match forthDefine "\<\[\>" + " extension words +syn keyword forthColonDef :NONAME +syn keyword forthDefine BUFFER: COMPILE, DEFER IS MARKER TO VALUE +syn match forthDefine "\<\[COMPILE]\>" + " Forth-79, Forth-83 +syn keyword forthDefine COMPILE + +" non-standard new words +syn match forthClassDef "\<:CLASS\s*[^ \t]\+\>" +syn keyword forthEndOfClassDef ;CLASS +syn match forthObjectDef "\<:OBJECT\s*[^ \t]\+\>" +syn keyword forthEndOfObjectDef ;OBJECT +syn match forthColonDef "\<:M\s*[^ \t]\+\>" +syn keyword forthEndOfColonDef ;M +syn keyword forthDefine 2, COMPILE-ONLY CREATE-INTERPRET/COMPILE +syn keyword forthDefine CVARIABLE F, FIND-NAME INTERPRET INTERPRETATION> +syn keyword forthDefine LASTXT NAME>COMP NAME>INT NAME?INT POSTPONE, RESTRICT +syn keyword forthDefine USER +syn match forthDefine "\<\[COMP']\>" + +" basic character operations {{{2 +syn keyword forthCharOps BL COUNT CR EMIT FIND KEY SPACE SPACES TYPE WORD +" recognize 'char (' or '[CHAR] (' correctly, so it doesn't " highlight everything after the paren as a comment till a closing ')' -syn match forthCharOps '\ #>> #S (NUMBER) (NUMBER?) CONVERT D>F -syn keyword forthConversion D>S DIGIT DPL F>D HLD HOLD NUMBER S>D SIGN >NUMBER -syn keyword forthConversion F>S S>F HOLDS +" non-standard basic character operations +syn keyword forthCharOps (.) -" interpreter, wordbook, compiler -syn keyword forthForth (LOCAL) BYE COLD ABORT >BODY >NEXT >LINK CFA >VIEW HERE -syn keyword forthForth PAD WORDS VIEW VIEW> N>LINK NAME> LINK> L>NAME FORGET -syn keyword forthForth BODY> ASSERT( ASSERT0( ASSERT1( ASSERT2( ASSERT3( ) -syn keyword forthForth >IN ACCEPT ENVIRONMENT? EVALUATE QUIT SOURCE ACTION-OF -syn keyword forthForth DEFER! DEFER@ PARSE PARSE-NAME REFILL RESTORE-INPUT -syn keyword forthForth SAVE-INPUT SOURCE-ID -syn region forthForth start=+ABORT"\s+ skip=+\\"+ end=+"+ +" char-number conversion {{{2 +syn keyword forthConversion # #> #S <# >NUMBER HOLD S>D SIGN + " extension words +syn keyword forthConversion HOLDS + " Forth-79, Forth-83, Forth-93 +syn keyword forthConversion CONVERT -" vocabularies -syn keyword forthVocs ONLY FORTH ALSO ROOT SEAL VOCS ORDER CONTEXT #VOCS -syn keyword forthVocs VOCABULARY DEFINITIONS +" non-standard char-number conversion +syn keyword forthConversion #>> (NUMBER) (NUMBER?) <<# DIGIT DPL HLD NUMBER -" File keywords -syn keyword forthFileMode R/O R/W W/O BIN -syn keyword forthFileWords OPEN-FILE CREATE-FILE CLOSE-FILE DELETE-FILE -syn keyword forthFileWords RENAME-FILE READ-FILE READ-LINE KEY-FILE -syn keyword forthFileWords KEY?-FILE WRITE-FILE WRITE-LINE EMIT-FILE -syn keyword forthFileWords FLUSH-FILE FILE-STATUS FILE-POSITION -syn keyword forthFileWords REPOSITION-FILE FILE-SIZE RESIZE-FILE -syn keyword forthFileWords SLURP-FILE SLURP-FID STDIN STDOUT STDERR -syn keyword forthFileWords INCLUDE-FILE INCLUDED REQUIRED -syn keyword forthBlocks OPEN-BLOCKS USE LOAD --> BLOCK-OFFSET -syn keyword forthBlocks GET-BLOCK-FID BLOCK-POSITION LIST SCR BLOCK -syn keyword forthBlocks BUFER EMPTY-BUFFERS EMPTY-BUFFER UPDATE UPDATED? -syn keyword forthBlocks SAVE-BUFFERS SAVE-BUFFER FLUSH THRU +LOAD +THRU -syn keyword forthBlocks BLOCK-INCLUDED BLK +" interpreter, wordbook, compiler {{{2 +syn keyword forthForth >BODY >IN ACCEPT ENVIRONMENT? EVALUATE HERE QUIT SOURCE + " extension words +syn keyword forthForth ACTION-OF DEFER! DEFER@ PAD PARSE PARSE-NAME REFILL +syn keyword forthForth RESTORE-INPUT SAVE-INPUT SOURCE-ID + " Forth-79 +syn keyword forthForth 79-STANDARD + " Forth-83 +syn keyword forthForth MARK >RESOLVE ?BRANCH BRANCH FORTH-83 + " Forth-79, Forth-83, Forth-94 +syn keyword forthForth QUERY + " Forth-83, Forth-94 +syn keyword forthForth SPAN -" numbers -syn keyword forthMath DECIMAL HEX BASE -syn match forthInteger '\<-\=[0-9]\+.\=\>' -syn match forthInteger '\<&-\=[0-9]\+.\=\>' -syn match forthInteger '\<#-\=[0-9]\+.\=\>' -" recognize hex and binary numbers, the '$' and '%' notation is for gforth -syn match forthInteger '\<\$\x*\x\+\>' " *1* --- don't mess -syn match forthInteger '\<\x*\d\x*\>' " *2* --- this order! -syn match forthInteger '\<%[0-1]*[0-1]\+\>' -syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe]\d\+\>' -syn match forthFloat '\<-\=\d*[.]\=\d\+[DdEe][-+]\d\+\>' +" non-standard interpreter, wordbook, compiler +syn keyword forthForth ) >LINK >NEXT >VIEW ASSERT( ASSERT0( ASSERT1( ASSERT2( +syn keyword forthForth ASSERT3( BODY> CFA COLD L>NAME LINK> N>LINK NAME> VIEW +syn keyword forthForth VIEW> -" XXX If you find this overkill you can remove it. this has to come after the -" highlighting for numbers otherwise it has no effect. -syn region forthComment start='0 \[if\]' end='\[endif\]' end='\[then\]' contains=forthTodo +" booleans {{{2 + " extension words +syn match forthBoolean "\<\%(TRUE\|FALSE\)\>" -" Strings -syn region forthString start=+\.*\"+ end=+"+ end=+$+ contains=@Spell -" XXX -syn region forthString start=+s\"+ end=+"+ end=+$+ contains=@Spell -syn region forthString start=+s\\\"+ end=+"+ end=+$+ contains=@Spell -syn region forthString start=+c\"+ end=+"+ end=+$+ contains=@Spell +" numbers {{{2 +syn keyword forthMath BASE DECIMAL + " extension words +syn keyword forthMath HEX +syn match forthInteger '\<-\=\d\+\.\=\>' +syn match forthInteger '\<#-\=\d\+\.\=\>' +syn match forthInteger '\<\$-\=\x\+\.\=\>' +syn match forthInteger '\<%-\=[01]\+\.\=\>' -" Comments -syn match forthComment '\\\%(\s.*\)\=$' contains=@Spell,forthTodo,forthSpaceError -syn region forthComment start='\\S\s' end='.*' contains=@Spell,forthTodo,forthSpaceError -syn match forthComment '\.(\s[^)]*)' contains=@Spell,forthTodo,forthSpaceError -syn region forthComment start='\(^\|\s\)\zs(\s' skip='\\)' end=')' contains=@Spell,forthTodo,forthSpaceError -syn region forthComment start='/\*' end='\*/' contains=@Spell,forthTodo,forthSpaceError +" characters {{{2 +syn match forthCharacter "'\k'" -" Include files -syn match forthInclude '^INCLUDE\s\+\k\+' -syn match forthInclude '^REQUIRE\s\+\k\+' +" strings {{{2 + +" Words that end with " are assumed to start string parsing. +" This includes standard words: S" ." +syn region forthString matchgroup=forthString start=+\<\S\+"\s+ end=+"+ end=+$+ contains=@Spell + " extension words +syn region forthString matchgroup=forthString start=+\\|:\@=\)" + +" XXX If you find this overkill you can remove it. This has to come after the +" highlighting for numbers and booleans otherwise it has no effect. +syn region forthComment start='\<\%(0\|FALSE\)\s\+\[IF]' end='\<\[ENDIF]' end='\<\[THEN]' contains=forthTodo + +if get(g:, "forth_no_comment_fold", 0) + syn region forthComment start='\<(\>' end=')' contains=@Spell,forthTodo,forthSpaceError + " extension words + syn match forthComment '\<\\\>.*$' contains=@Spell,forthTodo,forthSpaceError +else + syn region forthComment start='\<(\>' end=')' contains=@Spell,forthTodo,forthSpaceError fold + " extension words + syn match forthComment '\<\\\>.*$' contains=@Spell,forthTodo,forthSpaceError + syn region forthMultilineComment start="^\s*\\\>" end="\n\%(\s*\\\>\)\@!" contains=forthComment transparent fold +endif + + " extension words +syn region forthComment start='\<\.(\>' end=')' end='$' contains=@Spell,forthTodo,forthSpaceError + +" ABORT {{{2 +syn keyword forthForth ABORT +syn region forthForth start=+\+ end=+$+ + +" The optional Block word set {{{1 +" Handled as Core words - REFILL +syn keyword forthBlocks BLK BLOCK BUFFER FLUSH LOAD SAVE-BUFFERS UPDATE + " extension words +syn keyword forthBlocks EMPTY-BUFFERS LIST SCR THRU + +" Non-standard Block words +syn keyword forthBlocks +LOAD +THRU --> BLOCK-INCLUDED BLOCK-OFFSET +syn keyword forthBlocks BLOCK-POSITION EMPTY-BUFFER GET-BLOCK-FID OPEN-BLOCKS +syn keyword forthBlocks SAVE-BUFFER UPDATED? USE + +" The optional Double-Number word set {{{1 +syn keyword forthConversion D>S +syn keyword forthDefine 2CONSTANT 2LITERAL 2VARIABLE +syn keyword forthFunction D. D.R +syn keyword forthOperators D+ D- D0= D2* D2/ D= DABS DMAX DMIN DNEGATE +syn keyword forthOperators D0< D< M+ M*/ + " extension words +syn keyword forthDefine 2VALUE +syn keyword forthOperators DU< +syn keyword forthStack 2ROT + +" Non-standard Double-Number words +syn keyword forthOperators D0<= D0<> D0> D0>= D<= D<> D> D>= DU<= DU> DU>= +syn keyword forthStack 2-ROT 2NIP 2RDROP 2TUCK + +" The optional Exception word set {{{1 +" Handled as Core words - ABORT ABORT" +syn keyword forthCond CATCH THROW + +" The optional Facility word set {{{1 +syn keyword forthCharOps AT-XY KEY? PAGE + " extension words +syn keyword forthCharOps EKEY EKEY>CHAR EKEY>FKEY EKEY? EMIT? K-ALT-MASK +syn keyword forthCharOps K-CTRL-MASK K-DELETE K-DOWN K-END K-F1 K-F10 K-F11 +syn keyword forthCharOps K-F12 K-F2 K-F3 K-F4 K-F5 K-F6 K-F7 K-F8 K-F9 K-HOME +syn keyword forthCharOps K-INSERT K-LEFT K-NEXT K-PRIOR K-RIGHT K-SHIFT-MASK +syn keyword forthCharOps K-UP +syn keyword forthDefine +FIELD BEGIN-STRUCTURE CFIELD: END-STRUCTURE FIELD: +syn keyword forthForth MS TIME&DATE + +" The optional File-Access word set {{{1 +" Handled as Core words - REFILL SOURCE-ID S\" S" ( +syn keyword forthFileMode BIN R/O R/W W/O +syn keyword forthFileWords CLOSE-FILE CREATE-FILE DELETE-FILE FILE-POSITION +syn keyword forthFileWords FILE-SIZE INCLUDE-FILE INCLUDED OPEN-FILE READ-FILE +syn keyword forthFileWords READ-LINE REPOSITION-FILE RESIZE-FILE WRITE-FILE +syn keyword forthFileWords WRITE-LINE + " extension words +syn keyword forthFileWords FILE-STATUS FLUSH-FILE RENAME-FILE REQUIRED +syn match forthInclude '\' + +syn keyword forthConversion >FLOAT D>F F>D +syn keyword forthAdrArith FALIGN FALIGNED FLOAT+ FLOATS +syn keyword forthDefine FCONSTANT FLITERAL FVARIABLE +syn keyword forthFStack FDROP FDUP FOVER FROT FSWAP +syn keyword forthFunction REPRESENT +syn keyword forthMemory F! F@ +syn keyword forthOperators F* F+ F- F/ F0< F0= F< FLOOR FMAX FMIN FNEGATE +syn keyword forthOperators FROUND +syn keyword forthSP FDEPTH + " extension words +syn keyword forthConversion F>S S>F +syn keyword forthAdrArith DFALIGN DFALIGNED DFLOAT+ DFLOATS SFALIGN +syn keyword forthAdrArith SFALIGNED SFLOAT+ SFLOATS +syn keyword forthDefine DFFIELD: FFIELD: FVALUE SFFIELD: +syn keyword forthFunction F. FE. FS. PRECISION SET-PRECISION +syn keyword forthMemory DF! DF@ SF! SF@ +syn keyword forthOperators F** FABS FACOS FACOSH FALOG FASIN FASINH FATAN +syn keyword forthOperators FATAN2 FATANH FCOS FCOSH FEXP FEXPM1 FLN FLNP1 +syn keyword forthOperators FLOG FSIN FSINCOS FSINH FSQRT FTAN FTANH FTRUNC F~ + +" Non-standard Floating-Point words +syn keyword forthOperators 1/F F2* F2/ F~ABS F~REL +syn keyword forthFStack FNIP FTUCK + +" The optional Locals word set {{{1 +syn keyword forthForth (LOCAL) + " extension words +syn region forthLocals start="\<{:\>" end="\<:}\>" +syn region forthLocals start="\" end="\<|\>" + +" Non-standard Locals words +syn region forthLocals start="\<{\>" end="\<}\>" + +" The optional Memory-Allocation word set {{{1 +syn keyword forthMemory ALLOCATE FREE RESIZE + +" The optional Programming-Tools wordset {{{1 +syn keyword forthDebug .S ? DUMP SEE WORDS + " extension words +syn keyword forthAssembler ;CODE ASSEMBLER CODE END-CODE +syn keyword forthCond AHEAD CS-PICK CS-ROLL +syn keyword forthDefine NAME>COMPILE NAME>INTERPRET NAME>STRING SYNONYM +syn keyword forthDefine TRAVERSE-WORDLIST +syn match forthDefine "\<\[DEFINED]\>" +syn match forthDefine "\<\[ELSE]\>" +syn match forthDefine "\<\[IF]\>" +syn match forthDefine "\<\[THEN]\>" +syn match forthDefine "\<\[UNDEFINED]\>" +syn keyword forthForth BYE FORGET +syn keyword forthStack N>R NR> +syn keyword forthVocs EDITOR + +" Non-standard Programming-Tools words +syn keyword forthAssembler FLUSH-ICACHE +syn keyword forthDebug PRINTDEBUGDATA PRINTDEBUGLINE +syn match forthDebug "\<\~\~\>" +syn match forthDefine "\<\[+LOOP]\>" +syn match forthDefine "\<\[?DO]\>" +syn match forthDefine "\<\[AGAIN]\>" +syn match forthDefine "\<\[BEGIN]\>" +syn match forthDefine "\<\[DO]\>" +syn match forthDefine "\<\[ENDIF]\>" +syn match forthDefine "\<\[IFDEF]\>" +syn match forthDefine "\<\[IFUNDEF]\>" +syn match forthDefine "\<\[LOOP]\>" +syn match forthDefine "\<\[NEXT]\>" +syn match forthDefine "\<\[REPEAT]\>" +syn match forthDefine "\<\[UNTIL]\>" +syn match forthDefine "\<\[WHILE]\>" + +" The optional Search-Order word set {{{1 +" Handled as Core words - FIND +syn keyword forthVocs DEFINITIONS FORTH-WORDLIST GET-CURRENT GET-ORDER +syn keyword forthVocs SEARCH-WORDLIST SET-CURRENT SET-ORDER WORDLIST + " extension words +syn keyword forthVocs ALSO FORTH ONLY ORDER PREVIOUS + " Forth-79, Forth-83 +syn keyword forthVocs CONTEXT CURRENT VOCABULARY + +" Non-standard Search-Order words +syn keyword forthVocs #VOCS ROOT SEAL VOCS + +" The optional String word set {{{1 +syn keyword forthFunction -TRAILING /STRING BLANK CMOVE CMOVE> COMPARE SEARCH +syn keyword forthFunction SLITERAL + " extension words +syn keyword forthFunction REPLACES SUBSTITUTE UNESCAPE + +" The optional Extended-Character word set {{{1 +" Handled as Core words - [CHAR] CHAR and PARSE +syn keyword forthAdrArith XCHAR+ +syn keyword forthCharOps X-SIZE XC-SIZE XEMIT XKEY XKEY? +syn keyword forthDefine XC, +syn keyword forthMemory XC!+ XC!+? XC@+ + " extension words +syn keyword forthAdrArith XCHAR- +X/STRING X\\STRING- +syn keyword forthCharOps EKEY>XCHAR X-WIDTH XC-WIDTH +syn keyword forthConversion XHOLD +syn keyword forthString -TRAILING-GARBAGE + +" Define the default highlighting {{{1 +hi def link forthBoolean Boolean +hi def link forthCharacter Character hi def link forthTodo Todo hi def link forthOperators Operator hi def link forthMath Number @@ -243,6 +430,7 @@ hi def link forthCharOps Character hi def link forthConversion String hi def link forthForth Statement hi def link forthVocs Statement +hi def link forthEscape Special hi def link forthString String hi def link forthComment Comment hi def link forthClassDef Define @@ -251,16 +439,17 @@ hi def link forthObjectDef Define hi def link forthEndOfObjectDef Define hi def link forthInclude Include hi def link forthLocals Type " nothing else uses type and locals must stand out -hi def link forthDeprecated Error " if you must, change to Type hi def link forthFileMode Function hi def link forthFunction Function hi def link forthFileWords Statement hi def link forthBlocks Statement hi def link forthSpaceError Error +"}}} let b:current_syntax = "forth" let &cpo = s:cpo_save unlet s:cpo_save -" vim:ts=8:sw=4:nocindent:smartindent: + +" vim:ts=8:sw=4:nocindent:smartindent:fdm=marker:tw=78 diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim index c820ba40a9..c15b96de6f 100644 --- a/runtime/syntax/gdb.vim +++ b/runtime/syntax/gdb.vim @@ -30,7 +30,7 @@ syn keyword gdbStatement contained search section set sharedlibrary shell show s syn keyword gdbStatement contained stop target tbreak tdump tfind thbreak thread tp trace tstart tstatus tstop syn keyword gdbStatement contained tty und[isplay] unset until up watch whatis where while ws x syn match gdbFuncDef "\.*" -syn match gdbStatmentContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef +syn match gdbStatementContainer "^\s*\S\+" contains=gdbStatement,gdbFuncDef syn match gdbStatement "^\s*info" nextgroup=gdbInfo skipwhite skipempty " some commonly used abbreviations diff --git a/runtime/syntax/go.vim b/runtime/syntax/go.vim index bf967fdcd9..4272e807f3 100644 --- a/runtime/syntax/go.vim +++ b/runtime/syntax/go.vim @@ -5,7 +5,7 @@ " go.vim: Vim syntax file for Go. " Language: Go " Maintainer: Billie Cleek -" Latest Revision: 2023-02-19 +" Latest Revision: 2023-08-21 " License: BSD-style. See LICENSE file in source repository. " Repository: https://github.com/fatih/vim-go @@ -130,8 +130,8 @@ hi def link goFloats Type hi def link goComplexes Type " Predefined functions and values -syn keyword goBuiltins append cap close complex copy delete imag len -syn keyword goBuiltins make new panic print println real recover +syn keyword goBuiltins append cap clear close complex copy delete imag len +syn keyword goBuiltins make max min new panic print println real recover syn keyword goBoolean true false syn keyword goPredefinedIdentifiers nil iota diff --git a/runtime/syntax/gp.vim b/runtime/syntax/gp.vim index aecf7df48b..89f2d3f0ff 100644 --- a/runtime/syntax/gp.vim +++ b/runtime/syntax/gp.vim @@ -1,7 +1,7 @@ " Vim syntax file -" Language: gp (version 2.5) +" Language: gp (version 2.15) " Maintainer: Karim Belabas -" Last change: 2012 Jan 08 +" Last change: 2023 Aug 22 " URL: http://pari.math.u-bordeaux.fr " quit when a syntax file was already loaded @@ -14,23 +14,29 @@ set cpo&vim " control statements syntax keyword gpStatement break return next -syntax keyword gpConditional if -syntax keyword gpRepeat until while for fordiv forell forprime -syntax keyword gpRepeat forsubgroup forstep forvec +syntax keyword gpConditional if iferr +syntax keyword gpRepeat until while for forcomposite fordiv +syntax keyword gpRepeat fordivfactored foreach forell forfactored +syntax keyword gpRepeat forpart forperm forprime forprimestep forqfvec +syntax keyword gpRepeat forsquarefree forstep forsubgroup forsubset +syntax keyword gpRepeat forvec +syntax keyword gpRepeat parfor parforeach parforprime parforprimestep +syntax keyword gpRepeat parforvec " storage class -syntax keyword gpScope my local global +syntax keyword gpScope my local global export exportall " defaults syntax keyword gpInterfaceKey breakloop colors compatible -syntax keyword gpInterfaceKey datadir debug debugfiles debugmem -syntax keyword gpInterfaceKey echo factor_add_primes factor_proven format +syntax keyword gpInterfaceKey datadir debug debugfiles debugmem +syntax keyword gpInterfaceKey echo factor_add_primes factor_proven format syntax keyword gpInterfaceKey graphcolormap graphcolors -syntax keyword gpInterfaceKey help histfile histsize -syntax keyword gpInterfaceKey lines linewrap log logfile new_galois_format -syntax keyword gpInterfaceKey output parisize path prettyprinter primelimit -syntax keyword gpInterfaceKey prompt prompt_cont psfile -syntax keyword gpInterfaceKey readline realprecision recover -syntax keyword gpInterfaceKey secure seriesprecision simplify strictmatch -syntax keyword gpInterfaceKey TeXstyle timer +syntax keyword gpInterfaceKey help histfile histsize +syntax keyword gpInterfaceKey lines linewrap log logfile nbthreads +syntax keyword gpInterfaceKey new_galois_format output parisize parisizemax +syntax keyword gpInterfaceKey path plothsizes prettyprinter primelimit prompt +syntax keyword gpInterfaceKey prompt_cont psfile readline realbitprecision +syntax keyword gpInterfaceKey realprecision recover secure seriesprecision +syntax keyword gpInterfaceKey simplify sopath strictmatch TeXstyle +syntax keyword gpInterfaceKey threadsize threadsizemax timer syntax match gpInterface "^\s*\\[a-z].*" syntax keyword gpInterface default @@ -58,24 +64,23 @@ syntax region gpParen transparent start='(' end=')' contains=ALLBUT,gpParenErro syntax match gpParenError ")" syntax match gpInParen contained "[{}]" - -hi def link gpConditional Conditional +hi def link gpConditional Conditional hi def link gpRepeat Repeat hi def link gpError Error -hi def link gpParenError gpError +hi def link gpParenError gpError hi def link gpInParen gpError hi def link gpStatement Statement hi def link gpString String hi def link gpComment Comment hi def link gpInterface Type hi def link gpInput Type -hi def link gpInterfaceKey Statement +hi def link gpInterfaceKey Statement hi def link gpFunction Function hi def link gpScope Type " contained ones hi def link gpSpecial Special -hi def link gpTodo Todo -hi def link gpArgs Type +hi def link gpTodo Todo +hi def link gpArgs Type let b:current_syntax = "gp" let &cpo = s:cpo_save diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim index 41495e6682..e48279bd1a 100644 --- a/runtime/syntax/groovy.vim +++ b/runtime/syntax/groovy.vim @@ -362,7 +362,7 @@ exec "syn sync ccomment groovyComment minlines=" . groovy_minlines " Mark these as operators -" Hightlight brackets +" Highlight brackets " syn match groovyBraces "[{}]" " syn match groovyBraces "[\[\]]" " syn match groovyBraces "[\|]" diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim index a8d26892d4..f6e41e7e18 100644 --- a/runtime/syntax/lite.vim +++ b/runtime/syntax/lite.vim @@ -5,7 +5,7 @@ " Email: Subject: send syntax_vim.tgz " Last Change: 2001 Mai 01 " -" Options lite_sql_query = 1 for SQL syntax highligthing inside strings +" Options lite_sql_query = 1 for SQL syntax highlighting inside strings " lite_minlines = x to sync at least x lines backwards " quit when a syntax file was already loaded diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim index a7fe9ce925..bc70ef41b4 100644 --- a/runtime/syntax/logtalk.vim +++ b/runtime/syntax/logtalk.vim @@ -330,7 +330,7 @@ syn match logtalkKeyword "\ " very basic things only (based on the vgrindefs file). -" If you use this language, please improve it, and send me the patches! +" If you use this language, please improve it, and send patches! " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") diff --git a/runtime/syntax/pymanifest.vim b/runtime/syntax/pymanifest.vim index 54295c45dc..26bdf797e0 100644 --- a/runtime/syntax/pymanifest.vim +++ b/runtime/syntax/pymanifest.vim @@ -20,7 +20,7 @@ syn match pymanifestComment /\\\@1/ nextgroup=@typescript syntax match typescriptNumber /\<0[oO][0-7][0-7_]*\>/ nextgroup=@typescriptSymbols skipwhite skipempty syntax match typescriptNumber /\<0[xX][0-9a-fA-F][0-9a-fA-F_]*\>/ nextgroup=@typescriptSymbols skipwhite skipempty syntax match typescriptNumber /\<\%(\d[0-9_]*\%(\.\d[0-9_]*\)\=\|\.\d[0-9_]*\)\%([eE][+-]\=\d[0-9_]*\)\=\>/ - \ nextgroup=typescriptSymbols skipwhite skipempty + \ nextgroup=@typescriptSymbols skipwhite skipempty syntax region typescriptObjectLiteral matchgroup=typescriptBraces \ start=/{/ end=/}/ diff --git a/runtime/syntax/slrnrc.vim b/runtime/syntax/slrnrc.vim index cf0734ae85..004bdd1bb1 100644 --- a/runtime/syntax/slrnrc.vim +++ b/runtime/syntax/slrnrc.vim @@ -94,7 +94,7 @@ syn region slrnrcColorObjStr contained matchgroup=slrnrcColorObj start=+"+ end= syn keyword slrnrcColorVal contained default syn keyword slrnrcColorVal contained black blue brightblue brightcyan brightgreen brightmagenta brightred brown cyan gray green lightgray magenta red white yellow syn region slrnrcColorValStr contained matchgroup=slrnrcColorVal start=+"+ end=+"+ oneline contains=slrnrcColorVal,slrnrcSpaceError -" Mathcing a function with three arguments +" Matching a function with three arguments syn keyword slrnrcColor contained color syn match slrnrcColorInit contained "^\s*color\s\+\S\+" skipwhite nextgroup=slrnrcColorVal\(Str\)\= contains=slrnrcColor\(Obj\|ObjStr\)\= syn match slrnrcColorLine "^\s*color\s\+\S\+\s\+\S\+" skipwhite nextgroup=slrnrcColorVal\(Str\)\= contains=slrnrcColor\(Init\|Val\|ValStr\) diff --git a/runtime/syntax/solidity.vim b/runtime/syntax/solidity.vim index e552446e10..a46d041a10 100644 --- a/runtime/syntax/solidity.vim +++ b/runtime/syntax/solidity.vim @@ -1,10 +1,10 @@ " Vim syntax file -" Language: Solidity -" Maintainer: Cothi (jiungdev@gmail.com) -" Original Author: tomlion (https://github.com/tomlion/vim-solidity/blob/master/syntax/solidity.vim) -" Last Changed: 2022 Sep 27 +" Language: Solidity +" Maintainer: Cothi (jiungdev@gmail.com) +" Original Author: tomlion (https://github.com/tomlion/vim-solidity/blob/master/syntax/solidity.vim) +" Last Change: 2022 Sep 27 " -" Additional contributors: +" Contributors: " Modified by thesis (https://github.com/thesis/vim-solidity/blob/main/indent/solidity.vim) if exists("b:current_syntax") diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim index d7d5877943..aed04bc900 100644 --- a/runtime/syntax/spec.vim +++ b/runtime/syntax/spec.vim @@ -56,7 +56,7 @@ syn match specListedFilesEtc contained '/etc/'me=e-1 syn match specListedFilesShare contained '/share/'me=e-1 syn cluster specListedFiles contains=specListedFilesBin,specListedFilesLib,specListedFilesDoc,specListedFilesEtc,specListedFilesShare,specListedFilesPrefix,specVariables,specSpecialChar -"specComands +"specCommands syn match specConfigure contained '\./configure' syn match specTarCommand contained '\' "valid options for certain section headers diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim index e01912bc40..71418c556f 100644 --- a/runtime/syntax/sqlinformix.vim +++ b/runtime/syntax/sqlinformix.vim @@ -162,7 +162,7 @@ hi def link sqlNumber Number hi def link sqlBoolean Boolean hi def link sqlString String -" === Statment syntax group === +" === Statement syntax group === hi def link sqlStatement Statement hi def link sqlConditional Conditional hi def link sqlRepeat Repeat diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim index c901145c3c..fd0f8f3d76 100644 --- a/runtime/syntax/sqlj.vim +++ b/runtime/syntax/sqlj.vim @@ -16,7 +16,7 @@ endif " Read the Java syntax to start with source :p:h/java.vim -" SQLJ extentions +" SQLJ extensions " The SQL reserved words, defined as keywords. syn case ignore diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim index a8abd180a0..186be91e61 100644 --- a/runtime/syntax/squid.vim +++ b/runtime/syntax/squid.vim @@ -31,7 +31,7 @@ syn keyword squidConf cache_effective_user cache_host cache_host_acl syn keyword squidConf cache_host_domain cache_log cache_mem syn keyword squidConf cache_mem_high cache_mem_low cache_mgr syn keyword squidConf cachemgr_passwd cache_peer cache_peer_access -syn keyword squidConf cahce_replacement_policy cache_stoplist +syn keyword squidConf cache_replacement_policy cache_stoplist syn keyword squidConf cache_stoplist_pattern cache_store_log cache_swap syn keyword squidConf cache_swap_high cache_swap_log cache_swap_low syn keyword squidConf client_db client_lifetime client_netmask diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim index 1d6e570752..b8b5e6992b 100644 --- a/runtime/syntax/tasm.vim +++ b/runtime/syntax/tasm.vim @@ -1,6 +1,6 @@ " Vim syntax file " Language: TASM: turbo assembler by Borland -" Maintaner: FooLman of United Force +" Maintainer: FooLman of United Force " Last Change: 2012 Feb 03 by Thilo Six, and 2018 Nov 27. " quit when a syntax file was already loaded diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim index 47775b8637..df6adcf819 100644 --- a/runtime/syntax/tf.vim +++ b/runtime/syntax/tf.vim @@ -27,7 +27,7 @@ syn keyword tfVar bamf bg_output borg clearfull cleardone clock connect contai syn keyword tfVar emulation end_color gag gethostbyname gpri hook hilite contained syn keyword tfVar hiliteattr histsize hpri insert isize istrip kecho contained syn keyword tfVar kprefix login lp lpquote maildelay matching max_iter contained -syn keyword tfVar max_recur mecho more mprefix oldslash promt_sec contained +syn keyword tfVar max_recur mecho more mprefix oldslash prompt_sec contained syn keyword tfVar prompt_usec proxy_host proxy_port ptime qecho qprefix contained syn keyword tfVar quite quitdone redef refreshtime scroll shpause snarf sockmload contained syn keyword tfVar start_color tabsize telopt sub time_format visual contained diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim index 8dd2a24df9..6f74ad2eb3 100644 --- a/runtime/syntax/tsalt.vim +++ b/runtime/syntax/tsalt.vim @@ -83,11 +83,11 @@ syn keyword tsaltFunction vGetChrs vGetChrsA vPutChr vPutChrs syn keyword tsaltFunction vPutChrsA vRstrArea vSaveArea " Dynamic Data Exchange (DDE) Operations -syn keyword tsaltFunction DDEExecute DDEInitate DDEPoke DDERequest +syn keyword tsaltFunction DDEExecute DDEInitiate DDEPoke DDERequest syn keyword tsaltFunction DDETerminate DDETerminateAll "END FUNCTIONS -"PREDEFINED VARAIABLES +"PREDEFINED VARIABLES syn keyword tsaltSysVar _add_lf _alarm_on _answerback_str _asc_rcrtrans syn keyword tsaltSysVar _asc_remabort _asc_rlftrans _asc_scpacing syn keyword tsaltSysVar _asc_scrtrans _asc_secho _asc_slpacing @@ -106,7 +106,7 @@ syn keyword tsaltSysVar _scr_chk_key _script_dir _sound_on syn keyword tsaltSysVar _strip_high _swap_bs _telix_dir _up_dir syn keyword tsaltSysVar _usage_fname _zmodauto _zmod_rcrash syn keyword tsaltSysVar _zmod_scrash -"END PREDEFINED VARAIABLES +"END PREDEFINED VARIABLES "TYPE syn keyword tsaltType str int diff --git a/runtime/syntax/typescript.vim b/runtime/syntax/typescript.vim index af71938a8e..5389c21497 100644 --- a/runtime/syntax/typescript.vim +++ b/runtime/syntax/typescript.vim @@ -1,9 +1,9 @@ " Vim syntax file " Language: TypeScript -" Maintainer: Bram Moolenaar, Herrington Darkholme -" Last Change: 2019 Nov 30 +" Maintainer: Herrington Darkholme +" Last Change: 2023 Aug 13 " Based On: Herrington Darkholme's yats.vim -" Changes: Go to https:github.com/HerringtonDarkholme/yats.vim for recent changes. +" Changes: Go to https://github.com/HerringtonDarkholme/yats.vim for recent changes. " Origin: https://github.com/othree/yajs " Credits: Kao Wei-Ko(othree), Jose Elera Campana, Zhao Yi, Claudio Fleiner, Scott Shattuck " (This file is based on their hard work), gumnos (From the #vim diff --git a/runtime/syntax/typescriptreact.vim b/runtime/syntax/typescriptreact.vim index c4c2d45745..1c510459f5 100644 --- a/runtime/syntax/typescriptreact.vim +++ b/runtime/syntax/typescriptreact.vim @@ -1,9 +1,9 @@ " Vim syntax file " Language: TypeScript with React (JSX) -" Maintainer: Bram Moolenaar -" Last Change: 2019 Nov 30 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 13 " Based On: Herrington Darkholme's yats.vim -" Changes: See https:github.com/HerringtonDarkholme/yats.vim +" Changes: See https://github.com/HerringtonDarkholme/yats.vim " Credits: See yats.vim on github if !exists("main_syntax") diff --git a/runtime/syntax/zimbu.vim b/runtime/syntax/zimbu.vim index 1a7a485e6f..472559520e 100644 --- a/runtime/syntax/zimbu.vim +++ b/runtime/syntax/zimbu.vim @@ -1,7 +1,8 @@ " Vim syntax file " Language: Zimbu -" Maintainer: Bram Moolenaar -" Last Change: 2014 Nov 23 +" Maintainer: The·Vim·Project· +" Last Change: 2023 Aug 13 +" Note: Zimbu seems to be dead :( if exists("b:current_syntax") finish diff --git a/runtime/tutor/tutor.vim b/runtime/tutor/tutor.vim index dc6972486e..809fd1d126 100644 --- a/runtime/tutor/tutor.vim +++ b/runtime/tutor/tutor.vim @@ -1,7 +1,7 @@ " Vim tutor support file -" Author: Eduardo F. Amatria -" Maintainer: Bram Moolenaar -" Last Change: 2019 Nov 11 +" Author: Eduardo F. Amatria +" Maintainer: The·Vim·Project· +" Last Change: 2023 Aug 13 " This Vim script is used for detecting if a translation of the " tutor file exist, i.e., a tutor.xx file, where xx is the language. diff --git a/src/Makefile b/src/Makefile index 48433c8bcb..6ee8403101 100644 --- a/src/Makefile +++ b/src/Makefile @@ -627,7 +627,7 @@ CClink = $(CC) #EXTRA_LIBS = /usr/local/lib/libefence.a # Autoconf binary. -AUTOCONF = autoconf +AUTOCONF ?= autoconf # PURIFY - remove the # to use the "purify" program (hoi Nia++!) #PURIFY = purify @@ -2033,9 +2033,6 @@ reconfig: scratch clean # - Use sed to change ./config.log to auto/config.log in the configure script. # Autoconf 2.5x (2.59 at least) produces a few more files that we need to take # care of: -# - configure.lineno: has the line numbers replaced with $LINENO. That -# improves patches a LOT, thus use it instead (until someone says it doesn't -# work on some system). # - autom4te.cache directory is created and not cleaned up. Delete it. # - Uses ">config.log" instead of "./config.log". autoconf: diff --git a/src/auto/configure b/src/auto/configure index 803269aff7..65fc9b7450 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -1,9 +1,10 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69. +# Generated by GNU Autoconf 2.71. # # -# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, +# Inc. # # # This configure script is free software; the Free Software Foundation @@ -14,14 +15,16 @@ # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -31,46 +34,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -79,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -94,8 +90,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -107,30 +107,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # Use a proper internal environment variable to ensure we don't fall # into an infinite loop, continuously re-executing ourselves. @@ -152,20 +132,22 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 -as_fn_exit 255 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi # We don't want this to propagate to other subprocesses. { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + as_bourne_compatible="as_nop=: +if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which # is contrary to our usage. Disable this feature. alias -g '\${1+\"\$@\"}'='\"\$@\"' setopt NO_GLOB_SUBST -else +else \$as_nop case \`(set -o) 2>/dev/null\` in #( *posix*) : set -o posix ;; #( @@ -185,42 +167,53 @@ as_fn_success || { exitcode=1; echo as_fn_success failed.; } as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : +if ( set x; as_fn_ret_success y && test x = \"\$1\" ) +then : -else +else \$as_nop exitcode=1; echo positional parameters were not saved. fi test x\$exitcode = x0 || exit 1 +blah=\$(echo \$(echo blah)) +test x\"\$blah\" = xblah || exit 1 test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : + if (eval "$as_required") 2>/dev/null +then : as_have_required=yes -else +else $as_nop as_have_required=no fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null +then : -else +else $as_nop as_save_IFS=$IFS; IFS=$PATH_SEPARATOR as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac as_found=: case $as_dir in #( /*) for as_base in sh bash ksh sh5; do # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base + as_shell=$as_dir$as_base if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null +then : break 2 fi fi @@ -228,14 +221,21 @@ fi esac as_found=false done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } IFS=$as_save_IFS +if $as_found +then : + +else $as_nop + if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null +then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi +fi - if test "x$CONFIG_SHELL" != x; then : + if test "x$CONFIG_SHELL" != x +then : export CONFIG_SHELL # We cannot yet assume a decent shell, so we have to provide a # neutralization value for shells without unset; and this also @@ -253,18 +253,19 @@ esac exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} # Admittedly, this is quite paranoid, since all the known shells bail # out after a failed `exec'. -$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2 exit 255 fi - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if test x$as_have_required = xno +then : + printf "%s\n" "$0: This script requires a shell more modern than all" + printf "%s\n" "$0: the shells that I found on your system." + if test ${ZSH_VERSION+y} ; then + printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should" + printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, + printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system, $0: including any error possibly output before this $0: message. Then install a modern shell, or manually run $0: the script under such a shell if you do have one." @@ -291,6 +292,7 @@ as_fn_unset () } as_unset=as_fn_unset + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -308,6 +310,14 @@ as_fn_exit () as_fn_set_status $1 exit $1 } # as_fn_exit +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_mkdir_p # ------------- @@ -322,7 +332,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -331,7 +341,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -370,12 +380,13 @@ as_fn_executable_p () # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -387,18 +398,27 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` } fi # as_fn_arith +# as_fn_nop +# --------- +# Do nothing but, unlike ":", preserve the value of $?. +as_fn_nop () +{ + return $? +} +as_nop=as_fn_nop # as_fn_error STATUS ERROR [LINENO LOG_FD] # ---------------------------------------- @@ -410,9 +430,9 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -439,7 +459,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -483,7 +503,7 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # If we had to re-execute with $CONFIG_SHELL, we're ensured to have # already done that, so ensure we don't try to do so again and fall @@ -497,6 +517,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits exit } + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -510,6 +534,13 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -575,50 +606,46 @@ MFLAGS= MAKEFLAGS= # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= -PACKAGE_URL= +PACKAGE_NAME='' +PACKAGE_TARNAME='' +PACKAGE_VERSION='' +PACKAGE_STRING='' +PACKAGE_BUGREPORT='' +PACKAGE_URL='' ac_unique_file="vim.h" # Factoring default headers for most tests. ac_includes_default="\ -#include -#ifdef HAVE_SYS_TYPES_H -# include +#include +#ifdef HAVE_STDIO_H +# include #endif -#ifdef HAVE_SYS_STAT_H -# include -#endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include -# include -#else -# ifdef HAVE_STDLIB_H -# include -# endif #endif #ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H -# include -# endif # include #endif -#ifdef HAVE_STRINGS_H -# include -#endif #ifdef HAVE_INTTYPES_H # include #endif #ifdef HAVE_STDINT_H # include #endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif #ifdef HAVE_UNISTD_H # include #endif" +ac_header_c_list= ac_subst_vars='LTLIBOBJS LIBOBJS LINK_AS_NEEDED @@ -765,6 +792,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -907,6 +935,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -936,8 +965,6 @@ do *) ac_optarg=yes ;; esac - # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in --) ac_dashdash=yes ;; @@ -978,9 +1005,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1004,9 +1031,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "enable_$ac_useropt" @@ -1159,6 +1186,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1208,9 +1244,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1224,9 +1260,9 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error $? "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: \`$ac_useropt'" ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in *" "with_$ac_useropt" @@ -1270,9 +1306,9 @@ Try \`$0 --help' for more information" *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; @@ -1288,7 +1324,7 @@ if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1296,7 +1332,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1352,7 +1388,7 @@ $as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_myself" : 'X\(//\)[^/]' \| \ X"$as_myself" : 'X\(//\)$' \| \ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | +printf "%s\n" X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1449,6 +1485,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1588,9 +1625,9 @@ if test "$ac_init_help" = "recursive"; then case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1618,7 +1655,8 @@ esac ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. + # Check for configure.gnu first; this name is used for a wrapper for + # Metaconfig's "Configure" on case-insensitive file systems. if test -f "$ac_srcdir/configure.gnu"; then echo && $SHELL "$ac_srcdir/configure.gnu" --help=recursive @@ -1626,7 +1664,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1636,9 +1674,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.69 +generated by GNU Autoconf 2.71 -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1655,14 +1693,14 @@ fi ac_fn_c_try_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext + rm -f conftest.$ac_objext conftest.beam if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1670,14 +1708,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest.$ac_objext; then : + } && test -s conftest.$ac_objext +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1699,7 +1738,7 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1707,14 +1746,15 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1730,14 +1770,14 @@ fi ac_fn_c_try_link () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext + rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext if { { ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>conftest.err ac_status=$? if test -s conftest.err; then @@ -1745,17 +1785,18 @@ $as_echo "$ac_try_echo"; } >&5 cat conftest.er1 >&5 mv -f conftest.er1 conftest.err fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || test -x conftest$ac_exeext - }; then : + } +then : ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 @@ -1772,8 +1813,8 @@ fi # ac_fn_c_try_run LINENO # ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. +# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that +# executables *can* be run. ac_fn_c_try_run () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack @@ -1783,25 +1824,26 @@ case "(($ac_try" in *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' { { case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 +printf "%s\n" "$ac_try_echo"; } >&5 (eval "$ac_try") 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; } +then : ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 +else $as_nop + printf "%s\n" "$as_me: program exited with status $ac_status" >&5 + printf "%s\n" "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status @@ -1812,93 +1854,6 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval \${$3+:} false; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.i conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_mongrel - # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists and can be compiled using the include files in @@ -1906,26 +1861,28 @@ fi ac_fn_c_check_header_compile () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 #include <$2> _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1936,11 +1893,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_check_func () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Define $2 to an innocuous variant, in case declares $2. @@ -1948,16 +1906,9 @@ else #define $2 innocuous_$2 /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif + which can conflict with char $2 (); below. */ +#include #undef $2 /* Override any GCC internal prototype to avoid an error. @@ -1975,24 +1926,25 @@ choke me #endif int -main () +main (void) { return $2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$3=yes" -else +else $as_nop eval "$3=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -2011,7 +1963,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= 0)]; test_array [0] = 0; @@ -2021,14 +1973,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=0 ac_mid=0 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2038,9 +1991,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid; break -else +else $as_nop as_fn_arith $ac_mid + 1 && ac_lo=$as_val if test $ac_lo -le $ac_mid; then ac_lo= ac_hi= @@ -2048,14 +2002,14 @@ else fi as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) < 0)]; test_array [0] = 0; @@ -2065,14 +2019,15 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=-1 ac_mid=-1 while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; test_array [0] = 0; @@ -2082,9 +2037,10 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_lo=$ac_mid; break -else +else $as_nop as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val if test $ac_mid -le $ac_hi; then ac_lo= ac_hi= @@ -2092,14 +2048,14 @@ else fi as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done -else +else $as_nop ac_lo= ac_hi= fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # Binary search between lo and hi bounds. while test "x$ac_lo" != "x$ac_hi"; do as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val @@ -2107,7 +2063,7 @@ while test "x$ac_lo" != "x$ac_hi"; do /* end confdefs.h. */ $4 int -main () +main (void) { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; test_array [0] = 0; @@ -2117,12 +2073,13 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_hi=$ac_mid -else +else $as_nop as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done case $ac_lo in #(( ?*) eval "$3=\$ac_lo"; ac_retval=0 ;; @@ -2132,12 +2089,12 @@ esac cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } +static long int longval (void) { return $2; } +static unsigned long int ulongval (void) { return $2; } #include #include int -main () +main (void) { FILE *f = fopen ("conftest.val", "w"); @@ -2165,9 +2122,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : echo >>conftest.val; read $3 &5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof ($2)) return 0; @@ -2205,12 +2164,13 @@ if (sizeof ($2)) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $4 int -main () +main (void) { if (sizeof (($2))) return 0; @@ -2218,18 +2178,19 @@ if (sizeof (($2))) return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : -else +else $as_nop eval "$3=yes" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -2241,11 +2202,12 @@ $as_echo "$ac_res" >&6; } ac_fn_c_find_uintX_t () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 -$as_echo_n "checking for uint$2_t... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5 +printf %s "checking for uint$2_t... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop eval "$3=no" # Order is important - never check a type that is potentially smaller # than half of the expected target width. @@ -2255,7 +2217,7 @@ else /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; test_array [0] = 0; @@ -2265,7 +2227,8 @@ return test_array [0]; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : case $ac_type in #( uint$2_t) : eval "$3=yes" ;; #( @@ -2273,28 +2236,49 @@ if ac_fn_c_try_compile "$LINENO"; then : eval "$3=\$ac_type" ;; esac fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if eval test \"x\$"$3"\" = x"no"; then : +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + if eval test \"x\$"$3"\" = x"no" +then : -else +else $as_nop break fi done fi eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_find_uintX_t +ac_configure_args_raw= +for ac_arg +do + case $ac_arg in + *\'*) + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + as_fn_append ac_configure_args_raw " '$ac_arg'" +done + +case $ac_configure_args_raw in + *$as_nl*) + ac_safe_unquote= ;; + *) + ac_unsafe_z='|&;<>()$`\\"*?[ '' ' # This string ends in space, tab. + ac_unsafe_a="$ac_unsafe_z#~" + ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g" + ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;; +esac + cat >auto/config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was - $ $0 $@ + $ $0$ac_configure_args_raw _ACEOF exec 5>>auto/config.log @@ -2327,8 +2311,12 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + printf "%s\n" "PATH: $as_dir" done IFS=$as_save_IFS @@ -2363,7 +2351,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; @@ -2398,11 +2386,13 @@ done # WARNING: Use '\'' to represent an apostrophe within the trap. # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. trap 'exit_status=$? + # Sanitize IFS. + IFS=" "" $as_nl" # Save into config.log some information that might help in debugging. { echo - $as_echo "## ---------------- ## + printf "%s\n" "## ---------------- ## ## Cache variables. ## ## ---------------- ##" echo @@ -2413,8 +2403,8 @@ trap 'exit_status=$? case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -2438,7 +2428,7 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - $as_echo "## ----------------- ## + printf "%s\n" "## ----------------- ## ## Output variables. ## ## ----------------- ##" echo @@ -2446,14 +2436,14 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo if test -n "$ac_subst_files"; then - $as_echo "## ------------------- ## + printf "%s\n" "## ------------------- ## ## File substitutions. ## ## ------------------- ##" echo @@ -2461,15 +2451,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - $as_echo "$ac_var='\''$ac_val'\''" + printf "%s\n" "$ac_var='\''$ac_val'\''" done | sort echo fi if test -s confdefs.h; then - $as_echo "## ----------- ## + printf "%s\n" "## ----------- ## ## confdefs.h. ## ## ----------- ##" echo @@ -2477,8 +2467,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + printf "%s\n" "$as_me: caught signal $ac_signal" + printf "%s\n" "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -2492,63 +2482,48 @@ ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h -$as_echo "/* confdefs.h */" > confdefs.h +printf "%s\n" "/* confdefs.h */" > confdefs.h # Predefined preprocessor variables. -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF +printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF +printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF +printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF +printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF +printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" -_ACEOF +printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - # We do not want a PATH search for config.site. - case $CONFIG_SITE in #(( - -*) ac_site_file1=./$CONFIG_SITE;; - */*) ac_site_file1=$CONFIG_SITE;; - *) ac_site_file1=./$CONFIG_SITE;; - esac + ac_site_files="$CONFIG_SITE" elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site + ac_site_files="$prefix/share/config.site $prefix/etc/config.site" else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site + ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" + +for ac_site_file in $ac_site_files do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} + case $ac_site_file in #( + */*) : + ;; #( + *) : + ac_site_file=./$ac_site_file ;; +esac + if test -f "$ac_site_file" && test -r "$ac_site_file"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 +printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" \ - || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file See \`config.log' for more details" "$LINENO" 5; } fi @@ -2558,832 +2533,34 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special files # actually), so we avoid doing that. DJGPP emulates it as a regular file. if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 +printf "%s\n" "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 +printf "%s\n" "$as_me: creating cache $cache_file" >&6;} >$cache_file fi -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -ac_config_headers="$ac_config_headers auto/config.h:config.h.in" - - -$as_echo "#define UNIX 1" >>confdefs.h - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } -set x ${MAKE-make} -ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.make <<\_ACEOF -SHELL = /bin/sh -all: - @echo '@@@%%%=$(MAKE)=@@@%%%' -_ACEOF -# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. -case `${MAKE-make} -f conftest.make 2>/dev/null` in - *@@@%%%=?*=@@@%%%*) - eval ac_cv_prog_make_${ac_make}_set=yes;; - *) - eval ac_cv_prog_make_${ac_make}_set=no;; -esac -rm -f conftest.make -fi -if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - SET_MAKE= -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - SET_MAKE="MAKE=${MAKE-make}" -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - fi -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl.exe -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - - test -n "$ac_ct_CC" && break -done - - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi -fi - -fi - - -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } - -# Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. - break;; - * ) - break;; - esac -done -test "$ac_cv_exeext" = no && ac_cv_exeext= - -else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -ac_exeext=$ac_cv_exeext - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - break;; - * ) break;; - esac -done -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if ${ac_cv_objext+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } -fi -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if ${ac_cv_c_compiler_gnu+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me +# Test code for whether the C compiler supports C89 (global declarations) +ac_c_conftest_c89_globals=' +/* Does the compiler advertise C89 conformance? + Do not test the value of __STDC__, because some compilers set it to 0 + while being otherwise adequately conformant. */ +#if !defined __STDC__ +# error "Compiler does not advertise C89 conformance" #endif - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes -else - ac_compiler_gnu=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if ${ac_cv_prog_cc_g+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ +#include #include -#include struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */ struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); +struct buf * (*rcsopen) (struct buf *, struct stat *, int); static char *e (p, i) char **p; int i; @@ -3401,87 +2578,47 @@ static char *f (char * (*g) (char **, int), char **p, ...) } /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + function prototypes and stuff, but not \xHH hex character constants. + These do not provoke an error unfortunately, instead are silently treated + as an "x". The following induces an error, until -std is added to get + proper ANSI mode. Curiously \x00 != x always comes out true, for an + array size at least. It is necessary to write \x00 == 0 to get something + that is true only with -std. */ +int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1]; /* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; +#define FOO(x) '\''x'\'' +int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1]; int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC +int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int), + int, int);' -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : +# Test code for whether the C compiler supports C89 (body of main). +ac_c_conftest_c89_main=' +ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]); +' -fi +# Test code for whether the C compiler supports C99 (global declarations) +ac_c_conftest_c99_globals=' +// Does the compiler advertise C99 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L +# error "Compiler does not advertise C99 conformance" +#endif -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include #include -#include -#include -#include +extern int puts (const char *); +extern int printf (const char *, ...); +extern int dprintf (int, const char *, ...); +extern void *malloc (size_t); // Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) +// dprintf is used instead of fprintf to avoid needing to declare +// FILE and stderr. +#define debug(...) dprintf (2, __VA_ARGS__) #define showlist(...) puts (#__VA_ARGS__) #define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) static void @@ -3500,11 +2637,11 @@ test_varargs_macros (void) #define BIG32 4294967295ul #define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) #if !BIG_OK - your preprocessor is broken; + #error "your preprocessor is broken" #endif #if BIG_OK #else - your preprocessor is broken; + #error "your preprocessor is broken" #endif static long long int bignum = -9223372036854775807LL; static unsigned long long int ubignum = BIG64; @@ -3529,13 +2666,13 @@ test_restrict (ccp restrict text) // See if C++-style comments work. // Iterate through items via the restricted pointer. // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) + for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i) continue; return 0; } // Check varargs and va_copy. -static void +static bool test_varargs (const char *format, ...) { va_list args; @@ -3543,21 +2680,21 @@ test_varargs (const char *format, ...) va_list args_copy; va_copy (args_copy, args); - const char *str; - int number; - float fnumber; + const char *str = ""; + int number = 0; + float fnumber = 0; while (*format) { switch (*format++) { - case 's': // string + case '\''s'\'': // string str = va_arg (args_copy, const char *); break; - case 'd': // int + case '\''d'\'': // int number = va_arg (args_copy, int); break; - case 'f': // float + case '\''f'\'': // float fnumber = va_arg (args_copy, double); break; default: @@ -3566,14 +2703,16 @@ test_varargs (const char *format, ...) } va_end (args_copy); va_end (args); + + return *str && number && fnumber; } +' -int -main () -{ - +# Test code for whether the C compiler supports C99 (body of main). +ac_c_conftest_c99_main=' // Check bool. _Bool success = false; + success |= (argc != 0); // Check restrict. if (test_restrict ("String literal") == 0) @@ -3581,7 +2720,7 @@ main () char *restrict newvar = "Another string"; // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); + success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234); test_varargs_macros (); // Check flexible array members. @@ -3601,85 +2740,1269 @@ main () ni.number = 58; int dynamic_array[ni.number]; + dynamic_array[0] = argv[0][0]; dynamic_array[ni.number - 1] = 543; // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); + ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\'' + || dynamic_array[ni.number - 1] != 543); +' + +# Test code for whether the C compiler supports C11 (global declarations) +ac_c_conftest_c11_globals=' +// Does the compiler advertise C11 conformance? +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L +# error "Compiler does not advertise C11 conformance" +#endif + +// Check _Alignas. +char _Alignas (double) aligned_as_double; +char _Alignas (0) no_special_alignment; +extern char aligned_as_int; +char _Alignas (0) _Alignas (int) aligned_as_int; + +// Check _Alignof. +enum +{ + int_alignment = _Alignof (int), + int_array_alignment = _Alignof (int[100]), + char_alignment = _Alignof (char) +}; +_Static_assert (0 < -_Alignof (int), "_Alignof is signed"); + +// Check _Noreturn. +int _Noreturn does_not_return (void) { for (;;) continue; } + +// Check _Static_assert. +struct test_static_assert +{ + int x; + _Static_assert (sizeof (int) <= sizeof (long int), + "_Static_assert does not work in struct"); + long int y; +}; + +// Check UTF-8 literals. +#define u8 syntax error! +char const utf8_literal[] = u8"happens to be ASCII" "another string"; + +// Check duplicate typedefs. +typedef long *long_ptr; +typedef long int *long_ptr; +typedef long_ptr long_ptr; + +// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1. +struct anonymous +{ + union { + struct { int i; int j; }; + struct { int k; long int l; } w; + }; + int m; +} v1; +' + +# Test code for whether the C compiler supports C11 (body of main). +ac_c_conftest_c11_main=' + _Static_assert ((offsetof (struct anonymous, i) + == offsetof (struct anonymous, w.k)), + "Anonymous union alignment botch"); + v1.i = 2; + v1.w.k = 5; + ok |= v1.i != 5; +' + +# Test code for whether the C compiler supports C11 (complete). +ac_c_conftest_c11_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} +${ac_c_conftest_c11_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + ${ac_c_conftest_c11_main} + return ok; +} +" + +# Test code for whether the C compiler supports C99 (complete). +ac_c_conftest_c99_program="${ac_c_conftest_c89_globals} +${ac_c_conftest_c99_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + ${ac_c_conftest_c99_main} + return ok; +} +" + +# Test code for whether the C compiler supports C89 (complete). +ac_c_conftest_c89_program="${ac_c_conftest_c89_globals} + +int +main (int argc, char **argv) +{ + int ok = 0; + ${ac_c_conftest_c89_main} + return ok; +} +" + +as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H" +as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H" +as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H" +as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H" +as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H" +as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H" +as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H" +as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" +as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" +as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H" +as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H" +as_fn_append ac_header_c_list " sys/socket.h sys_socket_h HAVE_SYS_SOCKET_H" +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 +printf "%s\n" "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +printf "%s\n" "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 +printf "%s\n" "$as_me: former value: \`$ac_old_val'" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 +printf "%s\n" "$as_me: current value: \`$ac_new_val'" >&2;} + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) as_fn_append ac_configure_args " '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 +printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;} + as_fn_error $? "run \`${MAKE-make} distclean' and/or \`rm $cache_file' + and start over" "$LINENO" 5 +fi +## -------------------- ## +## Main body of script. ## +## -------------------- ## + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +ac_config_headers="$ac_config_headers auto/config.h:config.h.in" + + +printf "%s\n" "#define UNIX 1" >>confdefs.h + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if eval test \${ac_cv_prog_make_${ac_make}_set+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + SET_MAKE= +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + + + + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="gcc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="$ac_prog" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args. +set dummy ${ac_tool_prefix}clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_CC="${ac_tool_prefix}clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 +printf "%s\n" "$CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "clang", so it can be a program name with args. +set dummy clang; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="clang" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 +printf "%s\n" "$ac_ct_CC" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +fi + + +test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } + +# Provide some information about the compiler. +printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +for ac_option in --version -v -V -qversion -version; do + { { ac_try="$ac_compiler $ac_option >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ ; return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +printf %s "checking whether the C compiler works... " >&6; } +ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { { ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else $as_nop + ac_file='' +fi +if test -z "$ac_file" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +printf %s "checking for C compiler default output file name... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +printf "%s\n" "$ac_file" >&6; } +ac_exeext=$ac_cv_exeext + +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +printf %s "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + break;; + * ) break;; + esac +done +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest conftest$ac_cv_exeext +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 +printf "%s\n" "$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +printf %s "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details" "$LINENO" 5; } + fi + fi +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +printf "%s\n" "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 +printf %s "checking for suffix of object files... " >&6; } +if test ${ac_cv_objext+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +then : + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` + break;; + esac +done +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } +fi +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 +printf "%s\n" "$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5 +printf %s "checking whether the compiler supports GNU C... " >&6; } +if test ${ac_cv_c_compiler_gnu+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_compiler_gnu=yes +else $as_nop + ac_compiler_gnu=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 +printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; } +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+y} +ac_save_CFLAGS=$CFLAGS +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 +printf %s "checking whether $CC accepts -g... " >&6; } +if test ${ac_cv_prog_cc_g+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +else $as_nop + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + +else $as_nop + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_g=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 +printf "%s\n" "$ac_cv_prog_cc_g" >&6; } +if test $ac_test_CFLAGS; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +ac_prog_cc_stdc=no +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5 +printf %s "checking for $CC option to enable C11 features... " >&6; } +if test ${ac_cv_prog_cc_c11+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c11=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c11_program +_ACEOF +for ac_arg in '' -std=gnu11 do CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c11=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c11" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c11" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c11" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5 +printf "%s\n" "$ac_cv_prog_cc_c11" >&6; } + CC="$CC $ac_cv_prog_cc_c11" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11 + ac_prog_cc_stdc=c11 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5 +printf %s "checking for $CC option to enable C99 features... " >&6; } +if test ${ac_cv_prog_cc_c99+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c99_program +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99= +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_prog_cc_c99=$ac_arg fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam test "x$ac_cv_prog_cc_c99" != "xno" && break done rm -f conftest.$ac_ext CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - fi +if test "x$ac_cv_prog_cc_c99" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c99" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +printf "%s\n" "$ac_cv_prog_cc_c99" >&6; } + CC="$CC $ac_cv_prog_cc_c99" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 + ac_prog_cc_stdc=c99 +fi +fi +if test x$ac_prog_cc_stdc = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5 +printf %s "checking for $CC option to enable C89 features... " >&6; } +if test ${ac_cv_prog_cc_c89+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_c_conftest_c89_program +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO" +then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC +fi + +if test "x$ac_cv_prog_cc_c89" = xno +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +printf "%s\n" "unsupported" >&6; } +else $as_nop + if test "x$ac_cv_prog_cc_c89" = x +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +printf "%s\n" "none needed" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +printf "%s\n" "$ac_cv_prog_cc_c89" >&6; } + CC="$CC $ac_cv_prog_cc_c89" +fi + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 + ac_prog_cc_stdc=c89 +fi +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 +printf %s "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if ${ac_cv_prog_CPP+:} false; then : - $as_echo_n "(cached) " >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + if test ${ac_cv_prog_CPP+y} +then : + printf %s "(cached) " >&6 +else $as_nop + # Double quotes because $CC needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp do ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -3691,10 +4014,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -3704,7 +4028,8 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : break fi @@ -3716,29 +4041,24 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 +printf "%s\n" "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do # Use a header file that comes with gcc, so configuring glibc # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif +#include Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : -else +else $as_nop # Broken: fails on valid input. continue fi @@ -3750,10 +4070,11 @@ rm -f conftest.err conftest.i conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # Broken: success on invalid input. continue -else +else $as_nop # Passes both tests. ac_preproc_ok=: break @@ -3763,11 +4084,12 @@ rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.i conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok +then : -else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +else $as_nop + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details" "$LINENO" 5; } fi @@ -3777,13 +4099,12 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if ${ac_cv_path_GREP+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 +printf %s "checking for grep that handles long lines and -e... " >&6; } +if test ${ac_cv_path_GREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -z "$GREP"; then ac_path_GREP_found=false # Loop through the user's path and test for each of PROGNAME-LIST @@ -3791,10 +4112,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in grep ggrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_GREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP @@ -3803,13 +4129,13 @@ case `"$ac_path_GREP" --version 2>&1` in ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" + printf "%s\n" 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3837,16 +4163,17 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 +printf "%s\n" "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if ${ac_cv_path_EGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 +printf %s "checking for egrep... " >&6; } +if test ${ac_cv_path_EGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else @@ -3857,10 +4184,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in egrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP @@ -3869,13 +4201,13 @@ case `"$ac_path_EGREP" --version 2>&1` in ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" + printf "%s\n" 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3904,25 +4236,16 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 +printf "%s\n" "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "" >/dev/null 2>&1; then : - -fi -rm -f conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 -$as_echo_n "checking for fgrep... " >&6; } -if ${ac_cv_path_FGREP+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5 +printf %s "checking for fgrep... " >&6; } +if test ${ac_cv_path_FGREP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1 then ac_cv_path_FGREP="$GREP -F" else @@ -3933,10 +4256,15 @@ else for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in fgrep; do + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_prog in fgrep + do for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" + ac_path_FGREP="$as_dir$ac_prog$ac_exec_ext" as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP @@ -3945,13 +4273,13 @@ case `"$ac_path_FGREP" --version 2>&1` in ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; *) ac_count=0 - $as_echo_n 0123456789 >"conftest.in" + printf %s 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - $as_echo 'FGREP' >> "conftest.nl" + printf "%s\n" 'FGREP' >> "conftest.nl" "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break as_fn_arith $ac_count + 1 && ac_count=$as_val @@ -3980,74 +4308,20 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 -$as_echo "$ac_cv_path_FGREP" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5 +printf "%s\n" "$ac_cv_path_FGREP" >&6; } FGREP="$ac_cv_path_FGREP" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_func_search_save_LIBS=$LIBS -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix; do - if test -z "$ac_lib"; then - ac_res="none required" - else - ac_res=-l$ac_lib - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : - break -fi -done -if ${ac_cv_search_strerror+:} false; then : - -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AWK+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_AWK+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else @@ -4055,11 +4329,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4070,11 +4348,11 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 +printf "%s\n" "$AWK" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -4083,11 +4361,12 @@ done # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_STRIP+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_STRIP+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. else @@ -4095,11 +4374,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4111,134 +4394,24 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +printf "%s\n" "$STRIP" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 +printf %s "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } +if test ${ac_cv_header_sys_wait_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -4251,7 +4424,7 @@ else #endif int -main () +main (void) { int s; wait (&s); @@ -4260,18 +4433,19 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_header_sys_wait_h=yes -else +else $as_nop ac_cv_header_sys_wait_h=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 +printf "%s\n" "$ac_cv_header_sys_wait_h" >&6; } if test $ac_cv_header_sys_wait_h = yes; then -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h fi @@ -4279,14 +4453,17 @@ fi if test x"$ac_cv_prog_cc_c99" != xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 -$as_echo_n "checking for unsigned long long int... " >&6; } -if ${ac_cv_type_unsigned_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 +printf %s "checking for unsigned long long int... " >&6; } +if test ${ac_cv_type_unsigned_long_long_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_type_unsigned_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case $ac_prog_cc_stdc in + no | c89) ;; + *) + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* For now, do not test the preprocessor; as of 2007 there are too many @@ -4304,7 +4481,7 @@ else ? 1 : -1)]; int i = 63; int -main () +main (void) { /* Test availability of runtime routines for shift and division. */ long long int llmax = 9223372036854775807ll; @@ -4318,98 +4495,104 @@ main () } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : -else +else $as_nop ac_cv_type_unsigned_long_long_int=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext;; + esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 -$as_echo "$ac_cv_type_unsigned_long_long_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_unsigned_long_long_int" >&5 +printf "%s\n" "$ac_cv_type_unsigned_long_long_int" >&6; } if test $ac_cv_type_unsigned_long_long_int = yes; then -$as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h +printf "%s\n" "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 -$as_echo_n "checking for long long int... " >&6; } -if ${ac_cv_type_long_long_int+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5 +printf %s "checking for long long int... " >&6; } +if test ${ac_cv_type_long_long_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_type_long_long_int=yes - if test "x${ac_cv_prog_cc_c99-no}" = xno; then - ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int - if test $ac_cv_type_long_long_int = yes; then - if test "$cross_compiling" = yes; then : + case $ac_prog_cc_stdc in + no | c89) ;; + *) + ac_cv_type_long_long_int=$ac_cv_type_unsigned_long_long_int + if test $ac_cv_type_long_long_int = yes; then + if test "$cross_compiling" = yes +then : : -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - #ifndef LLONG_MAX - # define HALF \ - (1LL << (sizeof (long long int) * CHAR_BIT - 2)) - # define LLONG_MAX (HALF - 1 + HALF) - #endif + #ifndef LLONG_MAX + # define HALF \ + (1LL << (sizeof (long long int) * CHAR_BIT - 2)) + # define LLONG_MAX (HALF - 1 + HALF) + #endif int -main () +main (void) { long long int n = 1; - int i; - for (i = 0; ; i++) - { - long long int m = n << i; - if (m >> i != n) - return 1; - if (LLONG_MAX / 2 < m) - break; - } - return 0; + int i; + for (i = 0; ; i++) + { + long long int m = n << i; + if (m >> i != n) + return 1; + if (LLONG_MAX / 2 < m) + break; + } + return 0; ; return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : -else +else $as_nop ac_cv_type_long_long_int=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi - fi + fi;; + esac fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 -$as_echo "$ac_cv_type_long_long_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_long_long_int" >&5 +printf "%s\n" "$ac_cv_type_long_long_int" >&6; } if test $ac_cv_type_long_long_int = yes; then -$as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h +printf "%s\n" "#define HAVE_LONG_LONG_INT 1" >>confdefs.h fi if test "$ac_cv_type_long_long_int" = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Compiler does not support long long int See \`config.log' for more details" "$LINENO" 5; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports trailing commas" >&5 -$as_echo_n "checking if the compiler supports trailing commas... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports trailing commas" >&5 +printf %s "checking if the compiler supports trailing commas... " >&6; } trailing_commas=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { enum { @@ -4419,46 +4602,48 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; trailing_commas=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; trailing_commas=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$trailing_commas" = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Compiler does not support trailing comma in enum See \`config.log' for more details" "$LINENO" 5; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler supports C++ comments" >&5 -$as_echo_n "checking if the compiler supports C++ comments... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the compiler supports C++ comments" >&5 +printf %s "checking if the compiler supports C++ comments... " >&6; } slash_comments=no cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { // C++ comments? ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; slash_comments=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; slash_comments=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test "$slash_comments" = no; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Compiler does not support C++ comments See \`config.log' for more details" "$LINENO" 5; } fi @@ -4467,26 +4652,25 @@ fi if test -n "$SOURCE_DATE_EPOCH"; then DATE_FMT="%b %d %Y %H:%M:%S" BUILD_DATE=$(LC_ALL=C date -u -d "@$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || LC_ALL=C date -u -r "$SOURCE_DATE_EPOCH" "+$DATE_FMT" 2>/dev/null || LC_ALL=C date -u "+$DATE_FMT") - cat >>confdefs.h <<_ACEOF -#define BUILD_DATE "$BUILD_DATE" -_ACEOF + printf "%s\n" "#define BUILD_DATE \"$BUILD_DATE\"" >>confdefs.h BUILD_DATE_MSG=-"echo -e '=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=\nNOTE: build date/time is fixed: $BUILD_DATE\n=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-='" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-fail-if-missing argument" >&5 -$as_echo_n "checking --enable-fail-if-missing argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-fail-if-missing argument" >&5 +printf %s "checking --enable-fail-if-missing argument... " >&6; } # Check whether --enable-fail_if_missing was given. -if test "${enable_fail_if_missing+set}" = set; then : +if test ${enable_fail_if_missing+y} +then : enableval=$enable_fail_if_missing; fail_if_missing="yes" -else +else $as_nop fail_if_missing="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5 -$as_echo "$fail_if_missing" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fail_if_missing" >&5 +printf "%s\n" "$fail_if_missing" >&6; } with_x_arg="$with_x" @@ -4512,35 +4696,35 @@ if test "$GCC" = yes; then fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang version" >&5 -$as_echo_n "checking for clang version... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang version" >&5 +printf %s "checking for clang version... " >&6; } CLANG_VERSION_STRING=`$CC --version 2>/dev/null | sed -n -e 's/^.*clang[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'` if test x"$CLANG_VERSION_STRING" != x"" ; then CLANG_MAJOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/\([0-9][0-9]*\)\.[0-9][0-9]*\.[0-9][0-9]*/\1/p'` CLANG_MINOR=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/p'` CLANG_REVISION=`echo "$CLANG_VERSION_STRING" | sed -n -e 's/[0-9][0-9]*\.[0-9][0-9]*\.\([0-9][0-9]*\)/\1/p'` CLANG_VERSION=`expr $CLANG_MAJOR '*' 1000000 '+' $CLANG_MINOR '*' 1000 '+' $CLANG_REVISION` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG_VERSION" >&5 -$as_echo "$CLANG_VERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5 -$as_echo_n "checking if clang supports -fno-strength-reduce... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CLANG_VERSION" >&5 +printf "%s\n" "$CLANG_VERSION" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5 +printf %s "checking if clang supports -fno-strength-reduce... " >&6; } if test "$CLANG_MAJOR" -ge 10 -o "$CLANG_VERSION" -ge 500002075 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } CFLAGS=`echo "$CFLAGS" | sed -e 's/-fno-strength-reduce/ /'` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: N/A" >&5 -$as_echo "N/A" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: N/A" >&5 +printf "%s\n" "N/A" >&6; } fi CROSS_COMPILING= if test "$cross_compiling" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&5 -$as_echo "cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&5 +printf "%s\n" "cannot compile a simple program; if not cross compiling check CC and CFLAGS" >&6; } CROSS_COMPILING=1 fi @@ -4548,160 +4732,165 @@ fi test "$GCC" = yes && CPP_MM=M; if test -f ./toolcheck; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for buggy tools" >&5 -$as_echo_n "checking for buggy tools... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for buggy tools" >&5 +printf %s "checking for buggy tools... " >&6; } sh ./toolcheck 1>&6 fi OS_EXTRA_SRC=""; OS_EXTRA_OBJ="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname" >&5 -$as_echo_n "checking uname... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uname" >&5 +printf %s "checking uname... " >&6; } if test "x$vim_cv_uname_output" = "x" ; then vim_cv_uname_output=`(uname) 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output" >&5 -$as_echo "$vim_cv_uname_output" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output" >&5 +printf "%s\n" "$vim_cv_uname_output" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output (cached)" >&5 -$as_echo "$vim_cv_uname_output (cached)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_output (cached)" >&5 +printf "%s\n" "$vim_cv_uname_output (cached)" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5 -$as_echo_n "checking uname -r... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uname -r" >&5 +printf %s "checking uname -r... " >&6; } if test "x$vim_cv_uname_r_output" = "x" ; then vim_cv_uname_r_output=`(uname -r) 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output" >&5 -$as_echo "$vim_cv_uname_r_output" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output" >&5 +printf "%s\n" "$vim_cv_uname_r_output" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output (cached)" >&5 -$as_echo "$vim_cv_uname_r_output (cached)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_r_output (cached)" >&5 +printf "%s\n" "$vim_cv_uname_r_output (cached)" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5 -$as_echo_n "checking uname -m... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uname -m" >&5 +printf %s "checking uname -m... " >&6; } if test "x$vim_cv_uname_m_output" = "x" ; then vim_cv_uname_m_output=`(uname -m) 2>/dev/null` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output" >&5 -$as_echo "$vim_cv_uname_m_output" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output" >&5 +printf "%s\n" "$vim_cv_uname_m_output" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output (cached)" >&5 -$as_echo "$vim_cv_uname_m_output (cached)" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_uname_m_output (cached)" >&5 +printf "%s\n" "$vim_cv_uname_m_output (cached)" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5 -$as_echo_n "checking for Haiku... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Haiku" >&5 +printf %s "checking for Haiku... " >&6; } case $vim_cv_uname_output in - Haiku) HAIKU=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };; - *) HAIKU=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; };; + Haiku) HAIKU=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };; + *) HAIKU=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; };; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5 -$as_echo_n "checking for QNX... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for QNX" >&5 +printf %s "checking for QNX... " >&6; } case $vim_cv_uname_output in QNX) OS_EXTRA_SRC=os_qnx.c; OS_EXTRA_OBJ=objects/os_qnx.o test -z "$with_x" && with_x=no - QNX=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };; - *) QNX=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; };; + QNX=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };; + *) QNX=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; };; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5 -$as_echo_n "checking for Darwin (Mac OS X)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Darwin (Mac OS X)" >&5 +printf %s "checking for Darwin (Mac OS X)... " >&6; } if test "$vim_cv_uname_output" = Darwin; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MACOS_X=yes CPPFLAGS="$CPPFLAGS -DMACOS_X" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5 -$as_echo_n "checking --disable-darwin argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-darwin argument" >&5 +printf %s "checking --disable-darwin argument... " >&6; } # Check whether --enable-darwin was given. -if test "${enable_darwin+set}" = set; then : +if test ${enable_darwin+y} +then : enableval=$enable_darwin; -else +else $as_nop enable_darwin="yes" fi if test "$enable_darwin" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Darwin files are there" >&5 -$as_echo_n "checking if Darwin files are there... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if Darwin files are there" >&5 +printf %s "checking if Darwin files are there... " >&6; } if test -f os_macosx.m; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, Darwin support disabled" >&5 -$as_echo "no, Darwin support disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, Darwin support disabled" >&5 +printf "%s\n" "no, Darwin support disabled" >&6; } enable_darwin=no fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, Darwin support excluded" >&5 -$as_echo "yes, Darwin support excluded" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, Darwin support excluded" >&5 +printf "%s\n" "yes, Darwin support excluded" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sparkle argument" >&5 -$as_echo_n "checking --disable-sparkle argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-sparkle argument" >&5 +printf %s "checking --disable-sparkle argument... " >&6; } # Check whether --enable-sparkle was given. -if test "${enable_sparkle+set}" = set; then : +if test ${enable_sparkle+y} +then : enableval=$enable_sparkle; -else +else $as_nop enable_sparkle="yes" fi if test "$enable_sparkle" == "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS DISABLE_SPARKLE=1' REMOVE_SPARKLE=1" fi if test "$enable_sparkle" == "yes"; then # Check if we want to build for legacy Sparkle version for old macOS # versions - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-sparkle_1 argument" >&5 -$as_echo_n "checking --enable-sparkle_1 argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-sparkle_1 argument" >&5 +printf %s "checking --enable-sparkle_1 argument... " >&6; } # Check whether --enable-sparkle_1 was given. -if test "${enable_sparkle_1+set}" = set; then : +if test ${enable_sparkle_1+y} +then : enableval=$enable_sparkle_1; use_sparkle_1="yes" fi if test "$use_sparkle_1" == "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS GCC_PREPROCESSOR_DEFINITIONS='$GCC_PREPROCESSOR_DEFINITIONS USE_SPARKLE_1=1'" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-developer-dir argument" >&5 -$as_echo_n "checking --with-developer-dir argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-developer-dir argument" >&5 +printf %s "checking --with-developer-dir argument... " >&6; } # Check whether --with-developer-dir was given. -if test "${with_developer_dir+set}" = set; then : - withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not present" >&5 -$as_echo "not present" >&6; } +if test ${with_developer_dir+y} +then : + withval=$with_developer_dir; DEVELOPER_DIR="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 +printf "%s\n" "$DEVELOPER_DIR" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not present" >&5 +printf "%s\n" "not present" >&6; } fi if test "x$DEVELOPER_DIR" = "x"; then # Extract the first word of "xcode-select", so it can be a program name with args. set dummy xcode-select; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_XCODE_SELECT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_XCODE_SELECT+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $XCODE_SELECT in [\\/]* | ?:[\\/]*) ac_cv_path_XCODE_SELECT="$XCODE_SELECT" # Let the user override the test with a path. @@ -4711,11 +4900,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_XCODE_SELECT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_XCODE_SELECT="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4727,41 +4920,42 @@ esac fi XCODE_SELECT=$ac_cv_path_XCODE_SELECT if test -n "$XCODE_SELECT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XCODE_SELECT" >&5 -$as_echo "$XCODE_SELECT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XCODE_SELECT" >&5 +printf "%s\n" "$XCODE_SELECT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$XCODE_SELECT" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for developer dir using xcode-select" >&5 -$as_echo_n "checking for developer dir using xcode-select... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for developer dir using xcode-select" >&5 +printf %s "checking for developer dir using xcode-select... " >&6; } DEVELOPER_DIR=`$XCODE_SELECT -print-path` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 -$as_echo "$DEVELOPER_DIR" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DEVELOPER_DIR" >&5 +printf "%s\n" "$DEVELOPER_DIR" >&6; } else DEVELOPER_DIR=/Developer fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-macsdk argument" >&5 -$as_echo_n "checking --with-macsdk argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-macsdk argument" >&5 +printf %s "checking --with-macsdk argument... " >&6; } # Check whether --with-macsdk was given. -if test "${with_macsdk+set}" = set; then : - withval=$with_macsdk; MACSDK="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MACSDK" >&5 -$as_echo "$MACSDK" >&6; } -else - MACSDK=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default" >&5 -$as_echo "using default" >&6; } +if test ${with_macsdk+y} +then : + withval=$with_macsdk; MACSDK="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MACSDK" >&5 +printf "%s\n" "$MACSDK" >&6; } +else $as_nop + MACSDK=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using default" >&5 +printf "%s\n" "using default" >&6; } fi if test -n "$MACSDK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if SDK is supported" >&5 -$as_echo_n "checking if SDK is supported... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if SDK is supported" >&5 +printf %s "checking if SDK is supported... " >&6; } save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" sdkflags="$DEVELOPER_DIR/SDKs/MacOSX$MACSDK" @@ -4775,25 +4969,26 @@ $as_echo_n "checking if SDK is supported... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS -sdk macosx$MACSDK MACOSX_DEPLOYMENT_TARGET=$MACSDK" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } MACSDK="" CFLAGS="$save_cflags" LDFLAGS="$save_ldflags" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else if test -z "$MACOSX_DEPLOYMENT_TARGET"; then @@ -4819,22 +5014,23 @@ rm -f core conftest.err conftest.$ac_objext \ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-macarchs argument" >&5 -$as_echo_n "checking --with-macarchs argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-macarchs argument" >&5 +printf %s "checking --with-macarchs argument... " >&6; } # Check whether --with-macarchs was given. -if test "${with_macarchs+set}" = set; then : - withval=$with_macarchs; ARCHS="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ARCHS" >&5 -$as_echo "$ARCHS" >&6; } -else - ARCHS=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to native arch" >&5 -$as_echo "defaulting to native arch" >&6; } +if test ${with_macarchs+y} +then : + withval=$with_macarchs; ARCHS="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ARCHS" >&5 +printf "%s\n" "$ARCHS" >&6; } +else $as_nop + ARCHS=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to native arch" >&5 +printf "%s\n" "defaulting to native arch" >&6; } fi if test -n "$ARCHS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if architectures are supported" >&5 -$as_echo_n "checking if architectures are supported... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if architectures are supported" >&5 +printf %s "checking if architectures are supported... " >&6; } save_cflags="$CFLAGS" save_ldflags="$LDFLAGS" @@ -4852,25 +5048,26 @@ $as_echo_n "checking if architectures are supported... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } XCODEFLAGS="$XCODEFLAGS ARCHS=\"$ARCHS\" ONLY_ACTIVE_ARCH=\"NO\"" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will build for native arch only" >&5 -$as_echo "no, will build for native arch only" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, will build for native arch only" >&5 +printf "%s\n" "no, will build for native arch only" >&6; } ARCHS="" CFLAGS="$save_cflags" LDFLAGS="$save_ldflags" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi @@ -4879,7 +5076,7 @@ rm -f core conftest.err conftest.$ac_objext \ MACOS_X_DARWIN=yes OS_EXTRA_SRC="os_macosx.m os_mac_conv.c"; OS_EXTRA_OBJ="objects/os_macosx.o objects/os_mac_conv.o" - $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h CPPFLAGS="$CPPFLAGS -DMACOS_X_DARWIN" @@ -4887,29 +5084,41 @@ rm -f core conftest.err conftest.$ac_objext \ SAVE_CFLAGS=$CFLAGS CPPFLAGS="$CPPFLAGS -ObjC" CFLAGS="$CFLAGS -ObjC" - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - + ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi done -ac_fn_c_check_header_mongrel "$LINENO" "Cocoa/Cocoa.h" "ac_cv_header_Cocoa_Cocoa_h" "$ac_includes_default" -if test "x$ac_cv_header_Cocoa_Cocoa_h" = xyes; then : + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Cocoa/Cocoa.h" "ac_cv_header_Cocoa_Cocoa_h" "$ac_includes_default" +if test "x$ac_cv_header_Cocoa_Cocoa_h" = xyes +then : COCOA=yes fi - CPPFLAGS=$SAVE_CPPFLAGS CFLAGS=$SAVE_CFLAGS @@ -4918,47 +5127,38 @@ fi fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -for ac_header in AvailabilityMacros.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" -if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_AVAILABILITYMACROS_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default" +if test "x$ac_cv_header_AvailabilityMacros_h" = xyes +then : + printf "%s\n" "#define HAVE_AVAILABILITYMACROS_H 1" >>confdefs.h fi -done - # 10.5 and earlier lack dispatch -for ac_header in dispatch/dispatch.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default" -if test "x$ac_cv_header_dispatch_dispatch_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DISPATCH_DISPATCH_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "dispatch/dispatch.h" "ac_cv_header_dispatch_dispatch_h" "$ac_includes_default" +if test "x$ac_cv_header_dispatch_dispatch_h" = xyes +then : + printf "%s\n" "#define HAVE_DISPATCH_DISPATCH_H 1" >>confdefs.h fi -done - if test "$cross_compiling" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-local-dir argument" >&5 -$as_echo_n "checking --with-local-dir argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-local-dir argument" >&5 +printf %s "checking --with-local-dir argument... " >&6; } have_local_include='' have_local_lib='' # Check whether --with-local-dir was given. -if test "${with_local_dir+set}" = set; then : +if test ${with_local_dir+y} +then : withval=$with_local_dir; local_dir="$withval" case "$withval" in @@ -4970,14 +5170,14 @@ if test "${with_local_dir+set}" = set; then : ;; *) as_fn_error $? "must pass path argument to --with-local-dir" "$LINENO" 5 ;; esac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5 -$as_echo "$local_dir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $local_dir" >&5 +printf "%s\n" "$local_dir" >&6; } -else +else $as_nop local_dir=/usr/local - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to $local_dir" >&5 -$as_echo "Defaulting to $local_dir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to $local_dir" >&5 +printf "%s\n" "Defaulting to $local_dir" >&6; } fi @@ -5001,94 +5201,93 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-vim-name argument" >&5 -$as_echo_n "checking --with-vim-name argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-vim-name argument" >&5 +printf %s "checking --with-vim-name argument... " >&6; } # Check whether --with-vim-name was given. -if test "${with_vim_name+set}" = set; then : - withval=$with_vim_name; VIMNAME="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VIMNAME" >&5 -$as_echo "$VIMNAME" >&6; } -else - VIMNAME="vim"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to $VIMNAME" >&5 -$as_echo "Defaulting to $VIMNAME" >&6; } +if test ${with_vim_name+y} +then : + withval=$with_vim_name; VIMNAME="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VIMNAME" >&5 +printf "%s\n" "$VIMNAME" >&6; } +else $as_nop + VIMNAME="vim"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to $VIMNAME" >&5 +printf "%s\n" "Defaulting to $VIMNAME" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ex-name argument" >&5 -$as_echo_n "checking --with-ex-name argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-ex-name argument" >&5 +printf %s "checking --with-ex-name argument... " >&6; } # Check whether --with-ex-name was given. -if test "${with_ex_name+set}" = set; then : - withval=$with_ex_name; EXNAME="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EXNAME" >&5 -$as_echo "$EXNAME" >&6; } -else - EXNAME="ex"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to ex" >&5 -$as_echo "Defaulting to ex" >&6; } +if test ${with_ex_name+y} +then : + withval=$with_ex_name; EXNAME="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $EXNAME" >&5 +printf "%s\n" "$EXNAME" >&6; } +else $as_nop + EXNAME="ex"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to ex" >&5 +printf "%s\n" "Defaulting to ex" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-view-name argument" >&5 -$as_echo_n "checking --with-view-name argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-view-name argument" >&5 +printf %s "checking --with-view-name argument... " >&6; } # Check whether --with-view-name was given. -if test "${with_view_name+set}" = set; then : - withval=$with_view_name; VIEWNAME="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VIEWNAME" >&5 -$as_echo "$VIEWNAME" >&6; } -else - VIEWNAME="view"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to view" >&5 -$as_echo "Defaulting to view" >&6; } +if test ${with_view_name+y} +then : + withval=$with_view_name; VIEWNAME="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $VIEWNAME" >&5 +printf "%s\n" "$VIEWNAME" >&6; } +else $as_nop + VIEWNAME="view"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to view" >&5 +printf "%s\n" "Defaulting to view" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-global-runtime argument" >&5 -$as_echo_n "checking --with-global-runtime argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-global-runtime argument" >&5 +printf %s "checking --with-global-runtime argument... " >&6; } # Check whether --with-global-runtime was given. -if test "${with_global_runtime+set}" = set; then : - withval=$with_global_runtime; RUNTIME_GLOBAL="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_global_runtime+y} +then : + withval=$with_global_runtime; RUNTIME_GLOBAL="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$RUNTIME_GLOBAL" != "X"; then RUNTIME_GLOBAL_AFTER=$(printf -- "$RUNTIME_GLOBAL\\n" | $AWK -F, 'BEGIN { comma=0 } { for (i = NF; i > 0; i--) { if (comma) { printf ",%s/after", $i } else { printf "%s/after", $i; comma=1 } } } END { printf "\n" }') - cat >>confdefs.h <<_ACEOF -#define RUNTIME_GLOBAL "$RUNTIME_GLOBAL" -_ACEOF + printf "%s\n" "#define RUNTIME_GLOBAL \"$RUNTIME_GLOBAL\"" >>confdefs.h - cat >>confdefs.h <<_ACEOF -#define RUNTIME_GLOBAL_AFTER "$RUNTIME_GLOBAL_AFTER" -_ACEOF + printf "%s\n" "#define RUNTIME_GLOBAL_AFTER \"$RUNTIME_GLOBAL_AFTER\"" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-modified-by argument" >&5 -$as_echo_n "checking --with-modified-by argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-modified-by argument" >&5 +printf %s "checking --with-modified-by argument... " >&6; } # Check whether --with-modified-by was given. -if test "${with_modified_by+set}" = set; then : - withval=$with_modified_by; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; }; cat >>confdefs.h <<_ACEOF -#define MODIFIED_BY "$withval" -_ACEOF +if test ${with_modified_by+y} +then : + withval=$with_modified_by; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; }; printf "%s\n" "#define MODIFIED_BY \"$withval\"" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if character set is EBCDIC" >&5 -$as_echo_n "checking if character set is EBCDIC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if character set is EBCDIC" >&5 +printf %s "checking if character set is EBCDIC... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { /* TryCompile function for CharSet. Treat any failure as ASCII for compatibility with existing art. @@ -5101,20 +5300,21 @@ make an error "Character set is not EBCDIC" return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # TryCompile action if true cf_cv_ebcdic=yes -else +else $as_nop # TryCompile action if false cf_cv_ebcdic=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # end of TryCompile ]) # end of CacheVal CvEbcdic -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cf_cv_ebcdic" >&5 -$as_echo "$cf_cv_ebcdic" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cf_cv_ebcdic" >&5 +printf "%s\n" "$cf_cv_ebcdic" >&6; } case "$cf_cv_ebcdic" in #(vi - yes) $as_echo "#define EBCDIC 1" >>confdefs.h + yes) printf "%s\n" "#define EBCDIC 1" >>confdefs.h line_break='"\\n"' ;; @@ -5123,8 +5323,8 @@ esac if test "$cf_cv_ebcdic" = "yes"; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5 -$as_echo_n "checking for z/OS Unix... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for z/OS Unix" >&5 +printf %s "checking for z/OS Unix... " >&6; } case $vim_cv_uname_output in OS/390) zOSUnix="yes"; if test "$CC" = "cc"; then @@ -5154,12 +5354,12 @@ case $vim_cv_uname_output in # Use haltonmsg to force error for missing H files. CFLAGS="$CFLAGS -D_ALL_SOURCE -Wc,float(ieee),haltonmsg(3296)"; LDFLAGS="$LDFLAGS -Wl,EDIT=NO" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } ;; *) zOSUnix="no"; - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } ;; esac fi @@ -5172,64 +5372,68 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-smack argument" >&5 -$as_echo_n "checking --disable-smack argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-smack argument" >&5 +printf %s "checking --disable-smack argument... " >&6; } # Check whether --enable-smack was given. -if test "${enable_smack+set}" = set; then : +if test ${enable_smack+y} +then : enableval=$enable_smack; -else +else $as_nop enable_smack="yes" fi if test "$enable_smack" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_fn_c_check_header_mongrel "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_linux_xattr_h" = xyes; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + ac_fn_c_check_header_compile "$LINENO" "linux/xattr.h" "ac_cv_header_linux_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_linux_xattr_h" = xyes +then : true -else +else $as_nop enable_smack="no" fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "$enable_smack" = "yes"; then - ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_attr_xattr_h" = xyes; then : + ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_attr_xattr_h" = xyes +then : true -else +else $as_nop enable_smack="no" fi - fi if test "$enable_smack" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XATTR_NAME_SMACKEXEC in linux/xattr.h" >&5 -$as_echo_n "checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XATTR_NAME_SMACKEXEC in linux/xattr.h" >&5 +printf %s "checking for XATTR_NAME_SMACKEXEC in linux/xattr.h... " >&6; } + +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "XATTR_NAME_SMACKEXEC" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; enable_smack="no" + $EGREP "XATTR_NAME_SMACKEXEC" >/dev/null 2>&1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; enable_smack="no" fi -rm -f conftest* +rm -rf conftest* fi if test "$enable_smack" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setxattr in -lattr" >&5 -$as_echo_n "checking for setxattr in -lattr... " >&6; } -if ${ac_cv_lib_attr_setxattr+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setxattr in -lattr" >&5 +printf %s "checking for setxattr in -lattr... " >&6; } +if test ${ac_cv_lib_attr_setxattr+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lattr $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5238,56 +5442,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char setxattr (); int -main () +main (void) { return setxattr (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_attr_setxattr=yes -else +else $as_nop ac_cv_lib_attr_setxattr=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_setxattr" >&5 -$as_echo "$ac_cv_lib_attr_setxattr" >&6; } -if test "x$ac_cv_lib_attr_setxattr" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_setxattr" >&5 +printf "%s\n" "$ac_cv_lib_attr_setxattr" >&6; } +if test "x$ac_cv_lib_attr_setxattr" = xyes +then : LIBS="$LIBS -lattr" found_smack="yes" - $as_echo "#define HAVE_SMACK 1" >>confdefs.h + printf "%s\n" "#define HAVE_SMACK 1" >>confdefs.h fi fi if test "x$found_smack" = "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-selinux argument" >&5 -$as_echo_n "checking --disable-selinux argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-selinux argument" >&5 +printf %s "checking --disable-selinux argument... " >&6; } # Check whether --enable-selinux was given. -if test "${enable_selinux+set}" = set; then : +if test ${enable_selinux+y} +then : enableval=$enable_selinux; -else +else $as_nop enable_selinux="yes" fi if test "$enable_selinux" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5 -$as_echo_n "checking for is_selinux_enabled in -lselinux... " >&6; } -if ${ac_cv_lib_selinux_is_selinux_enabled+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for is_selinux_enabled in -lselinux" >&5 +printf %s "checking for is_selinux_enabled in -lselinux... " >&6; } +if test ${ac_cv_lib_selinux_is_selinux_enabled+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lselinux $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5296,57 +5501,57 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char is_selinux_enabled (); int -main () +main (void) { return is_selinux_enabled (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_selinux_is_selinux_enabled=yes -else +else $as_nop ac_cv_lib_selinux_is_selinux_enabled=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 -$as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } -if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes; then : - ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default" -if test "x$ac_cv_header_selinux_selinux_h" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 +printf "%s\n" "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } +if test "x$ac_cv_lib_selinux_is_selinux_enabled" = xyes +then : + ac_fn_c_check_header_compile "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default" +if test "x$ac_cv_header_selinux_selinux_h" = xyes +then : LIBS="$LIBS -lselinux" - $as_echo "#define HAVE_SELINUX 1" >>confdefs.h + printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h fi - fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-features argument" >&5 -$as_echo_n "checking --with-features argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-features argument" >&5 +printf %s "checking --with-features argument... " >&6; } # Check whether --with-features was given. -if test "${with_features+set}" = set; then : - withval=$with_features; features="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $features" >&5 -$as_echo "$features" >&6; } -else - features="huge"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to huge" >&5 -$as_echo "Defaulting to huge" >&6; } +if test ${with_features+y} +then : + withval=$with_features; features="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $features" >&5 +printf "%s\n" "$features" >&6; } +else $as_nop + features="huge"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to huge" >&5 +printf "%s\n" "Defaulting to huge" >&6; } fi @@ -5358,16 +5563,16 @@ esac dovimdiff="" dogvimdiff="" case "$features" in - tiny) $as_echo "#define FEAT_TINY 1" >>confdefs.h + tiny) printf "%s\n" "#define FEAT_TINY 1" >>confdefs.h ;; - normal) $as_echo "#define FEAT_NORMAL 1" >>confdefs.h + normal) printf "%s\n" "#define FEAT_NORMAL 1" >>confdefs.h dovimdiff="installvimdiff"; dogvimdiff="installgvimdiff" ;; - huge) $as_echo "#define FEAT_HUGE 1" >>confdefs.h + huge) printf "%s\n" "#define FEAT_HUGE 1" >>confdefs.h dovimdiff="installvimdiff"; dogvimdiff="installgvimdiff" ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $features is not supported" >&5 -$as_echo "Sorry, $features is not supported" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $features is not supported" >&5 +printf "%s\n" "Sorry, $features is not supported" >&6; } ;; esac @@ -5379,81 +5584,85 @@ else has_eval=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument" >&5 -$as_echo_n "checking --with-compiledby argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument" >&5 +printf %s "checking --with-compiledby argument... " >&6; } # Check whether --with-compiledby was given. -if test "${with_compiledby+set}" = set; then : - withval=$with_compiledby; compiledby="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } -else - compiledby=""; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_compiledby+y} +then : + withval=$with_compiledby; compiledby="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; } +else $as_nop + compiledby=""; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp argument" >&5 -$as_echo_n "checking --disable-xsmp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp argument" >&5 +printf %s "checking --disable-xsmp argument... " >&6; } # Check whether --enable-xsmp was given. -if test "${enable_xsmp+set}" = set; then : +if test ${enable_xsmp+y} +then : enableval=$enable_xsmp; -else +else $as_nop enable_xsmp="yes" fi if test "$enable_xsmp" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp-interact argument" >&5 -$as_echo_n "checking --disable-xsmp-interact argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-xsmp-interact argument" >&5 +printf %s "checking --disable-xsmp-interact argument... " >&6; } # Check whether --enable-xsmp-interact was given. -if test "${enable_xsmp_interact+set}" = set; then : +if test ${enable_xsmp_interact+y} +then : enableval=$enable_xsmp_interact; -else +else $as_nop enable_xsmp_interact="yes" fi if test "$enable_xsmp_interact" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - $as_echo "#define USE_XSMP_INTERACT 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + printf "%s\n" "#define USE_XSMP_INTERACT 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking diff feature" >&5 -$as_echo_n "checking diff feature... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking diff feature" >&5 +printf %s "checking diff feature... " >&6; } if test "x$features" = "xtiny"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled in $features version" >&5 -$as_echo "disabled in $features version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled in $features version" >&5 +printf "%s\n" "disabled in $features version" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled" >&5 -$as_echo "enabled" >&6; } - $as_echo "#define FEAT_DIFF 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: enabled" >&5 +printf "%s\n" "enabled" >&6; } + printf "%s\n" "#define FEAT_DIFF 1" >>confdefs.h XDIFF_OBJS_USED="\$(XDIFF_OBJS)" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-luainterp argument" >&5 -$as_echo_n "checking --enable-luainterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-luainterp argument" >&5 +printf %s "checking --enable-luainterp argument... " >&6; } # Check whether --enable-luainterp was given. -if test "${enable_luainterp+set}" = set; then : +if test ${enable_luainterp+y} +then : enableval=$enable_luainterp; -else +else $as_nop enable_luainterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_luainterp" >&5 -$as_echo "$enable_luainterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_luainterp" >&5 +printf "%s\n" "$enable_luainterp" >&6; } if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then if test "$has_eval" = "no"; then @@ -5462,58 +5671,61 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-lua-prefix argument" >&5 -$as_echo_n "checking --with-lua-prefix argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-lua-prefix argument" >&5 +printf %s "checking --with-lua-prefix argument... " >&6; } # Check whether --with-lua_prefix was given. -if test "${with_lua_prefix+set}" = set; then : - withval=$with_lua_prefix; with_lua_prefix="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_lua_prefix" >&5 -$as_echo "$with_lua_prefix" >&6; } -else - with_lua_prefix="";{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_lua_prefix+y} +then : + withval=$with_lua_prefix; with_lua_prefix="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_lua_prefix" >&5 +printf "%s\n" "$with_lua_prefix" >&6; } +else $as_nop + with_lua_prefix="";{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$with_lua_prefix" != "X"; then vi_cv_path_lua_pfx="$with_lua_prefix" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LUA_PREFIX environment var" >&5 -$as_echo_n "checking LUA_PREFIX environment var... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LUA_PREFIX environment var" >&5 +printf %s "checking LUA_PREFIX environment var... " >&6; } if test "X$LUA_PREFIX" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$LUA_PREFIX\"" >&5 -$as_echo "\"$LUA_PREFIX\"" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$LUA_PREFIX\"" >&5 +printf "%s\n" "\"$LUA_PREFIX\"" >&6; } vi_cv_path_lua_pfx="$LUA_PREFIX" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set, default to /usr" >&5 -$as_echo "not set, default to /usr" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set, default to /usr" >&5 +printf "%s\n" "not set, default to /usr" >&6; } vi_cv_path_lua_pfx="/usr" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-luajit" >&5 -$as_echo_n "checking --with-luajit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-luajit" >&5 +printf %s "checking --with-luajit... " >&6; } # Check whether --with-luajit was given. -if test "${with_luajit+set}" = set; then : +if test ${with_luajit+y} +then : withval=$with_luajit; vi_cv_with_luajit="$withval" -else +else $as_nop vi_cv_with_luajit="no" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_with_luajit" >&5 -$as_echo "$vi_cv_with_luajit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_with_luajit" >&5 +printf "%s\n" "$vi_cv_with_luajit" >&6; } LUA_INC= if test "X$vi_cv_path_lua_pfx" != "X"; then if test "x$vi_cv_with_luajit" != "xno"; then # Extract the first word of "luajit", so it can be a program name with args. set dummy luajit; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_luajit+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_luajit+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_luajit in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_luajit="$vi_cv_path_luajit" # Let the user override the test with a path. @@ -5523,11 +5735,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_luajit="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_luajit="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5539,44 +5755,47 @@ esac fi vi_cv_path_luajit=$ac_cv_path_vi_cv_path_luajit if test -n "$vi_cv_path_luajit"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_luajit" >&5 -$as_echo "$vi_cv_path_luajit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_luajit" >&5 +printf "%s\n" "$vi_cv_path_luajit" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_luajit" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5 -$as_echo_n "checking LuaJIT version... " >&6; } -if ${vi_cv_version_luajit+:} false; then : - $as_echo_n "(cached) " >&6 -else - vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-[a-z0-9]*\)* .*/\1/'` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking LuaJIT version" >&5 +printf %s "checking LuaJIT version... " >&6; } +if test ${vi_cv_version_luajit+y} +then : + printf %s "(cached) " >&6 +else $as_nop + vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([0-9.]*\)\.[0-9]\(-*[a-z0-9]*\)* .*/\1/'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5 -$as_echo "$vi_cv_version_luajit" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version of LuaJIT" >&5 -$as_echo_n "checking Lua version of LuaJIT... " >&6; } -if ${vi_cv_version_lua_luajit+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_luajit" >&5 +printf "%s\n" "$vi_cv_version_luajit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Lua version of LuaJIT" >&5 +printf %s "checking Lua version of LuaJIT... " >&6; } +if test ${vi_cv_version_lua_luajit+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5 -$as_echo "$vi_cv_version_lua_luajit" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_lua_luajit" >&5 +printf "%s\n" "$vi_cv_version_lua_luajit" >&6; } vi_cv_path_lua="$vi_cv_path_luajit" vi_cv_version_lua="$vi_cv_version_lua_luajit" fi else # Extract the first word of "lua", so it can be a program name with args. set dummy lua; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_plain_lua+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_plain_lua+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_plain_lua in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_plain_lua="$vi_cv_path_plain_lua" # Let the user override the test with a path. @@ -5586,11 +5805,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_plain_lua="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_plain_lua="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5602,55 +5825,56 @@ esac fi vi_cv_path_plain_lua=$ac_cv_path_vi_cv_path_plain_lua if test -n "$vi_cv_path_plain_lua"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_plain_lua" >&5 -$as_echo "$vi_cv_path_plain_lua" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_plain_lua" >&5 +printf "%s\n" "$vi_cv_path_plain_lua" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_plain_lua" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5 -$as_echo_n "checking Lua version... " >&6; } -if ${vi_cv_version_plain_lua+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Lua version" >&5 +printf %s "checking Lua version... " >&6; } +if test ${vi_cv_version_plain_lua+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_version_plain_lua=`${vi_cv_path_plain_lua} -e "print(_VERSION)" | sed 's/.* //'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5 -$as_echo "$vi_cv_version_plain_lua" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_version_plain_lua" >&5 +printf "%s\n" "$vi_cv_version_plain_lua" >&6; } fi vi_cv_path_lua="$vi_cv_path_plain_lua" vi_cv_version_lua="$vi_cv_version_plain_lua" fi if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5 -$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5 +printf %s "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LUA_INC=/luajit-$vi_cv_version_luajit fi fi if test "X$LUA_INC" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 -$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 +printf %s "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5 -$as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5 +printf %s "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LUA_INC=/lua$vi_cv_version_lua else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } # Detect moonjit: # https://groups.google.com/forum/#!topic/vim_use/O0vek60WuTk @@ -5663,15 +5887,15 @@ $as_echo "no" >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $inc_path$lua_suf" >&5 -$as_echo_n "checking if lua.h can be found in $inc_path$lua_suf... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $inc_path$lua_suf" >&5 +printf %s "checking if lua.h can be found in $inc_path$lua_suf... " >&6; } if test -f "$inc_path$lua_suf/lua.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } LUA_INC=$lua_suf else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } vi_cv_path_lua_pfx= fi fi @@ -5707,29 +5931,30 @@ $as_echo "no" >&6; } if test "$enable_luainterp" = "dynamic"; then lua_ok="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if link with ${LUA_LIBS} is sane" >&5 -$as_echo_n "checking if link with ${LUA_LIBS} is sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if link with ${LUA_LIBS} is sane" >&5 +printf %s "checking if link with ${LUA_LIBS} is sane... " >&6; } libs_save=$LIBS LIBS="$LIBS $LUA_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; lua_ok="yes" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; lua_ok="no"; LUA_LIBS="" +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; lua_ok="yes" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; lua_ok="no"; LUA_LIBS="" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$libs_save fi @@ -5738,7 +5963,7 @@ rm -f core conftest.err conftest.$ac_objext \ LUA_SRC="if_lua.c" LUA_OBJ="objects/if_lua.o" LUA_PRO="if_lua.pro" - $as_echo "#define FEAT_LUA 1" >>confdefs.h + printf "%s\n" "#define FEAT_LUA 1" >>confdefs.h fi if test "$enable_luainterp" = "dynamic"; then @@ -5759,8 +5984,8 @@ rm -f core conftest.err conftest.$ac_objext \ lib_multiarch="lib/${multiarch}" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx" >&5 -$as_echo_n "checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx" >&5 +printf %s "checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua_pfx... " >&6; } for subdir in "${lib_multiarch}" lib64 lib; do if test -z "$subdir"; then continue @@ -5777,18 +6002,18 @@ $as_echo_n "checking if liblua${luajit}*.${ext}* can be found in $vi_cv_path_lua sover="" done if test "X$sover" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } lua_ok="no" vi_cv_dll_name_lua="liblua${luajit}.${ext}" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } lua_ok="yes" vi_cv_dll_name_lua="liblua${luajit}${sover}$sover2" fi fi - $as_echo "#define DYNAMIC_LUA 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_LUA 1" >>confdefs.h LUA_LIBS="" LUA_CFLAGS="-DDYNAMIC_LUA_DLL=\\\"${vi_cv_dll_name_lua}\\\" $LUA_CFLAGS" @@ -5796,15 +6021,15 @@ $as_echo "yes" >&6; } # MacVim patch to hack in a different default dynamic lib path for # arm64. We don't test that it links here so this has to be binary # compatible with DYNAMIC_LUA_DLL - { $as_echo "$as_me:${as_lineno-$LINENO}: checking liblua${luajit}*.${ext}* (arm64)" >&5 -$as_echo_n "checking liblua${luajit}*.${ext}* (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking liblua${luajit}*.${ext}* (arm64)" >&5 +printf %s "checking liblua${luajit}*.${ext}* (arm64)... " >&6; } if test -n "${vi_cv_dll_name_lua_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_lua_arm64}" >&5 -$as_echo "${vi_cv_dll_name_lua_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_lua_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_lua_arm64}" >&6; } LUA_CFLAGS+=" -DDYNAMIC_LUA_DLL_ARM64=\\\"${vi_cv_dll_name_lua_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } fi fi if test "X$LUA_CFLAGS$LUA_LIBS" != "X" && \ @@ -5825,31 +6050,33 @@ $as_echo "" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-mzschemeinterp argument" >&5 -$as_echo_n "checking --enable-mzschemeinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-mzschemeinterp argument" >&5 +printf %s "checking --enable-mzschemeinterp argument... " >&6; } # Check whether --enable-mzschemeinterp was given. -if test "${enable_mzschemeinterp+set}" = set; then : +if test ${enable_mzschemeinterp+y} +then : enableval=$enable_mzschemeinterp; -else +else $as_nop enable_mzschemeinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_mzschemeinterp" >&5 -$as_echo "$enable_mzschemeinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_mzschemeinterp" >&5 +printf "%s\n" "$enable_mzschemeinterp" >&6; } if test "$enable_mzschemeinterp" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-plthome argument" >&5 -$as_echo_n "checking --with-plthome argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-plthome argument" >&5 +printf %s "checking --with-plthome argument... " >&6; } # Check whether --with-plthome was given. -if test "${with_plthome+set}" = set; then : - withval=$with_plthome; with_plthome="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_plthome" >&5 -$as_echo "$with_plthome" >&6; } -else - with_plthome="";{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 -$as_echo "\"no\"" >&6; } +if test ${with_plthome+y} +then : + withval=$with_plthome; with_plthome="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_plthome" >&5 +printf "%s\n" "$with_plthome" >&6; } +else $as_nop + with_plthome="";{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"no\"" >&5 +printf "%s\n" "\"no\"" >&6; } fi @@ -5857,23 +6084,24 @@ fi vi_cv_path_mzscheme_pfx="$with_plthome" vi_cv_path_mzscheme="${vi_cv_path_mzscheme_pfx}/bin/mzscheme" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking PLTHOME environment var" >&5 -$as_echo_n "checking PLTHOME environment var... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PLTHOME environment var" >&5 +printf %s "checking PLTHOME environment var... " >&6; } if test "X$PLTHOME" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$PLTHOME\"" >&5 -$as_echo "\"$PLTHOME\"" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$PLTHOME\"" >&5 +printf "%s\n" "\"$PLTHOME\"" >&6; } vi_cv_path_mzscheme_pfx="$PLTHOME" vi_cv_path_mzscheme="${vi_cv_path_mzscheme_pfx}/bin/mzscheme" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } # Extract the first word of "mzscheme", so it can be a program name with args. set dummy mzscheme; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_mzscheme+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_mzscheme+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_mzscheme in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_mzscheme="$vi_cv_path_mzscheme" # Let the user override the test with a path. @@ -5883,11 +6111,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_mzscheme="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_mzscheme="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5899,11 +6131,11 @@ esac fi vi_cv_path_mzscheme=$ac_cv_path_vi_cv_path_mzscheme if test -n "$vi_cv_path_mzscheme"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme" >&5 -$as_echo "$vi_cv_path_mzscheme" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme" >&5 +printf "%s\n" "$vi_cv_path_mzscheme" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -5916,11 +6148,12 @@ fi fi if test "X$vi_cv_path_mzscheme" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5 -$as_echo_n "checking MzScheme install prefix... " >&6; } -if ${vi_cv_path_mzscheme_pfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking MzScheme install prefix" >&5 +printf %s "checking MzScheme install prefix... " >&6; } +if test ${vi_cv_path_mzscheme_pfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop echo "(display (simplify-path \ (build-path (call-with-values \ (lambda () (split-path (find-system-path (quote exec-file)))) \ @@ -5928,68 +6161,68 @@ else vi_cv_path_mzscheme_pfx=`${vi_cv_path_mzscheme} -r mzdirs.scm | \ sed -e 's+/$++'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme_pfx" >&5 -$as_echo "$vi_cv_path_mzscheme_pfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_mzscheme_pfx" >&5 +printf "%s\n" "$vi_cv_path_mzscheme_pfx" >&6; } rm -f mzdirs.scm fi fi fi if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket include directory" >&5 -$as_echo_n "checking for racket include directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket include directory" >&5 +printf %s "checking for racket include directory... " >&6; } SCHEME_INC=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-include-dir))) (when (path? p) (display p)))'` if test "X$SCHEME_INC" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_INC}" >&5 -$as_echo "${SCHEME_INC}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_INC}" >&5 +printf "%s\n" "${SCHEME_INC}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 -$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 +printf %s "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 -$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 +printf %s "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 -$as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 +printf %s "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5 -$as_echo_n "checking if scheme.h can be found in /usr/include/plt/... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/plt/" >&5 +printf %s "checking if scheme.h can be found in /usr/include/plt/... " >&6; } if test -f /usr/include/plt/scheme.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=/usr/include/plt else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5 -$as_echo_n "checking if scheme.h can be found in /usr/include/racket/... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in /usr/include/racket/" >&5 +printf %s "checking if scheme.h can be found in /usr/include/racket/... " >&6; } if test -f /usr/include/racket/scheme.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } SCHEME_INC=/usr/include/racket else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } vi_cv_path_mzscheme_pfx= fi fi @@ -6001,15 +6234,15 @@ $as_echo "no" >&6; } if test "X$vi_cv_path_mzscheme_pfx" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket lib directory" >&5 -$as_echo_n "checking for racket lib directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket lib directory" >&5 +printf %s "checking for racket lib directory... " >&6; } SCHEME_LIB=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-lib-dir))) (when (path? p) (display p)))'` if test "X$SCHEME_LIB" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_LIB}" >&5 -$as_echo "${SCHEME_LIB}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_LIB}" >&5 +printf "%s\n" "${SCHEME_LIB}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do @@ -6058,32 +6291,32 @@ $as_echo "not found" >&6; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if racket requires -pthread" >&5 -$as_echo_n "checking if racket requires -pthread... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if racket requires -pthread" >&5 +printf %s "checking if racket requires -pthread... " >&6; } if test "X$SCHEME_LIB" != "X" && $FGREP -e -pthread "$SCHEME_LIB/buildinfo" >/dev/null ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MZSCHEME_LIBS="${MZSCHEME_LIBS} -pthread" MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -pthread" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket config directory" >&5 -$as_echo_n "checking for racket config directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket config directory" >&5 +printf %s "checking for racket config directory... " >&6; } SCHEME_CONFIGDIR=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-config-dir))) (when (path? p) (display p)))'` if test "X$SCHEME_CONFIGDIR" != "X"; then MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DMZSCHEME_CONFIGDIR='\"${SCHEME_CONFIGDIR}\"'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_CONFIGDIR}" >&5 -$as_echo "${SCHEME_CONFIGDIR}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_CONFIGDIR}" >&5 +printf "%s\n" "${SCHEME_CONFIGDIR}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 -$as_echo_n "checking for racket collects directory... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 +printf %s "checking for racket collects directory... " >&6; } SCHEME_COLLECTS=`${vi_cv_path_mzscheme} -e '(require setup/dirs)(let ((p (find-collects-dir))) (when (path? p) (let-values (((base _1 _2) (split-path p))) (display base))))'` if test "X$SCHEME_COLLECTS" = "X"; then if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then @@ -6103,15 +6336,15 @@ $as_echo_n "checking for racket collects directory... " >&6; } fi fi if test "X$SCHEME_COLLECTS" != "X" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_COLLECTS}" >&5 -$as_echo "${SCHEME_COLLECTS}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_COLLECTS}" >&5 +printf "%s\n" "${SCHEME_COLLECTS}" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mzscheme_base.c" >&5 -$as_echo_n "checking for mzscheme_base.c... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mzscheme_base.c" >&5 +printf %s "checking for mzscheme_base.c... " >&6; } if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then MZSCHEME_EXTRA="mzscheme_base.c" MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc" @@ -6131,18 +6364,19 @@ $as_echo_n "checking for mzscheme_base.c... " >&6; } fi if test "X$MZSCHEME_EXTRA" != "X" ; then MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: needed" >&5 -$as_echo "needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: needed" >&5 +printf "%s\n" "needed" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not needed" >&5 -$as_echo "not needed" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not needed" >&5 +printf "%s\n" "not needed" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5 -$as_echo_n "checking for ffi_type_void in -lffi... " >&6; } -if ${ac_cv_lib_ffi_ffi_type_void+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ffi_type_void in -lffi" >&5 +printf %s "checking for ffi_type_void in -lffi... " >&6; } +if test ${ac_cv_lib_ffi_ffi_type_void+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lffi $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6151,30 +6385,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char ffi_type_void (); int -main () +main (void) { return ffi_type_void (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ffi_ffi_type_void=yes -else +else $as_nop ac_cv_lib_ffi_ffi_type_void=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5 -$as_echo "$ac_cv_lib_ffi_ffi_type_void" >&6; } -if test "x$ac_cv_lib_ffi_ffi_type_void" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffi_ffi_type_void" >&5 +printf "%s\n" "$ac_cv_lib_ffi_ffi_type_void" >&6; } +if test "x$ac_cv_lib_ffi_ffi_type_void" = xyes +then : MZSCHEME_LIBS="$MZSCHEME_LIBS -lffi" fi @@ -6182,8 +6415,8 @@ fi MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \ -DMZSCHEME_COLLECTS='\"${SCHEME_COLLECTS}collects\"'" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for MzScheme are sane" >&5 -$as_echo_n "checking if compile and link flags for MzScheme are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for MzScheme are sane" >&5 +printf %s "checking if compile and link flags for MzScheme are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $MZSCHEME_CFLAGS" @@ -6192,21 +6425,22 @@ $as_echo_n "checking if compile and link flags for MzScheme are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; mzs_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: MZSCHEME DISABLED" >&5 -$as_echo "no: MZSCHEME DISABLED" >&6; }; mzs_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; mzs_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: MZSCHEME DISABLED" >&5 +printf "%s\n" "no: MZSCHEME DISABLED" >&6; }; mzs_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -6214,7 +6448,7 @@ rm -f core conftest.err conftest.$ac_objext \ MZSCHEME_SRC="if_mzsch.c" MZSCHEME_OBJ="objects/if_mzsch.o" MZSCHEME_PRO="if_mzsch.pro" - $as_echo "#define FEAT_MZSCHEME 1" >>confdefs.h + printf "%s\n" "#define FEAT_MZSCHEME 1" >>confdefs.h else MZSCHEME_CFLAGS= @@ -6233,17 +6467,18 @@ rm -f core conftest.err conftest.$ac_objext \ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-perlinterp argument" >&5 -$as_echo_n "checking --enable-perlinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-perlinterp argument" >&5 +printf %s "checking --enable-perlinterp argument... " >&6; } # Check whether --enable-perlinterp was given. -if test "${enable_perlinterp+set}" = set; then : +if test ${enable_perlinterp+y} +then : enableval=$enable_perlinterp; -else +else $as_nop enable_perlinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5 -$as_echo "$enable_perlinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5 +printf "%s\n" "$enable_perlinterp" >&6; } if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Perl with tiny features" "$LINENO" 5 @@ -6251,11 +6486,12 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_perl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_perl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_perl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_perl="$vi_cv_path_perl" # Let the user override the test with a path. @@ -6265,11 +6501,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_perl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_perl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6281,17 +6521,17 @@ esac fi vi_cv_path_perl=$ac_cv_path_vi_cv_path_perl if test -n "$vi_cv_path_perl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_perl" >&5 -$as_echo "$vi_cv_path_perl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_perl" >&5 +printf "%s\n" "$vi_cv_path_perl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_perl" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Perl version" >&5 -$as_echo_n "checking Perl version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Perl version" >&5 +printf %s "checking Perl version... " >&6; } if $vi_cv_path_perl -e 'require 5.003_01' >/dev/null 2>/dev/null; then eval `$vi_cv_path_perl -V:usethreads` eval `$vi_cv_path_perl -V:libperl` @@ -6304,18 +6544,18 @@ $as_echo_n "checking Perl version... " >&6; } badthreads=no else badthreads=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5 -$as_echo ">>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&5 +printf "%s\n" ">>> Perl > 5.6 with 5.5 threads cannot be used <<<" >&6; } fi else badthreads=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> Perl 5.5 with threads cannot be used <<<" >&5 -$as_echo ">>> Perl 5.5 with threads cannot be used <<<" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >>> Perl 5.5 with threads cannot be used <<<" >&5 +printf "%s\n" ">>> Perl 5.5 with threads cannot be used <<<" >&6; } fi fi if test $badthreads = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +printf "%s\n" "OK" >&6; } eval `$vi_cv_path_perl -V:shrpenv` if test "X$shrpenv" = "XUNKNOWN"; then # pre 5.003_04 shrpenv="" @@ -6349,8 +6589,8 @@ $as_echo "OK" >&6; } perlcppflags=`echo "$perlcppflags" | sed -e 's/-arch[^-]*//g'` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Perl are sane" >&5 -$as_echo_n "checking if compile and link flags for Perl are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Perl are sane" >&5 +printf %s "checking if compile and link flags for Perl are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS ldflags_save=$LDFLAGS @@ -6362,21 +6602,22 @@ $as_echo_n "checking if compile and link flags for Perl are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; perl_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: PERL DISABLED" >&5 -$as_echo "no: PERL DISABLED" >&6; }; perl_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; perl_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: PERL DISABLED" >&5 +printf "%s\n" "no: PERL DISABLED" >&6; }; perl_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -6394,13 +6635,13 @@ rm -f core conftest.err conftest.$ac_objext \ PERL_SRC="auto/if_perl.c if_perlsfio.c" PERL_OBJ="objects/if_perl.o objects/if_perlsfio.o" PERL_PRO="if_perl.pro if_perlsfio.pro" - $as_echo "#define FEAT_PERL 1" >>confdefs.h + printf "%s\n" "#define FEAT_PERL 1" >>confdefs.h fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 -$as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: >>> too old; need Perl version 5.003_01 or later <<<" >&5 +printf "%s\n" ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi fi @@ -6427,15 +6668,17 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "$enable_perlinterp" = "dynamic"; then if test "$perl_ok" = "yes" -a "X$libperl" != "X"; then - $as_echo "#define DYNAMIC_PERL 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PERL 1" >>confdefs.h - if ${vi_cv_dll_name_perl+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_dll_name_perl+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_dll_name_perl="$libperl" fi PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$vi_cv_dll_name_perl\\\" $PERL_CFLAGS" + PERL_LIBS="" fi fi @@ -6451,33 +6694,35 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-pythoninterp argument" >&5 -$as_echo_n "checking --enable-pythoninterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-pythoninterp argument" >&5 +printf %s "checking --enable-pythoninterp argument... " >&6; } # Check whether --enable-pythoninterp was given. -if test "${enable_pythoninterp+set}" = set; then : +if test ${enable_pythoninterp+y} +then : enableval=$enable_pythoninterp; -else +else $as_nop enable_pythoninterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 -$as_echo "$enable_pythoninterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 +printf "%s\n" "$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Python with tiny features" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python-command argument" >&5 -$as_echo_n "checking --with-python-command argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-python-command argument" >&5 +printf %s "checking --with-python-command argument... " >&6; } # Check whether --with-python-command was given. -if test "${with_python_command+set}" = set; then : - withval=$with_python_command; vi_cv_path_python="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 -$as_echo "$vi_cv_path_python" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_python_command+y} +then : + withval=$with_python_command; vi_cv_path_python="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 +printf "%s\n" "$vi_cv_path_python" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6486,11 +6731,12 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_python+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_python+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_python in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_python="$vi_cv_path_python" # Let the user override the test with a path. @@ -6500,11 +6746,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_python="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_python="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6516,11 +6766,11 @@ esac fi vi_cv_path_python=$ac_cv_path_vi_cv_path_python if test -n "$vi_cv_path_python"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 -$as_echo "$vi_cv_path_python" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python" >&5 +printf "%s\n" "$vi_cv_path_python" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6530,54 +6780,58 @@ done fi if test "X$vi_cv_path_python" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 -$as_echo_n "checking Python version... " >&6; } -if ${vi_cv_var_python_version+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 +printf %s "checking Python version... " >&6; } +if test ${vi_cv_var_python_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python_version=` ${vi_cv_path_python} -c 'import sys; print sys.version[:3]'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python_version" >&5 -$as_echo "$vi_cv_var_python_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python_version" >&5 +printf "%s\n" "$vi_cv_var_python_version" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python is 2.3 or better" >&5 -$as_echo_n "checking Python is 2.3 or better... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python is 2.3 or better" >&5 +printf %s "checking Python is 2.3 or better... " >&6; } if ${vi_cv_path_python} -c \ "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)" then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yep" >&5 -$as_echo "yep" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yep" >&5 +printf "%s\n" "yep" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 -$as_echo_n "checking Python's install prefix... " >&6; } -if ${vi_cv_path_python_pfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 +printf %s "checking Python's install prefix... " >&6; } +if test ${vi_cv_path_python_pfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python_pfx=` ${vi_cv_path_python} -c \ "import sys; print sys.prefix"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_pfx" >&5 -$as_echo "$vi_cv_path_python_pfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_pfx" >&5 +printf "%s\n" "$vi_cv_path_python_pfx" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 -$as_echo_n "checking Python's execution prefix... " >&6; } -if ${vi_cv_path_python_epfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 +printf %s "checking Python's execution prefix... " >&6; } +if test ${vi_cv_path_python_epfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python_epfx=` ${vi_cv_path_python} -c \ "import sys; print sys.exec_prefix"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_epfx" >&5 -$as_echo "$vi_cv_path_python_epfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_epfx" >&5 +printf "%s\n" "$vi_cv_path_python_epfx" >&6; } - if ${vi_cv_path_pythonpath+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_pythonpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_pythonpath=` unset PYTHONPATH; ${vi_cv_path_python} -c \ @@ -6588,16 +6842,18 @@ fi # Check whether --with-python-config-dir was given. -if test "${with_python_config_dir+set}" = set; then : +if test ${with_python_config_dir+y} +then : withval=$with_python_config_dir; vi_cv_path_python_conf="${withval}"; have_python_config_dir=1 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 -$as_echo_n "checking Python's configuration directory... " >&6; } -if ${vi_cv_path_python_conf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 +printf %s "checking Python's configuration directory... " >&6; } +if test ${vi_cv_path_python_conf+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python_conf= d=`${vi_cv_path_python} -c "import distutils.sysconfig; print distutils.sysconfig.get_config_var('LIBPL')"` @@ -6615,19 +6871,20 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5 -$as_echo "$vi_cv_path_python_conf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python_conf" >&5 +printf "%s\n" "$vi_cv_path_python_conf" >&6; } PYTHON_CONFDIR="${vi_cv_path_python_conf}" if test "X$PYTHON_CONFDIR" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 -$as_echo "can't find it!" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 +printf "%s\n" "can't find it!" >&6; } else - if ${vi_cv_path_python_plibs+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_python_plibs+y} +then : + printf %s "(cached) " >&6 +else $as_nop pwd=`pwd` tmp_mkf="$pwd/config-PyMake$$" @@ -6670,11 +6927,12 @@ eof fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's dll name" >&5 -$as_echo_n "checking Python's dll name... " >&6; } -if ${vi_cv_dll_name_python+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's dll name" >&5 +printf %s "checking Python's dll name... " >&6; } +if test ${vi_cv_dll_name_python+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "X$python_DLLLIBRARY" != "X"; then vi_cv_dll_name_python="$python_DLLLIBRARY" @@ -6683,8 +6941,8 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python" >&5 -$as_echo "$vi_cv_dll_name_python" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python" >&5 +printf "%s\n" "$vi_cv_dll_name_python" >&6; } PYTHON_LIBS="${vi_cv_path_python_plibs}" if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then @@ -6699,8 +6957,8 @@ $as_echo "$vi_cv_dll_name_python" >&6; } PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 -$as_echo_n "checking if -pthread should be used... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 +printf %s "checking if -pthread should be used... " >&6; } threadsafe_flag= thread_lib= if test "$vim_cv_uname_output" != Darwin; then @@ -6722,27 +6980,28 @@ $as_echo_n "checking if -pthread should be used... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; LIBS=$libs_save_old +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; PYTHON_CFLAGS="$PYTHON_CFLAGS $threadsafe_flag" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$libs_save_old fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test -n "$MACSDK"; then @@ -6752,8 +7011,8 @@ $as_echo "no" >&6; } PYTHON_GETPATH_CFLAGS= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 -$as_echo_n "checking if compile and link flags for Python are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 +printf %s "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON_CFLAGS" @@ -6762,26 +7021,27 @@ $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; python_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: PYTHON DISABLED" >&5 -$as_echo "no: PYTHON DISABLED" >&6; }; python_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; python_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: PYTHON DISABLED" >&5 +printf "%s\n" "no: PYTHON DISABLED" >&6; }; python_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save if test $python_ok = yes; then - $as_echo "#define FEAT_PYTHON 1" >>confdefs.h + printf "%s\n" "#define FEAT_PYTHON 1" >>confdefs.h else LIBS=$libs_save_old @@ -6792,8 +7052,8 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old" >&5 -$as_echo "too old" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old" >&5 +printf "%s\n" "too old" >&6; } fi fi @@ -6809,33 +7069,35 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-python3interp argument" >&5 -$as_echo_n "checking --enable-python3interp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-python3interp argument" >&5 +printf %s "checking --enable-python3interp argument... " >&6; } # Check whether --enable-python3interp was given. -if test "${enable_python3interp+set}" = set; then : +if test ${enable_python3interp+y} +then : enableval=$enable_python3interp; -else +else $as_nop enable_python3interp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 -$as_echo "$enable_python3interp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 +printf "%s\n" "$enable_python3interp" >&6; } if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Python with tiny features" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python3-command argument" >&5 -$as_echo_n "checking --with-python3-command argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-python3-command argument" >&5 +printf %s "checking --with-python3-command argument... " >&6; } # Check whether --with-python3-command was given. -if test "${with_python3_command+set}" = set; then : - withval=$with_python3_command; vi_cv_path_python3="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 -$as_echo "$vi_cv_path_python3" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_python3_command+y} +then : + withval=$with_python3_command; vi_cv_path_python3="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 +printf "%s\n" "$vi_cv_path_python3" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6844,11 +7106,12 @@ fi do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_python3+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_python3+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_python3 in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_python3="$vi_cv_path_python3" # Let the user override the test with a path. @@ -6858,11 +7121,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_python3="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_python3="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6874,11 +7141,11 @@ esac fi vi_cv_path_python3=$ac_cv_path_vi_cv_path_python3 if test -n "$vi_cv_path_python3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 -$as_echo "$vi_cv_path_python3" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3" >&5 +printf "%s\n" "$vi_cv_path_python3" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -6888,43 +7155,46 @@ done fi if test "X$vi_cv_path_python3" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 -$as_echo_n "checking Python version... " >&6; } -if ${vi_cv_var_python3_version+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python version" >&5 +printf %s "checking Python version... " >&6; } +if test ${vi_cv_var_python3_version+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python3_version=` ${vi_cv_path_python3} -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))'` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5 -$as_echo "$vi_cv_var_python3_version" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_version" >&5 +printf "%s\n" "$vi_cv_var_python3_version" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python is 3.0 or better" >&5 -$as_echo_n "checking Python is 3.0 or better... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python is 3.0 or better" >&5 +printf %s "checking Python is 3.0 or better... " >&6; } if ${vi_cv_path_python3} -c \ "import sys; sys.exit(${vi_cv_var_python3_version} < 3.0)" then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yep" >&5 -$as_echo "yep" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yep" >&5 +printf "%s\n" "yep" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python3-stable-abi argument" >&5 -$as_echo_n "checking --with-python3-stable-abi argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-python3-stable-abi argument" >&5 +printf %s "checking --with-python3-stable-abi argument... " >&6; } # Check whether --with-python3-stable-abi was given. -if test "${with_python3_stable_abi+set}" = set; then : - withval=$with_python3_stable_abi; vi_cv_var_python3_stable_abi="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_stable_abi" >&5 -$as_echo "$vi_cv_var_python3_stable_abi" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_python3_stable_abi+y} +then : + withval=$with_python3_stable_abi; vi_cv_var_python3_stable_abi="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_stable_abi" >&5 +printf "%s\n" "$vi_cv_var_python3_stable_abi" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_var_python3_stable_abi" != "X"; then - if ${vi_cv_var_python3_stable_abi_hex+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_var_python3_stable_abi_hex+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python3_stable_abi_hex=` ${vi_cv_path_python3} -c \ @@ -6936,11 +7206,12 @@ fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5 -$as_echo_n "checking Python's abiflags... " >&6; } -if ${vi_cv_var_python3_abiflags+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's abiflags" >&5 +printf %s "checking Python's abiflags... " >&6; } +if test ${vi_cv_var_python3_abiflags+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_var_python3_abiflags= if ${vi_cv_path_python3} -c \ @@ -6950,37 +7221,66 @@ else "import sys; print(sys.abiflags)"` fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_abiflags" >&5 -$as_echo "$vi_cv_var_python3_abiflags" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_var_python3_abiflags" >&5 +printf "%s\n" "$vi_cv_var_python3_abiflags" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 -$as_echo_n "checking Python's install prefix... " >&6; } -if ${vi_cv_path_python3_pfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's install prefix" >&5 +printf %s "checking Python's install prefix... " >&6; } +if test ${vi_cv_path_python3_pfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3_pfx=` ${vi_cv_path_python3} -c \ "import sys; print(sys.prefix)"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_pfx" >&5 -$as_echo "$vi_cv_path_python3_pfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_pfx" >&5 +printf "%s\n" "$vi_cv_path_python3_pfx" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 -$as_echo_n "checking Python's execution prefix... " >&6; } -if ${vi_cv_path_python3_epfx+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's execution prefix" >&5 +printf %s "checking Python's execution prefix... " >&6; } +if test ${vi_cv_path_python3_epfx+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3_epfx=` ${vi_cv_path_python3} -c \ "import sys; print(sys.exec_prefix)"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_epfx" >&5 -$as_echo "$vi_cv_path_python3_epfx" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_epfx" >&5 +printf "%s\n" "$vi_cv_path_python3_epfx" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's include path" >&5 +printf %s "checking Python's include path... " >&6; } +if test ${vi_cv_path_python3_include+y} +then : + printf %s "(cached) " >&6 +else $as_nop + vi_cv_path_python3_include=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"include\"))"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_include" >&5 +printf "%s\n" "$vi_cv_path_python3_include" >&6; } + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's include path" >&5 +printf %s "checking Python's include path... " >&6; } +if test ${vi_cv_path_python3_platinclude+y} +then : + printf %s "(cached) " >&6 +else $as_nop + vi_cv_path_python3_platinclude=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"platinclude\"))"` +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_platinclude" >&5 +printf "%s\n" "$vi_cv_path_python3_platinclude" >&6; } - if ${vi_cv_path_python3path+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_python3path+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3path=` unset PYTHONPATH; ${vi_cv_path_python3} -c \ @@ -6991,16 +7291,18 @@ fi # Check whether --with-python3-config-dir was given. -if test "${with_python3_config_dir+set}" = set; then : +if test ${with_python3_config_dir+y} +then : withval=$with_python3_config_dir; vi_cv_path_python3_conf="${withval}"; have_python3_config_dir=1 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 -$as_echo_n "checking Python's configuration directory... " >&6; } -if ${vi_cv_path_python3_conf+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python's configuration directory" >&5 +printf %s "checking Python's configuration directory... " >&6; } +if test ${vi_cv_path_python3_conf+y} +then : + printf %s "(cached) " >&6 +else $as_nop vi_cv_path_python3_conf= config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" @@ -7022,19 +7324,20 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5 -$as_echo "$vi_cv_path_python3_conf" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_python3_conf" >&5 +printf "%s\n" "$vi_cv_path_python3_conf" >&6; } PYTHON3_CONFDIR="${vi_cv_path_python3_conf}" if test "X$PYTHON3_CONFDIR" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 -$as_echo "can't find it!" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't find it!" >&5 +printf "%s\n" "can't find it!" >&6; } else - if ${vi_cv_path_python3_plibs+:} false; then : - $as_echo_n "(cached) " >&6 -else + if test ${vi_cv_path_python3_plibs+y} +then : + printf %s "(cached) " >&6 +else $as_nop pwd=`pwd` tmp_mkf="$pwd/config-PyMake$$" @@ -7056,11 +7359,12 @@ eof fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name" >&5 -$as_echo_n "checking Python3's dll name... " >&6; } -if ${vi_cv_dll_name_python3+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python3's dll name" >&5 +printf %s "checking Python3's dll name... " >&6; } +if test ${vi_cv_dll_name_python3+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test "X$python3_DLLLIBRARY" != "X"; then vi_cv_dll_name_python3="$python3_DLLLIBRARY" @@ -7071,14 +7375,14 @@ else fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python3" >&5 -$as_echo "$vi_cv_dll_name_python3" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_dll_name_python3" >&5 +printf "%s\n" "$vi_cv_dll_name_python3" >&6; } PYTHON3_LIBS="${vi_cv_path_python3_plibs}" - if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + if test "${vi_cv_path_python3_include}" = "${vi_cv_path_python3_platinclude}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include}" else - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include} -I${vi_cv_path_python3_platinclude}" fi if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'" @@ -7089,8 +7393,8 @@ $as_echo "$vi_cv_dll_name_python3" >&6; } PYTHON3_SRC="if_python3.c" PYTHON3_OBJ="objects/if_python3.o" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 -$as_echo_n "checking if -pthread should be used... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -pthread should be used" >&5 +printf %s "checking if -pthread should be used... " >&6; } threadsafe_flag= thread_lib= if test "$vim_cv_uname_output" != Darwin; then @@ -7112,31 +7416,32 @@ $as_echo_n "checking if -pthread should be used... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; PYTHON3_CFLAGS="$PYTHON3_CFLAGS $threadsafe_flag" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; LIBS=$libs_save_old +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; PYTHON3_CFLAGS="$PYTHON3_CFLAGS $threadsafe_flag" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$libs_save_old fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python 3 are sane" >&5 -$as_echo_n "checking if compile and link flags for Python 3 are sane... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python 3 are sane" >&5 +printf %s "checking if compile and link flags for Python 3 are sane... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" @@ -7145,26 +7450,27 @@ $as_echo_n "checking if compile and link flags for Python 3 are sane... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; python3_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no: PYTHON3 DISABLED" >&5 -$as_echo "no: PYTHON3 DISABLED" >&6; }; python3_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; python3_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no: PYTHON3 DISABLED" >&5 +printf "%s\n" "no: PYTHON3 DISABLED" >&6; }; python3_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save if test "$python3_ok" = yes; then - $as_echo "#define FEAT_PYTHON3 1" >>confdefs.h + printf "%s\n" "#define FEAT_PYTHON3 1" >>confdefs.h else LIBS=$libs_save_old @@ -7175,8 +7481,8 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old" >&5 -$as_echo "too old" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old" >&5 +printf "%s\n" "too old" >&6; } fi fi if test "$fail_if_missing" = "yes" -a "$python3_ok" != "yes"; then @@ -7192,35 +7498,37 @@ fi # Check whether --with-properly-linked-python2-python3 was given. -if test "${with_properly_linked_python2_python3+set}" = set; then : +if test ${with_properly_linked_python2_python3+y} +then : withval=$with_properly_linked_python2_python3; vi_cv_with_properly_linked_python2_python3="yes" -else +else $as_nop vi_cv_with_properly_linked_python2_python3="no" fi if test "$python_ok" = yes && test "$python3_ok" = yes; then - $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON 1" >>confdefs.h - $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON3 1" >>confdefs.h if test "X$vi_cv_var_python3_stable_abi_hex" != "X"; then - $as_echo "#define DYNAMIC_PYTHON3_STABLE_ABI 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON3_STABLE_ABI 1" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python" >&5 -$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python" >&5 +printf %s "checking whether we can do without RTLD_GLOBAL for Python... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON_CFLAGS" libs_save=$LIBS LIBS="-ldl $LIBS" if test "x$MACOS_X" != "xyes"; then - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7258,13 +7566,14 @@ else return !not_needed; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };$as_echo "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };printf "%s\n" "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7274,18 +7583,19 @@ fi CFLAGS=$cflags_save LIBS=$libs_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5 -$as_echo_n "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we can do without RTLD_GLOBAL for Python3" >&5 +printf %s "checking whether we can do without RTLD_GLOBAL for Python3... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $PYTHON3_CFLAGS" libs_save=$LIBS LIBS="-ldl $LIBS" - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run test program while cross compiling See \`config.log' for more details" "$LINENO" 5; } -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7324,13 +7634,14 @@ else return !not_needed; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; };$as_echo "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; };printf "%s\n" "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -7339,9 +7650,9 @@ fi fi if test "$vi_cv_with_properly_linked_python2_python3" = "yes"; then - $as_echo "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h + printf "%s\n" "#define PY_NO_RTLD_GLOBAL 1" >>confdefs.h - $as_echo "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h + printf "%s\n" "#define PY3_NO_RTLD_GLOBAL 1" >>confdefs.h fi @@ -7360,26 +7671,26 @@ fi # MacVim patch to hack in a different default dynamic lib path for arm64. # We don't test that it links here so this has to be binary compatible with # DYNAMIC_PYTHON3_DLL - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 -$as_echo_n "checking Python3's dll name (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 +printf %s "checking Python3's dll name (arm64)... " >&6; } if test -n "${vi_cv_dll_name_python3_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 -$as_echo "${vi_cv_dll_name_python3_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_python3_arm64}" >&6; } PYTHON3_CFLAGS+=" -DDYNAMIC_PYTHON3_DLL_ARM64=\\\"${vi_cv_dll_name_python3_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } fi elif test "$python_ok" = yes && test "$enable_pythoninterp" = "dynamic"; then - $as_echo "#define DYNAMIC_PYTHON 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON 1" >>confdefs.h PYTHON_SRC="if_python.c" PYTHON_OBJ="objects/if_python.o" PYTHON_CFLAGS="$PYTHON_CFLAGS -DDYNAMIC_PYTHON_DLL=\\\"${vi_cv_dll_name_python}\\\"" PYTHON_LIBS= elif test "$python_ok" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5 -$as_echo_n "checking if -fPIE can be added for Python... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python" >&5 +printf %s "checking if -fPIE can be added for Python... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON_CFLAGS -fPIE" @@ -7388,21 +7699,22 @@ $as_echo_n "checking if -fPIE can be added for Python... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; fpie_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; fpie_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; fpie_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; fpie_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -7410,10 +7722,10 @@ rm -f core conftest.err conftest.$ac_objext \ PYTHON_CFLAGS="$PYTHON_CFLAGS -fPIE" fi elif test "$python3_ok" = yes && test "$enable_python3interp" = "dynamic"; then - $as_echo "#define DYNAMIC_PYTHON3 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON3 1" >>confdefs.h if test "X$vi_cv_var_python3_stable_abi_hex" != "X"; then - $as_echo "#define DYNAMIC_PYTHON3_STABLE_ABI 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_PYTHON3_STABLE_ABI 1" >>confdefs.h fi PYTHON3_SRC="if_python3.c" @@ -7424,19 +7736,19 @@ elif test "$python3_ok" = yes && test "$enable_python3interp" = "dynamic"; then # MacVim patch to hack in a different default dynamic lib path for arm64. # We don't test that it links here so this has to be binary compatible with # DYNAMIC_PYTHON3_DLL - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 -$as_echo_n "checking Python3's dll name (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Python3's dll name (arm64)" >&5 +printf %s "checking Python3's dll name (arm64)... " >&6; } if test -n "${vi_cv_dll_name_python3_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 -$as_echo "${vi_cv_dll_name_python3_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_python3_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_python3_arm64}" >&6; } PYTHON3_CFLAGS+=" -DDYNAMIC_PYTHON3_DLL_ARM64=\\\"${vi_cv_dll_name_python3_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } fi elif test "$python3_ok" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5 -$as_echo_n "checking if -fPIE can be added for Python3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if -fPIE can be added for Python3" >&5 +printf %s "checking if -fPIE can be added for Python3... " >&6; } cflags_save=$CFLAGS libs_save=$LIBS CFLAGS="$CFLAGS $PYTHON3_CFLAGS -fPIE" @@ -7445,21 +7757,22 @@ $as_echo_n "checking if -fPIE can be added for Python3... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; fpie_ok=yes -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; fpie_ok=no +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; fpie_ok=yes +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; fpie_ok=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save @@ -7468,39 +7781,42 @@ rm -f core conftest.err conftest.$ac_objext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5 -$as_echo_n "checking --enable-tclinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-tclinterp argument" >&5 +printf %s "checking --enable-tclinterp argument... " >&6; } # Check whether --enable-tclinterp was given. -if test "${enable_tclinterp+set}" = set; then : +if test ${enable_tclinterp+y} +then : enableval=$enable_tclinterp; -else +else $as_nop enable_tclinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_tclinterp" >&5 -$as_echo "$enable_tclinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_tclinterp" >&5 +printf "%s\n" "$enable_tclinterp" >&6; } if test "$enable_tclinterp" = "yes" -o "$enable_tclinterp" = "dynamic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-tclsh argument" >&5 -$as_echo_n "checking --with-tclsh argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-tclsh argument" >&5 +printf %s "checking --with-tclsh argument... " >&6; } # Check whether --with-tclsh was given. -if test "${with_tclsh+set}" = set; then : - withval=$with_tclsh; tclsh_name="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclsh_name" >&5 -$as_echo "$tclsh_name" >&6; } -else - tclsh_name="tclsh8.5"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if test ${with_tclsh+y} +then : + withval=$with_tclsh; tclsh_name="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tclsh_name" >&5 +printf "%s\n" "$tclsh_name" >&6; } +else $as_nop + tclsh_name="tclsh8.5"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7510,11 +7826,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7526,11 +7846,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7540,11 +7860,12 @@ fi tclsh_name="tclsh8.4" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7554,11 +7875,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7570,11 +7895,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7583,11 +7908,12 @@ fi tclsh_name="tclsh8.2" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7597,11 +7923,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7613,11 +7943,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7626,11 +7956,12 @@ fi tclsh_name="tclsh8.0" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7640,11 +7971,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7656,11 +7991,11 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -7669,11 +8004,12 @@ fi tclsh_name="tclsh" # Extract the first word of "$tclsh_name", so it can be a program name with args. set dummy $tclsh_name; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_tcl+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_tcl+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_tcl in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path. @@ -7683,11 +8019,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_tcl="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7699,27 +8039,27 @@ esac fi vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl if test -n "$vi_cv_path_tcl"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 -$as_echo "$vi_cv_path_tcl" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_tcl" >&5 +printf "%s\n" "$vi_cv_path_tcl" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi if test "X$vi_cv_path_tcl" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 -$as_echo_n "checking Tcl version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 +printf %s "checking Tcl version... " >&6; } if echo 'exit [expr [info tclversion] < 8.0]' | "$vi_cv_path_tcl" - ; then tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 -$as_echo "$tclver - OK" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 +printf "%s\n" "$tclver - OK" >&6; }; 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 -` tcldll=`echo 'puts libtcl[info tclversion][info sharedlibextension]' | $vi_cv_path_tcl -` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 -$as_echo_n "checking for location of Tcl include... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 +printf %s "checking for location of Tcl include... " >&6; } if test "x$MACOS_X" != "xyes"; then tclinc="$tclloc/include $tclloc/include/tcl $tclloc/include/tcl$tclver /usr/local/include /usr/local/include/tcl$tclver /usr/include /usr/include/tcl$tclver" else @@ -7728,20 +8068,20 @@ $as_echo_n "checking for location of Tcl include... " >&6; } TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tcl.h" >&5 -$as_echo "$try/tcl.h" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tcl.h" >&5 +printf "%s\n" "$try/tcl.h" >&6; } TCL_INC=$try break fi done if test -z "$TCL_INC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } SKIP_TCL=YES fi if test -z "$SKIP_TCL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 -$as_echo_n "checking for location of tclConfig.sh script... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 +printf %s "checking for location of tclConfig.sh script... " >&6; } if test "x$MACOS_X" != "xyes"; then tclcnf=`echo $tclinc | sed s/include/lib/g` tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" @@ -7751,8 +8091,8 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; } fi for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -$as_echo "$try/tclConfig.sh" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 +printf "%s\n" "$try/tclConfig.sh" >&6; } . "$try/tclConfig.sh" if test "$enable_tclinterp" = "dynamic"; then TCL_LIBS=`eval echo "$TCL_STUB_LIB_SPEC $TCL_LIBS"` @@ -7764,10 +8104,10 @@ $as_echo "$try/tclConfig.sh" >&6; } fi done if test -z "$TCL_LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl library by myself" >&5 -$as_echo_n "checking for Tcl library by myself... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Tcl library by myself" >&5 +printf %s "checking for Tcl library by myself... " >&6; } tcllib=`echo $tclinc | sed s/include/lib/g` tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`" for ext in .so .a ; do @@ -7775,8 +8115,8 @@ $as_echo_n "checking for Tcl library by myself... " >&6; } for try in $tcllib ; do trylib=tcl$ver$ext if test -f "$try/lib$trylib" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 -$as_echo "$try/lib$trylib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 +printf "%s\n" "$try/lib$trylib" >&6; } TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm" if test "$vim_cv_uname_output" = SunOS && echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then @@ -7788,13 +8128,13 @@ $as_echo "$try/lib$trylib" >&6; } done done if test -z "$TCL_LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } SKIP_TCL=YES fi fi if test -z "$SKIP_TCL"; then - $as_echo "#define FEAT_TCL 1" >>confdefs.h + printf "%s\n" "#define FEAT_TCL 1" >>confdefs.h TCL_SRC=if_tcl.c TCL_OBJ=objects/if_tcl.o @@ -7803,13 +8143,13 @@ $as_echo "" >&6; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old; need Tcl version 8.0 or later" >&5 -$as_echo "too old; need Tcl version 8.0 or later" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old; need Tcl version 8.0 or later" >&5 +printf "%s\n" "too old; need Tcl version 8.0 or later" >&6; } fi fi if test "$enable_tclinterp" = "dynamic"; then if test "X$TCL_SRC" != "X" -a "X$tcldll" != "X"; then - $as_echo "#define DYNAMIC_TCL 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_TCL 1" >>confdefs.h TCL_CFLAGS="-DDYNAMIC_TCL_DLL=\\\"$tcldll\\\" -DDYNAMIC_TCL_VER=\\\"$tclver\\\" $TCL_CFLAGS" fi @@ -7825,42 +8165,45 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-rubyinterp argument" >&5 -$as_echo_n "checking --enable-rubyinterp argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-rubyinterp argument" >&5 +printf %s "checking --enable-rubyinterp argument... " >&6; } # Check whether --enable-rubyinterp was given. -if test "${enable_rubyinterp+set}" = set; then : +if test ${enable_rubyinterp+y} +then : enableval=$enable_rubyinterp; -else +else $as_nop enable_rubyinterp="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 -$as_echo "$enable_rubyinterp" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 +printf "%s\n" "$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then if test "$has_eval" = "no"; then as_fn_error $? "cannot use Ruby with tiny features" "$LINENO" 5 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 -$as_echo_n "checking --with-ruby-command argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 +printf %s "checking --with-ruby-command argument... " >&6; } # Check whether --with-ruby-command was given. -if test "${with_ruby_command+set}" = set; then : - withval=$with_ruby_command; RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5 -$as_echo "$RUBY_CMD" >&6; } -else - RUBY_CMD="ruby"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5 -$as_echo "defaulting to $RUBY_CMD" >&6; } +if test ${with_ruby_command+y} +then : + withval=$with_ruby_command; RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RUBY_CMD" >&5 +printf "%s\n" "$RUBY_CMD" >&6; } +else $as_nop + RUBY_CMD="ruby"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to $RUBY_CMD" >&5 +printf "%s\n" "defaulting to $RUBY_CMD" >&6; } fi # Extract the first word of "$RUBY_CMD", so it can be a program name with args. set dummy $RUBY_CMD; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_vi_cv_path_ruby+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_vi_cv_path_ruby+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $vi_cv_path_ruby in [\\/]* | ?:[\\/]*) ac_cv_path_vi_cv_path_ruby="$vi_cv_path_ruby" # Let the user override the test with a path. @@ -7870,11 +8213,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_vi_cv_path_ruby="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_vi_cv_path_ruby="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7886,34 +8233,34 @@ esac fi vi_cv_path_ruby=$ac_cv_path_vi_cv_path_ruby if test -n "$vi_cv_path_ruby"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_ruby" >&5 -$as_echo "$vi_cv_path_ruby" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_path_ruby" >&5 +printf "%s\n" "$vi_cv_path_ruby" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "X$vi_cv_path_ruby" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby version" >&5 -$as_echo_n "checking Ruby version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ruby version" >&5 +printf %s "checking Ruby version... " >&6; } if $vi_cv_path_ruby -e 'RUBY_VERSION >= "1.9.1" or exit 1' >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5 -$as_echo_n "checking Ruby rbconfig... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +printf "%s\n" "OK" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ruby rbconfig" >&5 +printf %s "checking Ruby rbconfig... " >&6; } ruby_rbconfig="RbConfig" if ! $vi_cv_path_ruby -r rbconfig -e 'RbConfig' >/dev/null 2>/dev/null; then ruby_rbconfig="Config" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ruby_rbconfig" >&5 -$as_echo "$ruby_rbconfig" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ruby header files" >&5 -$as_echo_n "checking Ruby header files... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ruby_rbconfig" >&5 +printf "%s\n" "$ruby_rbconfig" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Ruby header files" >&5 +printf %s "checking Ruby header files... " >&6; } rubyhdrdir=`$vi_cv_path_ruby -r mkmf -e "print $ruby_rbconfig::CONFIG['rubyhdrdir'] || $ruby_rbconfig::CONFIG['archdir'] || \\$hdrdir" 2>/dev/null` if test "X$rubyhdrdir" != "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5 -$as_echo "$rubyhdrdir" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $rubyhdrdir" >&5 +printf "%s\n" "$rubyhdrdir" >&6; } RUBY_CFLAGS="-I$rubyhdrdir" rubyarchdir=`$vi_cv_path_ruby -r rbconfig -e "print ($ruby_rbconfig::CONFIG.has_key? 'rubyarchhdrdir') ? $ruby_rbconfig::CONFIG['rubyarchhdrdir'] : '$rubyhdrdir/'+$ruby_rbconfig::CONFIG['arch']"` if test -d "$rubyarchdir"; then @@ -7953,14 +8300,14 @@ $as_echo "$rubyhdrdir" >&6; } RUBY_OBJ="objects/if_ruby.o" RUBY_PRO="if_ruby.pro" - $as_echo "#define FEAT_RUBY 1" >>confdefs.h + printf "%s\n" "#define FEAT_RUBY 1" >>confdefs.h if test "$enable_rubyinterp" = "dynamic"; then libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_ALIASES'].split[0]"` if test -z "$libruby_soname"; then libruby_soname=`$vi_cv_path_ruby -r rbconfig -e "puts $ruby_rbconfig::CONFIG['LIBRUBY_SO']"` fi - $as_echo "#define DYNAMIC_RUBY 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_RUBY 1" >>confdefs.h RUBY_CFLAGS="-DDYNAMIC_RUBY_DLL=\\\"$libruby_soname\\\" $RUBY_CFLAGS" RUBY_LIBS= @@ -7971,27 +8318,27 @@ $as_echo "$rubyhdrdir" >&6; } # Note: Apple does ship with a default Ruby lib, but it's usually older # than Homebrew, and since on x86_64 we use the Homebrew version, we # should use that as well for Apple Silicon. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ${libruby_soname} (arm64)" >&5 -$as_echo_n "checking ${libruby_soname} (arm64)... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ${libruby_soname} (arm64)" >&5 +printf %s "checking ${libruby_soname} (arm64)... " >&6; } if test -n "${vi_cv_dll_name_ruby_arm64}"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_ruby_arm64}" >&5 -$as_echo "${vi_cv_dll_name_ruby_arm64}" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${vi_cv_dll_name_ruby_arm64}" >&5 +printf "%s\n" "${vi_cv_dll_name_ruby_arm64}" >&6; } RUBY_CFLAGS+=" -DDYNAMIC_RUBY_DLL_ARM64=\\\"${vi_cv_dll_name_ruby_arm64}\\\"" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } fi fi if test "X$CLANG_VERSION" != "X" -a "$rubyversion" -ge 30; then RUBY_CFLAGS="$RUBY_CFLAGS -fdeclspec" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5 -$as_echo "not found; disabling Ruby" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found; disabling Ruby" >&5 +printf "%s\n" "not found; disabling Ruby" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old; need Ruby version 1.9.1 or later" >&5 -$as_echo "too old; need Ruby version 1.9.1 or later" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: too old; need Ruby version 1.9.1 or later" >&5 +printf "%s\n" "too old; need Ruby version 1.9.1 or later" >&6; } fi fi @@ -8006,81 +8353,85 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-cscope argument" >&5 -$as_echo_n "checking --enable-cscope argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-cscope argument" >&5 +printf %s "checking --enable-cscope argument... " >&6; } # Check whether --enable-cscope was given. -if test "${enable_cscope+set}" = set; then : +if test ${enable_cscope+y} +then : enableval=$enable_cscope; -else +else $as_nop enable_cscope="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5 -$as_echo "$enable_cscope" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_cscope" >&5 +printf "%s\n" "$enable_cscope" >&6; } if test "$enable_cscope" = "yes"; then - $as_echo "#define FEAT_CSCOPE 1" >>confdefs.h + printf "%s\n" "#define FEAT_CSCOPE 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-netbeans argument" >&5 -$as_echo_n "checking --disable-netbeans argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-netbeans argument" >&5 +printf %s "checking --disable-netbeans argument... " >&6; } # Check whether --enable-netbeans was given. -if test "${enable_netbeans+set}" = set; then : +if test ${enable_netbeans+y} +then : enableval=$enable_netbeans; -else +else $as_nop enable_netbeans="yes" fi if test "$enable_netbeans" = "yes"; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny features" >&5 -$as_echo "cannot use NetBeans with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny features" >&5 +printf "%s\n" "cannot use NetBeans with tiny features" >&6; } enable_netbeans="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-channel argument" >&5 -$as_echo_n "checking --disable-channel argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-channel argument" >&5 +printf %s "checking --disable-channel argument... " >&6; } # Check whether --enable-channel was given. -if test "${enable_channel+set}" = set; then : +if test ${enable_channel+y} +then : enableval=$enable_channel; -else +else $as_nop enable_channel="yes" fi if test "$enable_channel" = "yes"; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny features" >&5 -$as_echo "cannot use channels with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny features" >&5 +printf "%s\n" "cannot use channels with tiny features" >&6; } enable_channel="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi else if test "$enable_netbeans" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, netbeans also disabled" >&5 -$as_echo "yes, netbeans also disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, netbeans also disabled" >&5 +printf "%s\n" "yes, netbeans also disabled" >&6; } enable_netbeans="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi if test "$enable_channel" = "yes"; then if test "x$HAIKU" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 -$as_echo_n "checking for socket in -lnetwork... " >&6; } -if ${ac_cv_lib_network_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5 +printf %s "checking for socket in -lnetwork... " >&6; } +if test ${ac_cv_lib_network_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnetwork $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8089,44 +8440,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char socket (); int -main () +main (void) { return socket (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_network_socket=yes -else +else $as_nop ac_cv_lib_network_socket=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 -$as_echo "$ac_cv_lib_network_socket" >&6; } -if test "x$ac_cv_lib_network_socket" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNETWORK 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5 +printf "%s\n" "$ac_cv_lib_network_socket" >&6; } +if test "x$ac_cv_lib_network_socket" = xyes +then : + printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h LIBS="-lnetwork $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 -$as_echo_n "checking for socket in -lsocket... " >&6; } -if ${ac_cv_lib_socket_socket+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 +printf %s "checking for socket in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_socket+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8135,33 +8484,30 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char socket (); int -main () +main (void) { return socket (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_socket_socket=yes -else +else $as_nop ac_cv_lib_socket_socket=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 -$as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSOCKET 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 +printf "%s\n" "$ac_cv_lib_socket_socket" >&6; } +if test "x$ac_cv_lib_socket_socket" = xyes +then : + printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h LIBS="-lsocket $LIBS" @@ -8169,11 +8515,12 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv6 networking is possible" >&5 -$as_echo_n "checking whether compiling with IPv6 networking is possible... " >&6; } -if ${vim_cv_ipv6_networking+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv6 networking is possible" >&5 +printf %s "checking whether compiling with IPv6 networking is possible... " >&6; } +if test ${vim_cv_ipv6_networking+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8193,7 +8540,7 @@ else }; int -main () +main (void) { /* Check creating a socket. */ @@ -8210,37 +8557,35 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vim_cv_ipv6_networking="yes" -else +else $as_nop vim_cv_ipv6_networking="no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv6_networking" >&5 -$as_echo "$vim_cv_ipv6_networking" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv6_networking" >&5 +printf "%s\n" "$vim_cv_ipv6_networking" >&6; } if test "x$vim_cv_ipv6_networking" = "xyes"; then - $as_echo "#define FEAT_IPV6 1" >>confdefs.h + printf "%s\n" "#define FEAT_IPV6 1" >>confdefs.h - for ac_func in inet_ntop -do : - ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" -if test "x$ac_cv_func_inet_ntop" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_INET_NTOP 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop" +if test "x$ac_cv_func_inet_ntop" = xyes +then : + printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h fi -done else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +printf %s "checking for gethostbyname in -lnsl... " >&6; } +if test ${ac_cv_lib_nsl_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8249,43 +8594,41 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nsl_gethostbyname=yes -else +else $as_nop ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBNSL 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes +then : + printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h LIBS="-lnsl $LIBS" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv4 networking is possible" >&5 -$as_echo_n "checking whether compiling with IPv4 networking is possible... " >&6; } -if ${vim_cv_ipv4_networking+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether compiling with IPv4 networking is possible" >&5 +printf %s "checking whether compiling with IPv4 networking is possible... " >&6; } +if test ${vim_cv_ipv4_networking+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8305,7 +8648,7 @@ else }; int -main () +main (void) { /* Check creating a socket. */ @@ -8320,20 +8663,21 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vim_cv_ipv4_networking="yes" -else +else $as_nop vim_cv_ipv4_networking="no"; enable_netbeans="no"; enable_channel="no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv4_networking" >&5 -$as_echo "$vim_cv_ipv4_networking" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_ipv4_networking" >&5 +printf "%s\n" "$vim_cv_ipv4_networking" >&6; } fi fi if test "$enable_netbeans" = "yes"; then - $as_echo "#define FEAT_NETBEANS_INTG 1" >>confdefs.h + printf "%s\n" "#define FEAT_NETBEANS_INTG 1" >>confdefs.h NETBEANS_SRC="netbeans.c" @@ -8341,7 +8685,7 @@ if test "$enable_netbeans" = "yes"; then fi if test "$enable_channel" = "yes"; then - $as_echo "#define FEAT_JOB_CHANNEL 1" >>confdefs.h + printf "%s\n" "#define FEAT_JOB_CHANNEL 1" >>confdefs.h CHANNEL_SRC="job.c channel.c" @@ -8349,42 +8693,43 @@ if test "$enable_channel" = "yes"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-terminal argument" >&5 -$as_echo_n "checking --enable-terminal argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-terminal argument" >&5 +printf %s "checking --enable-terminal argument... " >&6; } # Check whether --enable-terminal was given. -if test "${enable_terminal+set}" = set; then : +if test ${enable_terminal+y} +then : enableval=$enable_terminal; -else +else $as_nop enable_terminal="auto" fi if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny features" >&5 -$as_echo "cannot use terminal emulator with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny features" >&5 +printf "%s\n" "cannot use terminal emulator with tiny features" >&6; } enable_terminal="no" else if test "$enable_terminal" = "auto"; then enable_terminal="yes" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to yes" >&5 -$as_echo "defaulting to yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to yes" >&5 +printf "%s\n" "defaulting to yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi fi else if test "$enable_terminal" = "auto"; then enable_terminal="no" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to no" >&5 -$as_echo "defaulting to no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to no" >&5 +printf "%s\n" "defaulting to no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then - $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h + printf "%s\n" "#define FEAT_TERMINAL 1" >>confdefs.h TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/creen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c" @@ -8394,120 +8739,128 @@ if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5 -$as_echo_n "checking --enable-autoservername argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-autoservername argument" >&5 +printf %s "checking --enable-autoservername argument... " >&6; } # Check whether --enable-autoservername was given. -if test "${enable_autoservername+set}" = set; then : +if test ${enable_autoservername+y} +then : enableval=$enable_autoservername; -else +else $as_nop enable_autoservername="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_autoservername" >&5 -$as_echo "$enable_autoservername" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_autoservername" >&5 +printf "%s\n" "$enable_autoservername" >&6; } if test "$enable_autoservername" = "yes"; then - $as_echo "#define FEAT_AUTOSERVERNAME 1" >>confdefs.h + printf "%s\n" "#define FEAT_AUTOSERVERNAME 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-multibyte argument" >&5 -$as_echo_n "checking --enable-multibyte argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-multibyte argument" >&5 +printf %s "checking --enable-multibyte argument... " >&6; } # Check whether --enable-multibyte was given. -if test "${enable_multibyte+set}" = set; then : +if test ${enable_multibyte+y} +then : enableval=$enable_multibyte; -else +else $as_nop enable_multibyte="yes" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_multibyte" >&5 -$as_echo "$enable_multibyte" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_multibyte" >&5 +printf "%s\n" "$enable_multibyte" >&6; } if test "$enable_multibyte" != "yes"; then as_fn_error $? "The multi-byte feature can no longer be disabled. If you have a problem with this, discuss on the Vim mailing list." "$LINENO" 5 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-rightleft argument" >&5 -$as_echo_n "checking --disable-rightleft argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-rightleft argument" >&5 +printf %s "checking --disable-rightleft argument... " >&6; } # Check whether --enable-rightleft was given. -if test "${enable_rightleft+set}" = set; then : +if test ${enable_rightleft+y} +then : enableval=$enable_rightleft; -else +else $as_nop enable_rightleft="yes" fi if test "$enable_rightleft" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define DISABLE_RIGHTLEFT 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define DISABLE_RIGHTLEFT 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-arabic argument" >&5 -$as_echo_n "checking --disable-arabic argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-arabic argument" >&5 +printf %s "checking --disable-arabic argument... " >&6; } # Check whether --enable-arabic was given. -if test "${enable_arabic+set}" = set; then : +if test ${enable_arabic+y} +then : enableval=$enable_arabic; -else +else $as_nop enable_arabic="yes" fi if test "$enable_arabic" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define DISABLE_ARABIC 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define DISABLE_ARABIC 1" >>confdefs.h fi # Check whether --enable-farsi was given. -if test "${enable_farsi+set}" = set; then : +if test ${enable_farsi+y} +then : enableval=$enable_farsi; fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-xim argument" >&5 -$as_echo_n "checking --enable-xim argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-xim argument" >&5 +printf %s "checking --enable-xim argument... " >&6; } # Check whether --enable-xim was given. -if test "${enable_xim+set}" = set; then : - enableval=$enable_xim; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xim" >&5 -$as_echo "$enable_xim" >&6; } -else - enable_xim="auto"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to auto" >&5 -$as_echo "defaulting to auto" >&6; } +if test ${enable_xim+y} +then : + enableval=$enable_xim; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_xim" >&5 +printf "%s\n" "$enable_xim" >&6; } +else $as_nop + enable_xim="auto"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to auto" >&5 +printf "%s\n" "defaulting to auto" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-fontset argument" >&5 -$as_echo_n "checking --enable-fontset argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-fontset argument" >&5 +printf %s "checking --enable-fontset argument... " >&6; } # Check whether --enable-fontset was given. -if test "${enable_fontset+set}" = set; then : +if test ${enable_fontset+y} +then : enableval=$enable_fontset; -else +else $as_nop enable_fontset="no" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_fontset" >&5 -$as_echo "$enable_fontset" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_fontset" >&5 +printf "%s\n" "$enable_fontset" >&6; } test -z "$with_x" && with_x=yes test "${enable_gui-yes}" != no -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && with_x=yes if test "$with_x" = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to: don't HAVE_X11" >&5 -$as_echo "defaulting to: don't HAVE_X11" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defaulting to: don't HAVE_X11" >&5 +printf "%s\n" "defaulting to: don't HAVE_X11" >&6; } else # Extract the first word of "xmkmf", so it can be a program name with args. set dummy xmkmf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_xmkmfpath+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_xmkmfpath+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $xmkmfpath in [\\/]* | ?:[\\/]*) ac_cv_path_xmkmfpath="$xmkmfpath" # Let the user override the test with a path. @@ -8517,11 +8870,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_xmkmfpath="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_xmkmfpath="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -8533,21 +8890,22 @@ esac fi xmkmfpath=$ac_cv_path_xmkmfpath if test -n "$xmkmfpath"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xmkmfpath" >&5 -$as_echo "$xmkmfpath" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $xmkmfpath" >&5 +printf "%s\n" "$xmkmfpath" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X" >&5 +printf %s "checking for X... " >&6; } # Check whether --with-x was given. -if test "${with_x+set}" = set; then : +if test ${with_x+y} +then : withval=$with_x; fi @@ -8558,12 +8916,41 @@ if test "x$with_x" = xno; then else case $x_includes,$x_libraries in #( *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : - $as_echo_n "(cached) " >&6 -else + *,NONE | NONE,*) if test ${ac_cv_have_x+y} +then : + printf %s "(cached) " >&6 +else $as_nop # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir +ac_x_includes=no +ac_x_libraries=no +# Do we need to do anything special at all? +ac_save_LIBS=$LIBS +LIBS="-lX11 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main (void) +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + # We can compile and link X programs with no special options. + ac_x_includes= + ac_x_libraries= +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS="$ac_save_LIBS" +# If that didn't work, only try xmkmf and file system searches +# for native compilation. +if test x"$ac_x_includes" = xno && test "$cross_compiling" = no +then : + rm -f -r conftest.dir if mkdir conftest.dir; then cd conftest.dir cat >Imakefile <<'_ACEOF' @@ -8602,7 +8989,7 @@ _ACEOF rm -f -r conftest.dir fi -# Standard set of common directories for X headers. + # Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include @@ -8629,6 +9016,8 @@ ac_x_header_dirs=' /usr/local/include/X11R5 /usr/local/include/X11R4 +/opt/X11/include + /usr/X386/include /usr/x386/include /usr/XFree86/include/X11 @@ -8650,10 +9039,11 @@ if test "$ac_x_includes" = no; then /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if ac_fn_c_try_cpp "$LINENO" +then : # We can compile using X headers with no special include directory. ac_x_includes= -else +else $as_nop for ac_dir in $ac_x_header_dirs; do if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir @@ -8674,20 +9064,21 @@ if test "$ac_x_libraries" = no; then /* end confdefs.h. */ #include int -main () +main (void) { XrmInitialize () ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= -else +else $as_nop LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` +for ac_dir in `printf "%s\n" "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl dylib la dll; do @@ -8698,19 +9089,21 @@ do done done fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no +fi +# Record the results. case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) + no,* | *,no | *\'*) : # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) + ac_cv_have_x="have_x=no" ;; #( + *) : # Record where we found X for the cache. ac_cv_have_x="have_x=yes\ ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" + ac_x_libraries='$ac_x_libraries'" ;; esac fi ;; #( @@ -8720,8 +9113,8 @@ fi fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 +printf "%s\n" "$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. @@ -8731,14 +9124,14 @@ else ac_cv_have_x="have_x=yes\ ac_x_includes='$x_includes'\ ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 +printf "%s\n" "libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +printf "%s\n" "#define X_DISPLAY_MISSING 1" >>confdefs.h X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -8751,8 +9144,8 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 +printf %s "checking whether -R must be followed by a space... " >&6; } ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" ac_xsave_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -8760,42 +9153,44 @@ $as_echo_n "checking whether -R must be followed by a space... " >&6; } /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } X_LIBS="$X_LIBS -R$x_libraries" -else +else $as_nop LIBS="$ac_xsave_LIBS -R $x_libraries" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } X_LIBS="$X_LIBS -R $x_libraries" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -$as_echo "neither works" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 +printf "%s\n" "neither works" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_c_werror_flag=$ac_xsave_c_werror_flag LIBS=$ac_xsave_LIBS @@ -8818,26 +9213,25 @@ rm -f core conftest.err conftest.$ac_objext \ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char XOpenDisplay (); int -main () +main (void) { return XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 +printf %s "checking for dnet_ntoa in -ldnet... " >&6; } +if test ${ac_cv_lib_dnet_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8846,39 +9240,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dnet_ntoa (); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_dnet_ntoa=yes -else +else $as_nop ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 +printf %s "checking for dnet_ntoa in -ldnet_stub... " >&6; } +if test ${ac_cv_lib_dnet_stub_dnet_ntoa+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8887,36 +9281,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dnet_ntoa (); int -main () +main (void) { return dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dnet_stub_dnet_ntoa=yes -else +else $as_nop ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" @@ -8929,16 +9322,18 @@ rm -f core conftest.err conftest.$ac_objext \ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = xyes; then : +if test "x$ac_cv_func_gethostbyname" = xyes +then : fi if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if ${ac_cv_lib_nsl_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 +printf %s "checking for gethostbyname in -lnsl... " >&6; } +if test ${ac_cv_lib_nsl_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8947,39 +9342,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_nsl_gethostbyname=yes -else +else $as_nop ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_nsl_gethostbyname" >&6; } +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if ${ac_cv_lib_bsd_gethostbyname+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 +printf %s "checking for gethostbyname in -lbsd... " >&6; } +if test ${ac_cv_lib_bsd_gethostbyname+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -8988,30 +9383,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char gethostbyname (); int -main () +main (void) { return gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_bsd_gethostbyname=yes -else +else $as_nop ac_cv_lib_bsd_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 +printf "%s\n" "$ac_cv_lib_bsd_gethostbyname" >&6; } +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -9026,16 +9420,18 @@ fi # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = xyes; then : +if test "x$ac_cv_func_connect" = xyes +then : fi if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if ${ac_cv_lib_socket_connect+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 +printf %s "checking for connect in -lsocket... " >&6; } +if test ${ac_cv_lib_socket_connect+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9044,30 +9440,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char connect (); int -main () +main (void) { return connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_socket_connect=yes -else +else $as_nop ac_cv_lib_socket_connect=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 +printf "%s\n" "$ac_cv_lib_socket_connect" >&6; } +if test "x$ac_cv_lib_socket_connect" = xyes +then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -9075,16 +9470,18 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = xyes; then : +if test "x$ac_cv_func_remove" = xyes +then : fi if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if ${ac_cv_lib_posix_remove+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 +printf %s "checking for remove in -lposix... " >&6; } +if test ${ac_cv_lib_posix_remove+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9093,30 +9490,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char remove (); int -main () +main (void) { return remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_posix_remove=yes -else +else $as_nop ac_cv_lib_posix_remove=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 +printf "%s\n" "$ac_cv_lib_posix_remove" >&6; } +if test "x$ac_cv_lib_posix_remove" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -9124,16 +9520,18 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = xyes; then : +if test "x$ac_cv_func_shmat" = xyes +then : fi if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if ${ac_cv_lib_ipc_shmat+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 +printf %s "checking for shmat in -lipc... " >&6; } +if test ${ac_cv_lib_ipc_shmat+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9142,30 +9540,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char shmat (); int -main () +main (void) { return shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ipc_shmat=yes -else +else $as_nop ac_cv_lib_ipc_shmat=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 +printf "%s\n" "$ac_cv_lib_ipc_shmat" >&6; } +if test "x$ac_cv_lib_ipc_shmat" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -9181,11 +9578,12 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 +printf %s "checking for IceConnectionNumber in -lICE... " >&6; } +if test ${ac_cv_lib_ICE_IceConnectionNumber+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9194,30 +9592,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char IceConnectionNumber (); int -main () +main (void) { return IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ICE_IceConnectionNumber=yes -else +else $as_nop ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +printf "%s\n" "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes +then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -9235,8 +9632,8 @@ fi if test -d "$x_includes" && test ! -d "$x_libraries"; then x_libraries=`echo "$x_includes" | sed s/include/lib/` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5 -$as_echo "Corrected X libraries to $x_libraries" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Corrected X libraries to $x_libraries" >&5 +printf "%s\n" "Corrected X libraries to $x_libraries" >&6; } X_LIBS="$X_LIBS -L$x_libraries" if test "$vim_cv_uname_output" = SunOS && echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then @@ -9246,8 +9643,8 @@ $as_echo "Corrected X libraries to $x_libraries" >&6; } if test -d "$x_libraries" && test ! -d "$x_includes"; then x_includes=`echo "$x_libraries" | sed s/lib/include/` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Corrected X includes to $x_includes" >&5 -$as_echo "Corrected X includes to $x_includes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Corrected X includes to $x_includes" >&5 +printf "%s\n" "Corrected X includes to $x_includes" >&6; } X_CFLAGS="$X_CFLAGS -I$x_includes" fi @@ -9256,8 +9653,8 @@ $as_echo "Corrected X includes to $x_includes" >&6; } X_LIBS="`echo $X_LIBS\ | sed -e 's%-R/usr/lib %%' -e 's%-R /usr/lib %%'`" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files can be found" >&5 -$as_echo_n "checking if X11 header files can be found... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if X11 header files can be found" >&5 +printf %s "checking if X11 header files can be found... " >&6; } cflags_save=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9265,27 +9662,28 @@ $as_echo_n "checking if X11 header files can be found... " >&6; } #include #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; no_x=yes +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; no_x=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$cflags_save if test "${no_x-no}" = yes; then with_x=no else - $as_echo "#define HAVE_X11 1" >>confdefs.h + printf "%s\n" "#define HAVE_X11 1" >>confdefs.h X_LIB="-lXt -lX11"; @@ -9293,11 +9691,12 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_save_LDFLAGS="$LDFLAGS" LDFLAGS="-L$x_libraries $LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 -$as_echo_n "checking for _XdmcpAuthDoIt in -lXdmcp... " >&6; } -if ${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _XdmcpAuthDoIt in -lXdmcp" >&5 +printf %s "checking for _XdmcpAuthDoIt in -lXdmcp... " >&6; } +if test ${ac_cv_lib_Xdmcp__XdmcpAuthDoIt+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXdmcp -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lXdmcp $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9306,39 +9705,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char _XdmcpAuthDoIt (); int -main () +main (void) { return _XdmcpAuthDoIt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xdmcp__XdmcpAuthDoIt=yes -else +else $as_nop ac_cv_lib_Xdmcp__XdmcpAuthDoIt=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 -$as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } -if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 +printf "%s\n" "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } +if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceOpenConnection in -lICE" >&5 -$as_echo_n "checking for IceOpenConnection in -lICE... " >&6; } -if ${ac_cv_lib_ICE_IceOpenConnection+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IceOpenConnection in -lICE" >&5 +printf %s "checking for IceOpenConnection in -lICE... " >&6; } +if test ${ac_cv_lib_ICE_IceOpenConnection+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9347,40 +9746,40 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char IceOpenConnection (); int -main () +main (void) { return IceOpenConnection (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_ICE_IceOpenConnection=yes -else +else $as_nop ac_cv_lib_ICE_IceOpenConnection=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 -$as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; } -if test "x$ac_cv_lib_ICE_IceOpenConnection" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 +printf "%s\n" "$ac_cv_lib_ICE_IceOpenConnection" >&6; } +if test "x$ac_cv_lib_ICE_IceOpenConnection" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE" fi LDFLAGS="$X_LIBS $ac_save_LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5 -$as_echo_n "checking for XpmCreatePixmapFromData in -lXpm... " >&6; } -if ${ac_cv_lib_Xpm_XpmCreatePixmapFromData+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpmCreatePixmapFromData in -lXpm" >&5 +printf %s "checking for XpmCreatePixmapFromData in -lXpm... " >&6; } +if test ${ac_cv_lib_Xpm_XpmCreatePixmapFromData+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXpm -lXt $X_PRE_LIBS -lXpm -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9389,36 +9788,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char XpmCreatePixmapFromData (); int -main () +main (void) { return XpmCreatePixmapFromData (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xpm_XpmCreatePixmapFromData=yes -else +else $as_nop ac_cv_lib_Xpm_XpmCreatePixmapFromData=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 -$as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } -if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 +printf "%s\n" "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } +if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = xyes +then : X_PRE_LIBS="$X_PRE_LIBS -lXpm" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5 -$as_echo_n "checking if X11 header files implicitly declare return values... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if X11 header files implicitly declare return values" >&5 +printf %s "checking if X11 header files implicitly declare return values... " >&6; } cflags_save=$CFLAGS if test "$GCC" = yes; then CFLAGS="$CFLAGS $X_CFLAGS -Werror" @@ -9429,41 +9827,43 @@ $as_echo_n "checking if X11 header files implicitly declare return values... " > /* end confdefs.h. */ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -else +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +else $as_nop CFLAGS="$CFLAGS -Wno-implicit-int" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; cflags_save="$cflags_save -Wno-implicit-int" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: test failed" >&5 -$as_echo "test failed" >&6; } +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; cflags_save="$cflags_save -Wno-implicit-int" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: test failed" >&5 +printf "%s\n" "test failed" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CFLAGS=$cflags_save LDFLAGS="$ac_save_LDFLAGS" @@ -9472,17 +9872,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 -$as_echo_n "checking size of wchar_t... " >&6; } -if ${ac_cv_sizeof_wchar_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "$ac_includes_default"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 +printf %s "checking size of wchar_t... " >&6; } +if test ${ac_cv_sizeof_wchar_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" "$ac_includes_default" +then : -else +else $as_nop if test "$ac_cv_type_wchar_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (wchar_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -9491,18 +9893,16 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 -$as_echo "$ac_cv_sizeof_wchar_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_wchar_t" >&5 +printf "%s\n" "$ac_cv_sizeof_wchar_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t -_ACEOF +printf "%s\n" "#define SIZEOF_WCHAR_T $ac_cv_sizeof_wchar_t" >>confdefs.h if test "$ac_cv_sizeof_wchar_t" -le 2; then - $as_echo "#define SMALL_WCHAR_T 1" >>confdefs.h + printf "%s\n" "#define SMALL_WCHAR_T 1" >>confdefs.h fi @@ -9515,12 +9915,13 @@ fi test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 -$as_echo_n "checking --enable-gui argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-gui argument" >&5 +printf %s "checking --enable-gui argument... " >&6; } # Check whether --enable-gui was given. -if test "${enable_gui+set}" = set; then : +if test ${enable_gui+y} +then : enableval=$enable_gui; -else +else $as_nop enable_gui="auto" fi @@ -9540,95 +9941,96 @@ GUITYPE=NONE if test "x$HAIKU" = "xyes"; then SKIP_HAIKU= case "$enable_gui_canon" in - no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } SKIP_HAIKU=YES ;; - yes|"") { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5 -$as_echo "yes - automatic GUI support" >&6; } ;; - auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: auto - automatic GUI support" >&5 -$as_echo "auto - automatic GUI support" >&6; } ;; - haiku) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Haiku GUI support" >&5 -$as_echo "Haiku GUI support" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + yes|"") { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes - automatic GUI support" >&5 +printf "%s\n" "yes - automatic GUI support" >&6; } ;; + auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: auto - automatic GUI support" >&5 +printf "%s\n" "auto - automatic GUI support" >&6; } ;; + haiku) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Haiku GUI support" >&5 +printf "%s\n" "Haiku GUI support" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_HAIKU=YES ;; esac elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then SKIP_PHOTON= case "$enable_gui_canon" in - no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } SKIP_PHOTON=YES ;; - yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 -$as_echo "automatic GUI support" >&6; } + yes|""|auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 +printf "%s\n" "automatic GUI support" >&6; } gui_auto=yes ;; - photon) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Photon GUI support" >&5 -$as_echo "Photon GUI support" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + photon) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Photon GUI support" >&5 +printf "%s\n" "Photon GUI support" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_PHOTON=YES ;; esac elif test "x$MACOS_X" = "xyes" -a "x$with_x" = "xno" ; then SKIP_MACVIM= case "$enable_gui_canon" in - no) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } SKIP_MACVIM=YES ;; - yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 -$as_echo "automatic GUI support" >&6; } + yes|""|auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: automatic GUI support" >&5 +printf "%s\n" "automatic GUI support" >&6; } gui_auto=yes ;; - macvim) { $as_echo "$as_me:${as_lineno-$LINENO}: result: MacVim GUI support" >&5 -$as_echo "MacVim GUI support" >&6; } ;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } + macvim) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MacVim GUI support" >&5 +printf "%s\n" "MacVim GUI support" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } SKIP_MACVIM=YES ;; esac else case "$enable_gui_canon" in - no|none) { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 -$as_echo "no GUI support" >&6; } ;; - yes|""|auto) { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5 -$as_echo "yes/auto - automatic GUI support" >&6; } + no|none) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI support" >&5 +printf "%s\n" "no GUI support" >&6; } ;; + yes|""|auto) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes/auto - automatic GUI support" >&5 +printf "%s\n" "yes/auto - automatic GUI support" >&6; } gui_auto=yes SKIP_GTK2= SKIP_GTK3= SKIP_GNOME= SKIP_MACVIM= SKIP_MOTIF=;; - gtk2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5 -$as_echo "GTK+ 2.x GUI support" >&6; } + gtk2) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GTK+ 2.x GUI support" >&5 +printf "%s\n" "GTK+ 2.x GUI support" >&6; } SKIP_GTK2=;; - gnome2) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GNOME 2.x GUI support" >&5 -$as_echo "GNOME 2.x GUI support" >&6; } + gnome2) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GNOME 2.x GUI support" >&5 +printf "%s\n" "GNOME 2.x GUI support" >&6; } SKIP_GNOME= SKIP_GTK2=;; - gtk3) { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 3.x GUI support" >&5 -$as_echo "GTK+ 3.x GUI support" >&6; } + gtk3) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GTK+ 3.x GUI support" >&5 +printf "%s\n" "GTK+ 3.x GUI support" >&6; } SKIP_GTK3=;; - motif) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5 -$as_echo "Motif GUI support" >&6; } + motif) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Motif GUI support" >&5 +printf "%s\n" "Motif GUI support" >&6; } SKIP_MOTIF=;; - *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 -$as_echo "Sorry, $enable_gui GUI is not supported" >&6; } ;; + *) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, $enable_gui GUI is not supported" >&5 +printf "%s\n" "Sorry, $enable_gui GUI is not supported" >&6; } ;; esac fi if test "x$SKIP_GTK2" != "xYES" -a "$enable_gui_canon" != "gtk2" \ -a "$enable_gui_canon" != "gnome2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 2" >&5 -$as_echo_n "checking whether or not to look for GTK+ 2... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 2" >&5 +printf %s "checking whether or not to look for GTK+ 2... " >&6; } # Check whether --enable-gtk2-check was given. -if test "${enable_gtk2_check+set}" = set; then : +if test ${enable_gtk2_check+y} +then : enableval=$enable_gtk2_check; -else +else $as_nop enable_gtk2_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk2_check" >&5 -$as_echo "$enable_gtk2_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk2_check" >&5 +printf "%s\n" "$enable_gtk2_check" >&6; } if test "x$enable_gtk2_check" = "xno"; then SKIP_GTK2=YES SKIP_GNOME=YES @@ -9636,68 +10038,72 @@ $as_echo "$enable_gtk2_check" >&6; } fi if test "x$SKIP_GNOME" != "xYES" -a "$enable_gui_canon" != "gnome2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GNOME" >&5 -$as_echo_n "checking whether or not to look for GNOME... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GNOME" >&5 +printf %s "checking whether or not to look for GNOME... " >&6; } # Check whether --enable-gnome-check was given. -if test "${enable_gnome_check+set}" = set; then : +if test ${enable_gnome_check+y} +then : enableval=$enable_gnome_check; -else +else $as_nop enable_gnome_check="no" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gnome_check" >&5 -$as_echo "$enable_gnome_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gnome_check" >&5 +printf "%s\n" "$enable_gnome_check" >&6; } if test "x$enable_gnome_check" = "xno"; then SKIP_GNOME=YES fi fi if test "x$SKIP_GTK3" != "xYES" -a "$enable_gui_canon" != "gtk3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 3" >&5 -$as_echo_n "checking whether or not to look for GTK+ 3... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for GTK+ 3" >&5 +printf %s "checking whether or not to look for GTK+ 3... " >&6; } # Check whether --enable-gtk3-check was given. -if test "${enable_gtk3_check+set}" = set; then : +if test ${enable_gtk3_check+y} +then : enableval=$enable_gtk3_check; -else +else $as_nop enable_gtk3_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk3_check" >&5 -$as_echo "$enable_gtk3_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gtk3_check" >&5 +printf "%s\n" "$enable_gtk3_check" >&6; } if test "x$enable_gtk3_check" = "xno"; then SKIP_GTK3=YES fi fi if test "x$SKIP_MOTIF" != "xYES" -a "$enable_gui_canon" != "motif"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Motif" >&5 -$as_echo_n "checking whether or not to look for Motif... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for Motif" >&5 +printf %s "checking whether or not to look for Motif... " >&6; } # Check whether --enable-motif-check was given. -if test "${enable_motif_check+set}" = set; then : +if test ${enable_motif_check+y} +then : enableval=$enable_motif_check; -else +else $as_nop enable_motif_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_motif_check" >&5 -$as_echo "$enable_motif_check" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_motif_check" >&5 +printf "%s\n" "$enable_motif_check" >&6; } if test "x$enable_motif_check" = "xno"; then SKIP_MOTIF=YES fi fi if test "x$SKIP_MACVIM" != "xYES" -a "$enable_gui_canon" != "macvim"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or not to look for MacVim" >&5 -$as_echo_n "checking whether or not to look for MacVim... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether or not to look for MacVim" >&5 +printf %s "checking whether or not to look for MacVim... " >&6; } # Check whether --enable-macvim-check was given. -if test "${enable_macvim_check+set}" = set; then : +if test ${enable_macvim_check+y} +then : enableval=$enable_macvim_check; -else +else $as_nop enable_macvim_check="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_macvim_check" >&5 -$as_echo "$enable_macvim_check" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_macvim_check" >&5 +printf "%s\n" "$enable_macvim_check" >&6; }; if test "x$enable_macvim_check" = "xno"; then SKIP_MACVIM=YES fi @@ -9709,17 +10115,17 @@ if test "x$MACOS_X" = "xyes"; then fi if test -z "$SKIP_MACVIM" -a "x$COCOA" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MacVim GUI" >&5 -$as_echo_n "checking for MacVim GUI... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MacVim GUI" >&5 +printf %s "checking for MacVim GUI... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; GUITYPE=MACVIMGUI datadir='${prefix}/MacVim.app/Contents/Resources' elif test -z "$SKIP_CARBON" -a "x$CARBON" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5 -$as_echo_n "checking for Carbon GUI... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Carbon GUI" >&5 +printf %s "checking for Carbon GUI... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; GUITYPE=CARBONGUI datadir='${prefix}/Vim.app/Contents/Resources' @@ -9748,11 +10154,12 @@ if test "X$PKG_CONFIG" = "X"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. @@ -9762,11 +10169,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9778,11 +10189,11 @@ esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 +printf "%s\n" "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -9791,11 +10202,12 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKG_CONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. @@ -9805,11 +10217,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -9821,11 +10237,11 @@ esac fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 -$as_echo "$ac_pt_PKG_CONFIG" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 +printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$ac_pt_PKG_CONFIG" = x; then @@ -9833,8 +10249,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac PKG_CONFIG=$ac_pt_PKG_CONFIG @@ -9848,21 +10264,22 @@ fi if test -z "$SKIP_GTK2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 -$as_echo_n "checking --disable-gtktest argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 +printf %s "checking --disable-gtktest argument... " >&6; } # Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then : +if test ${enable_gtktest+y} +then : enableval=$enable_gtktest; -else +else $as_nop enable_gtktest=yes fi if test "x$enable_gtktest" = "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 -$as_echo "gtk test enabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 +printf "%s\n" "gtk test enabled" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 -$as_echo "gtk test disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 +printf "%s\n" "gtk test disabled" >&6; } fi if test "x$PKG_CONFIG" != "xno"; then @@ -9876,8 +10293,8 @@ $as_echo "gtk test disabled" >&6; } && $PKG_CONFIG --exists gtk+-2.0; then { min_gtk_version=2.2.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0` GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` @@ -9892,8 +10309,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } && $PKG_CONFIG --exists gtk+-3.0; then { min_gtk_version=2.2.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-3.0` @@ -9906,8 +10323,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 -$as_echo_n "checking for GTK -dev package... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 +printf %s "checking for GTK -dev package... " >&6; } no_gtk=yes fi @@ -9919,9 +10336,10 @@ $as_echo_n "checking for GTK -dev package... " >&6; } LIBS="$LIBS $GTK_LIBS" rm -f conf.gtktest - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : echo $ac_n "cross compiling; assumed OK... $ac_c" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9958,9 +10376,10 @@ return 1; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : -else +else $as_nop no_gtk=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -9973,19 +10392,19 @@ fi fi if test "x$no_gtk" = x ; then if test "x$enable_gtktest" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } fi GUI_LIB_LOC="$GTK_LIBDIR" GTK_LIBNAME="$GTK_LIBS" GUI_INC_LOC="$GTK_CFLAGS" else { - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GTK_CFLAGS="" GTK_LIBS="" : @@ -10023,7 +10442,8 @@ $as_echo "no" >&6; } # Check whether --with-gnome-includes was given. -if test "${with_gnome_includes+set}" = set; then : +if test ${with_gnome_includes+y} +then : withval=$with_gnome_includes; CFLAGS="$CFLAGS -I$withval" fi @@ -10031,7 +10451,8 @@ fi # Check whether --with-gnome-libs was given. -if test "${with_gnome_libs+set}" = set; then : +if test ${with_gnome_libs+y} +then : withval=$with_gnome_libs; LDFLAGS="$LDFLAGS -L$withval" gnome_prefix=$withval fi @@ -10039,7 +10460,8 @@ fi # Check whether --with-gnome was given. -if test "${with_gnome+set}" = set; then : +if test ${with_gnome+y} +then : withval=$with_gnome; if test x$withval = xyes; then want_gnome=yes have_gnome=yes @@ -10053,37 +10475,37 @@ if test "${with_gnome+set}" = set; then : gnome_prefix=$withval/lib fi fi -else +else $as_nop want_gnome=yes fi if test "x$want_gnome" = xyes; then { - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnomeui-2.0" >&5 -$as_echo_n "checking for libgnomeui-2.0... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgnomeui-2.0" >&5 +printf %s "checking for libgnomeui-2.0... " >&6; } if $PKG_CONFIG --exists libgnomeui-2.0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } GNOME_LIBS=`$PKG_CONFIG --libs-only-l libgnomeui-2.0` GNOME_LIBDIR=`$PKG_CONFIG --libs-only-L libgnomeui-2.0` GNOME_INCLUDEDIR=`$PKG_CONFIG --cflags libgnomeui-2.0` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5 -$as_echo_n "checking for FreeBSD... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeBSD" >&5 +printf %s "checking for FreeBSD... " >&6; } if test "$vim_cv_uname_output" = FreeBSD; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } GNOME_INCLUDEDIR="$GNOME_INCLUDEDIR -D_THREAD_SAFE" GNOME_LIBS="$GNOME_LIBS -pthread" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi have_gnome=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5 +printf "%s\n" "not found" >&6; } if test "x" = xfail; then as_fn_error $? "Could not find libgnomeui-2.0 via pkg-config" "$LINENO" 5 fi @@ -10092,7 +10514,7 @@ $as_echo "not found" >&6; } fi if test "x$have_gnome" = xyes ; then - $as_echo "#define FEAT_GUI_GNOME 1" >>confdefs.h + printf "%s\n" "#define FEAT_GUI_GNOME 1" >>confdefs.h GUI_INC_LOC="$GUI_INC_LOC $GNOME_INCLUDEDIR" GTK_LIBNAME="$GTK_LIBNAME $GNOME_LIBDIR $GNOME_LIBS" @@ -10105,21 +10527,22 @@ fi if test -z "$SKIP_GTK3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 -$as_echo_n "checking --disable-gtktest argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-gtktest argument" >&5 +printf %s "checking --disable-gtktest argument... " >&6; } # Check whether --enable-gtktest was given. -if test "${enable_gtktest+set}" = set; then : +if test ${enable_gtktest+y} +then : enableval=$enable_gtktest; -else +else $as_nop enable_gtktest=yes fi if test "x$enable_gtktest" = "xyes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 -$as_echo "gtk test enabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test enabled" >&5 +printf "%s\n" "gtk test enabled" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 -$as_echo "gtk test disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gtk test disabled" >&5 +printf "%s\n" "gtk test disabled" >&6; } fi if test "x$PKG_CONFIG" != "xno"; then @@ -10133,8 +10556,8 @@ $as_echo "gtk test disabled" >&6; } && $PKG_CONFIG --exists gtk+-2.0; then { min_gtk_version=3.0.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-2.0` GTK_LIBS=`$PKG_CONFIG --libs gtk+-2.0` @@ -10149,8 +10572,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } && $PKG_CONFIG --exists gtk+-3.0; then { min_gtk_version=3.0.0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 -$as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK - version >= $min_gtk_version" >&5 +printf %s "checking for GTK - version >= $min_gtk_version... " >&6; } GTK_CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` GTK_LIBDIR=`$PKG_CONFIG --libs-only-L gtk+-3.0` @@ -10163,8 +10586,8 @@ $as_echo_n "checking for GTK - version >= $min_gtk_version... " >&6; } sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'` } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 -$as_echo_n "checking for GTK -dev package... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GTK -dev package" >&5 +printf %s "checking for GTK -dev package... " >&6; } no_gtk=yes fi @@ -10176,9 +10599,10 @@ $as_echo_n "checking for GTK -dev package... " >&6; } LIBS="$LIBS $GTK_LIBS" rm -f conf.gtktest - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : echo $ac_n "cross compiling; assumed OK... $ac_c" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -10215,9 +10639,10 @@ return 1; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : -else +else $as_nop no_gtk=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -10230,19 +10655,19 @@ fi fi if test "x$no_gtk" = x ; then if test "x$enable_gtktest" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "yes; found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 -$as_echo "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&5 +printf "%s\n" "found version $gtk_major_version.$gtk_minor_version.$gtk_micro_version" >&6; } fi GUI_LIB_LOC="$GTK_LIBDIR" GTK_LIBNAME="$GTK_LIBS" GUI_INC_LOC="$GTK_CFLAGS" else { - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GTK_CFLAGS="" GTK_LIBS="" : @@ -10267,7 +10692,7 @@ $as_echo "no" >&6; } SKIP_MOTIF=YES GUITYPE=GTK - $as_echo "#define USE_GTK3 1" >>confdefs.h + printf "%s\n" "#define USE_GTK3 1" >>confdefs.h else SKIP_GTK2=$save_skip_gtk2 @@ -10276,23 +10701,24 @@ $as_echo "no" >&6; } fi if test "x$GUITYPE" = "xGTK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of Gdk-Pixbuf" >&5 -$as_echo_n "checking version of Gdk-Pixbuf... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking version of Gdk-Pixbuf" >&5 +printf %s "checking version of Gdk-Pixbuf... " >&6; } gdk_pixbuf_version=`$PKG_CONFIG --modversion gdk-pixbuf-2.0` if test "x$gdk_pixbuf_version" != x ; then gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'` if test "x$gdk_pixbuf_version_minor" != x -a \ $gdk_pixbuf_version_minor -ge 31 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5 -$as_echo "OK." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK." >&5 +printf "%s\n" "OK." >&6; } # Extract the first word of "glib-compile-resources", so it can be a program name with args. set dummy glib-compile-resources; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GLIB_COMPILE_RESOURCES+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GLIB_COMPILE_RESOURCES in [\\/]* | ?:[\\/]*) ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path. @@ -10302,11 +10728,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10319,56 +10749,58 @@ esac fi GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES if test -n "$GLIB_COMPILE_RESOURCES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 -$as_echo "$GLIB_COMPILE_RESOURCES" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5 +printf "%s\n" "$GLIB_COMPILE_RESOURCES" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5 -$as_echo_n "checking glib-compile-resources... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking glib-compile-resources" >&5 +printf %s "checking glib-compile-resources... " >&6; } if test "x$GLIB_COMPILE_RESOURCES" = xno ; then GLIB_COMPILE_RESOURCES="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5 -$as_echo "cannot be found in PATH." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot be found in PATH." >&5 +printf "%s\n" "cannot be found in PATH." >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: usable." >&5 -$as_echo "usable." >&6; } - $as_echo "#define USE_GRESOURCE 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: usable." >&5 +printf "%s\n" "usable." >&6; } + printf "%s\n" "#define USE_GRESOURCE 1" >>confdefs.h GRESOURCE_SRC="auto/gui_gtk_gresources.c" GRESOURCE_OBJ="objects/gui_gtk_gresources.o" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable." >&5 -$as_echo "not usable." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable." >&5 +printf "%s\n" "not usable." >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot obtain from pkg_config." >&5 -$as_echo "cannot obtain from pkg_config." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot obtain from pkg_config." >&5 +printf "%s\n" "cannot obtain from pkg_config." >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-icon-cache-update argument" >&5 -$as_echo_n "checking --disable-icon-cache-update argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-icon-cache-update argument" >&5 +printf %s "checking --disable-icon-cache-update argument... " >&6; } # Check whether --enable-icon_cache_update was given. -if test "${enable_icon_cache_update+set}" = set; then : +if test ${enable_icon_cache_update+y} +then : enableval=$enable_icon_cache_update; -else +else $as_nop enable_icon_cache_update="yes" fi if test "$enable_icon_cache_update" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } # Extract the first word of "gtk-update-icon-cache", so it can be a program name with args. set dummy gtk-update-icon-cache; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GTK_UPDATE_ICON_CACHE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_GTK_UPDATE_ICON_CACHE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $GTK_UPDATE_ICON_CACHE in [\\/]* | ?:[\\/]*) ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user override the test with a path. @@ -10378,11 +10810,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10395,42 +10831,44 @@ esac fi GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE if test -n "$GTK_UPDATE_ICON_CACHE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5 -$as_echo "$GTK_UPDATE_ICON_CACHE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5 +printf "%s\n" "$GTK_UPDATE_ICON_CACHE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$GTK_UPDATE_ICON_CACHE" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 -$as_echo "not found in PATH." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 +printf "%s\n" "not found in PATH." >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 -$as_echo "update disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 +printf "%s\n" "update disabled" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-desktop-database-update argument" >&5 -$as_echo_n "checking --disable-desktop-database-update argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-desktop-database-update argument" >&5 +printf %s "checking --disable-desktop-database-update argument... " >&6; } # Check whether --enable-desktop_database_update was given. -if test "${enable_desktop_database_update+set}" = set; then : +if test ${enable_desktop_database_update+y} +then : enableval=$enable_desktop_database_update; -else +else $as_nop enable_desktop_database_update="yes" fi if test "$enable_desktop_database_update" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not set" >&5 +printf "%s\n" "not set" >&6; } # Extract the first word of "update-desktop-database", so it can be a program name with args. set dummy update-desktop-database; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_UPDATE_DESKTOP_DATABASE+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_UPDATE_DESKTOP_DATABASE+y} +then : + printf %s "(cached) " >&6 +else $as_nop case $UPDATE_DESKTOP_DATABASE in [\\/]* | ?:[\\/]*) ac_cv_path_UPDATE_DESKTOP_DATABASE="$UPDATE_DESKTOP_DATABASE" # Let the user override the test with a path. @@ -10440,11 +10878,15 @@ else for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -10457,21 +10899,21 @@ esac fi UPDATE_DESKTOP_DATABASE=$ac_cv_path_UPDATE_DESKTOP_DATABASE if test -n "$UPDATE_DESKTOP_DATABASE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDATE_DESKTOP_DATABASE" >&5 -$as_echo "$UPDATE_DESKTOP_DATABASE" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $UPDATE_DESKTOP_DATABASE" >&5 +printf "%s\n" "$UPDATE_DESKTOP_DATABASE" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi if test "x$UPDATE_DESKTOP_DATABASE" = "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 -$as_echo "not found in PATH." >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5 +printf "%s\n" "not found in PATH." >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 -$as_echo "update disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5 +printf "%s\n" "update disabled" >&6; } fi fi @@ -10485,8 +10927,8 @@ if test -z "$SKIP_MOTIF"; then gui_XXX="/usr/XXX/Motif* /usr/Motif*/XXX /usr/XXX /usr/shlib /usr/X11*/XXX /usr/XXX/X11* /usr/dt/XXX /local/Motif*/XXX /local/XXX/Motif* /usr/local/Motif*/XXX /usr/local/XXX/Motif* /usr/local/XXX /usr/local/X11*/XXX /usr/local/LessTif/Motif*/XXX $MOTIFHOME/XXX" GUI_INC_LOC="`echo $GUI_INC_LOC|sed 's%-I%%g'`" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5 -$as_echo_n "checking for location of Motif GUI includes... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI includes" >&5 +printf %s "checking for location of Motif GUI includes... " >&6; } gui_includes="`echo $x_includes|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/include/g` $GUI_INC_LOC" GUI_INC_LOC= for try in $gui_includes; do @@ -10497,42 +10939,43 @@ $as_echo_n "checking for location of Motif GUI includes... " >&6; } if test -n "$GUI_INC_LOC"; then if test "$GUI_INC_LOC" = /usr/include; then GUI_INC_LOC= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 -$as_echo "in default path" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 +printf "%s\n" "in default path" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_INC_LOC" >&5 -$as_echo "$GUI_INC_LOC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUI_INC_LOC" >&5 +printf "%s\n" "$GUI_INC_LOC" >&6; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } SKIP_MOTIF=YES fi fi if test -z "$SKIP_MOTIF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-motif-lib argument" >&5 -$as_echo_n "checking --with-motif-lib argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-motif-lib argument" >&5 +printf %s "checking --with-motif-lib argument... " >&6; } # Check whether --with-motif-lib was given. -if test "${with_motif_lib+set}" = set; then : +if test ${with_motif_lib+y} +then : withval=$with_motif_lib; MOTIF_LIBNAME="${withval}" fi if test -n "$MOTIF_LIBNAME"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOTIF_LIBNAME" >&5 -$as_echo "$MOTIF_LIBNAME" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MOTIF_LIBNAME" >&5 +printf "%s\n" "$MOTIF_LIBNAME" >&6; } GUI_LIB_LOC= else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } GUI_LIB_LOC="`echo $GUI_LIB_LOC|sed 's%-L%%g'`" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5 -$as_echo_n "checking for location of Motif GUI libs... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of Motif GUI libs" >&5 +printf %s "checking for location of Motif GUI libs... " >&6; } gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` /usr/lib64 /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC" GUI_LIB_LOC= for try in $gui_libs; do @@ -10548,12 +10991,12 @@ $as_echo_n "checking for location of Motif GUI libs... " >&6; } -o "$GUI_LIB_LOC" = /usr/lib/i386-linux-gnu \ -o "$GUI_LIB_LOC" = /usr/lib/x86_64-linux-gnu; then GUI_LIB_LOC= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 -$as_echo "in default path" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: in default path" >&5 +printf "%s\n" "in default path" >&6; } else if test -n "$GUI_LIB_LOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5 -$as_echo "$GUI_LIB_LOC" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GUI_LIB_LOC" >&5 +printf "%s\n" "$GUI_LIB_LOC" >&6; } if test "$vim_cv_uname_output" = SunOS && echo $vim_cv_uname_r_output | grep '^5' >/dev/null; then GUI_LIB_LOC="$GUI_LIB_LOC -R $GUI_LIB_LOC" @@ -10562,8 +11005,8 @@ $as_echo "$GUI_LIB_LOC" >&6; } fi MOTIF_LIBNAME=-lXm else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5 +printf "%s\n" "" >&6; } SKIP_MOTIF=YES fi fi @@ -10584,11 +11027,12 @@ if test -z "$SKIP_MOTIF"; then ldflags_save=$LDFLAGS LDFLAGS="$X_LIBS $LDFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 -$as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } -if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 +printf %s "checking for XShapeQueryExtension in -lXext... " >&6; } +if test ${ac_cv_lib_Xext_XShapeQueryExtension+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXext -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10597,38 +11041,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char XShapeQueryExtension (); int -main () +main (void) { return XShapeQueryExtension (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xext_XShapeQueryExtension=yes -else +else $as_nop ac_cv_lib_Xext_XShapeQueryExtension=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } -if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 +printf "%s\n" "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } +if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes +then : GUI_X_LIBS="-lXext" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wslen in -lw" >&5 -$as_echo_n "checking for wslen in -lw... " >&6; } -if ${ac_cv_lib_w_wslen+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wslen in -lw" >&5 +printf %s "checking for wslen in -lw... " >&6; } +if test ${ac_cv_lib_w_wslen+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lw $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10637,38 +11081,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char wslen (); int -main () +main (void) { return wslen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_w_wslen=yes -else +else $as_nop ac_cv_lib_w_wslen=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5 -$as_echo "$ac_cv_lib_w_wslen" >&6; } -if test "x$ac_cv_lib_w_wslen" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wslen" >&5 +printf "%s\n" "$ac_cv_lib_w_wslen" >&6; } +if test "x$ac_cv_lib_w_wslen" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lw" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 -$as_echo_n "checking for dlsym in -ldl... " >&6; } -if ${ac_cv_lib_dl_dlsym+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5 +printf %s "checking for dlsym in -ldl... " >&6; } +if test ${ac_cv_lib_dl_dlsym+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10677,38 +11121,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char dlsym (); int -main () +main (void) { return dlsym (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_dl_dlsym=yes -else +else $as_nop ac_cv_lib_dl_dlsym=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 -$as_echo "$ac_cv_lib_dl_dlsym" >&6; } -if test "x$ac_cv_lib_dl_dlsym" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5 +printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; } +if test "x$ac_cv_lib_dl_dlsym" = xyes +then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuCreateStippledPixmap in -lXmu" >&5 -$as_echo_n "checking for XmuCreateStippledPixmap in -lXmu... " >&6; } -if ${ac_cv_lib_Xmu_XmuCreateStippledPixmap+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XmuCreateStippledPixmap in -lXmu" >&5 +printf %s "checking for XmuCreateStippledPixmap in -lXmu... " >&6; } +if test ${ac_cv_lib_Xmu_XmuCreateStippledPixmap+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXmu $GUI_X_LIBS -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10717,39 +11161,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char XmuCreateStippledPixmap (); int -main () +main (void) { return XmuCreateStippledPixmap (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xmu_XmuCreateStippledPixmap=yes -else +else $as_nop ac_cv_lib_Xmu_XmuCreateStippledPixmap=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 -$as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } -if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 +printf "%s\n" "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } +if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = xyes +then : GUI_X_LIBS="-lXmu $GUI_X_LIBS" fi if test -z "$SKIP_MOTIF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpEndJob in -lXp" >&5 -$as_echo_n "checking for XpEndJob in -lXp... " >&6; } -if ${ac_cv_lib_Xp_XpEndJob+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpEndJob in -lXp" >&5 +printf %s "checking for XpEndJob in -lXp... " >&6; } +if test ${ac_cv_lib_Xp_XpEndJob+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lXp $GUI_X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10758,38 +11202,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char XpEndJob (); int -main () +main (void) { return XpEndJob (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_Xp_XpEndJob=yes -else +else $as_nop ac_cv_lib_Xp_XpEndJob=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5 -$as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; } -if test "x$ac_cv_lib_Xp_XpEndJob" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpEndJob" >&5 +printf "%s\n" "$ac_cv_lib_Xp_XpEndJob" >&6; } +if test "x$ac_cv_lib_Xp_XpEndJob" = xyes +then : GUI_X_LIBS="-lXp $GUI_X_LIBS" fi fi LDFLAGS=$ldflags_save - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extra X11 defines" >&5 -$as_echo_n "checking for extra X11 defines... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extra X11 defines" >&5 +printf %s "checking for extra X11 defines... " >&6; } NARROW_PROTO= rm -fr conftestdir if mkdir conftestdir; then @@ -10805,11 +11248,11 @@ EOF rm -fr conftestdir fi if test -z "$NARROW_PROTO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NARROW_PROTO" >&5 -$as_echo "$NARROW_PROTO" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NARROW_PROTO" >&5 +printf "%s\n" "$NARROW_PROTO" >&6; } fi fi @@ -10817,18 +11260,13 @@ fi if test "$enable_xsmp" = "yes"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - for ac_header in X11/SM/SMlib.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_X11_SM_SMLIB_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes +then : + printf "%s\n" "#define HAVE_X11_SM_SMLIB_H 1" >>confdefs.h fi -done - CPPFLAGS=$cppflags_save fi @@ -10836,43 +11274,44 @@ fi if test -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - for ac_header in X11/xpm.h X11/Sunkeysym.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_xpm_h" = xyes +then : + printf "%s\n" "#define HAVE_X11_XPM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "X11/Sunkeysym.h" "ac_cv_header_X11_Sunkeysym_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_Sunkeysym_h" = xyes +then : + printf "%s\n" "#define HAVE_X11_SUNKEYSYM_H 1" >>confdefs.h fi -done - if test ! "$enable_xim" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XIMText in X11/Xlib.h" >&5 -$as_echo_n "checking for XIMText in X11/Xlib.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XIMText in X11/Xlib.h" >&5 +printf %s "checking for XIMText in X11/Xlib.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "XIMText" >/dev/null 2>&1; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5 -$as_echo "no; xim has been disabled" >&6; }; enable_xim="no" + $EGREP "XIMText" >/dev/null 2>&1 +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; xim has been disabled" >&5 +printf "%s\n" "no; xim has been disabled" >&6; }; enable_xim="no" fi -rm -f conftest* +rm -rf conftest* fi CPPFLAGS=$cppflags_save if test "$enable_xim" = "auto" -a "x$GUITYPE" != "xNONE" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: X GUI selected; xim has been enabled" >&5 -$as_echo "X GUI selected; xim has been enabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: X GUI selected; xim has been enabled" >&5 +printf "%s\n" "X GUI selected; xim has been enabled" >&6; } enable_xim="yes" fi fi @@ -10880,31 +11319,32 @@ fi if test -z "$SKIP_MOTIF"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/Xmu/Editres.h" >&5 -$as_echo_n "checking for X11/Xmu/Editres.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for X11/Xmu/Editres.h" >&5 +printf %s "checking for X11/Xmu/Editres.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { int i; i = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_X11_XMU_EDITRES_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_X11_XMU_EDITRES_H 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS=$cppflags_save fi @@ -10912,79 +11352,105 @@ if test -z "$SKIP_MOTIF"; then cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" if test "$zOSUnix" = "yes"; then - for ac_header in Xm/Xm.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" -if test "x$ac_cv_header_Xm_Xm_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_XM_XM_H 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Xm_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_XM_H 1" >>confdefs.h fi -done - else - for ac_header in Xm/Xm.h Xm/XpmP.h Xm/JoinSideT.h Xm/TraitP.h Xm/Manager.h Xm/UnhighlightT.h Xm/Notebook.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF + ac_fn_c_check_header_compile "$LINENO" "Xm/Xm.h" "ac_cv_header_Xm_Xm_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Xm_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_XM_H 1" >>confdefs.h fi +ac_fn_c_check_header_compile "$LINENO" "Xm/XpmP.h" "ac_cv_header_Xm_XpmP_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_XpmP_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_XPMP_H 1" >>confdefs.h -done +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/JoinSideT.h" "ac_cv_header_Xm_JoinSideT_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_JoinSideT_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_JOINSIDET_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/TraitP.h" "ac_cv_header_Xm_TraitP_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_TraitP_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_TRAITP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/Manager.h" "ac_cv_header_Xm_Manager_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Manager_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_MANAGER_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/UnhighlightT.h" "ac_cv_header_Xm_UnhighlightT_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_UnhighlightT_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_UNHIGHLIGHTT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "Xm/Notebook.h" "ac_cv_header_Xm_Notebook_h" "$ac_includes_default" +if test "x$ac_cv_header_Xm_Notebook_h" = xyes +then : + printf "%s\n" "#define HAVE_XM_NOTEBOOK_H 1" >>confdefs.h + +fi fi if test "x$ac_cv_header_Xm_XpmP_h" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 -$as_echo_n "checking for XpmAttributes_21 in Xm/XpmP.h... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for XpmAttributes_21 in Xm/XpmP.h" >&5 +printf %s "checking for XpmAttributes_21 in Xm/XpmP.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { XpmAttributes_21 attr; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define XPMATTRIBUTES_TYPE XpmAttributes_21" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define XPMATTRIBUTES_TYPE XpmAttributes_21" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; $as_echo "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; printf "%s\n" "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext else - $as_echo "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h + printf "%s\n" "#define XPMATTRIBUTES_TYPE XpmAttributes" >>confdefs.h fi CPPFLAGS=$cppflags_save fi if test "x$GUITYPE" = "xNONE" -a "$enable_xim" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI selected; xim has been disabled" >&5 -$as_echo "no GUI selected; xim has been disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI selected; xim has been disabled" >&5 +printf "%s\n" "no GUI selected; xim has been disabled" >&6; } enable_xim="no" fi if test "x$GUITYPE" = "xNONE" -a "$enable_fontset" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no GUI selected; fontset has been disabled" >&5 -$as_echo "no GUI selected; fontset has been disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no GUI selected; fontset has been disabled" >&5 +printf "%s\n" "no GUI selected; fontset has been disabled" >&6; } enable_fontset="no" fi if test "x$GUITYPE:$enable_fontset" = "xGTK:yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: GTK+ 2 GUI selected; fontset has been disabled" >&5 -$as_echo "GTK+ 2 GUI selected; fontset has been disabled" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: GTK+ 2 GUI selected; fontset has been disabled" >&5 +printf "%s\n" "GTK+ 2 GUI selected; fontset has been disabled" >&6; } enable_fontset="no" fi @@ -11006,72 +11472,74 @@ if test "$enable_workshop" = "yes" -a -n "$SKIP_MOTIF"; then fi if test "$enable_xim" = "yes"; then - $as_echo "#define FEAT_XIM 1" >>confdefs.h + printf "%s\n" "#define FEAT_XIM 1" >>confdefs.h fi if test "$enable_fontset" = "yes"; then - $as_echo "#define FEAT_XFONTSET 1" >>confdefs.h + printf "%s\n" "#define FEAT_XFONTSET 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc link to executable" >&5 -$as_echo_n "checking for /proc link to executable... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /proc link to executable" >&5 +printf %s "checking for /proc link to executable... " >&6; } if test -L "/proc/self/exe"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /proc/self/exe" >&5 -$as_echo "/proc/self/exe" >&6; } - $as_echo "#define PROC_EXE_LINK \"/proc/self/exe\"" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /proc/self/exe" >&5 +printf "%s\n" "/proc/self/exe" >&6; } + printf "%s\n" "#define PROC_EXE_LINK \"/proc/self/exe\"" >>confdefs.h elif test -L "/proc/self/path/a.out"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /proc/self/path/a.out" >&5 -$as_echo "/proc/self/path/a.out" >&6; } - $as_echo "#define PROC_EXE_LINK \"/proc/self/path/a.out\"" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /proc/self/path/a.out" >&5 +printf "%s\n" "/proc/self/path/a.out" >&6; } + printf "%s\n" "#define PROC_EXE_LINK \"/proc/self/path/a.out\"" >>confdefs.h elif test -L "/proc/curproc/file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: /proc/curproc/file" >&5 -$as_echo "/proc/curproc/file" >&6; } - $as_echo "#define PROC_EXE_LINK \"/proc/curproc/file\"" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: /proc/curproc/file" >&5 +printf "%s\n" "/proc/curproc/file" >&6; } + printf "%s\n" "#define PROC_EXE_LINK \"/proc/curproc/file\"" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5 -$as_echo_n "checking for CYGWIN or MSYS environment... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CYGWIN or MSYS environment" >&5 +printf %s "checking for CYGWIN or MSYS environment... " >&6; } case $vim_cv_uname_output in - CYGWIN*|MSYS*) CYGWIN=yes; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5 -$as_echo_n "checking for CYGWIN clipboard support... " >&6; } + CYGWIN*|MSYS*) CYGWIN=yes; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CYGWIN clipboard support" >&5 +printf %s "checking for CYGWIN clipboard support... " >&6; } if test "x$with_x" = "xno" ; then OS_EXTRA_SRC=winclip.c; OS_EXTRA_OBJ=objects/winclip.o - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define FEAT_CYGWIN_WIN32_CLIPBOARD 1" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define FEAT_CYGWIN_WIN32_CLIPBOARD 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - using X11" >&5 -$as_echo "no - using X11" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no - using X11" >&5 +printf "%s\n" "no - using X11" >&6; } fi ;; - *) CYGWIN=no; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; };; + *) CYGWIN=no; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; };; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5 -$as_echo_n "checking whether toupper is broken... " >&6; } -if ${vim_cv_toupper_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether toupper is broken" >&5 +printf %s "checking whether toupper is broken... " >&6; } +if test ${vim_cv_toupper_broken+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_toupper_broken'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11084,11 +11552,12 @@ else int main() { exit(toupper('A') == 'A' && tolower('z') == 'z'); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_toupper_broken=yes -else +else $as_nop vim_cv_toupper_broken=no @@ -11098,72 +11567,75 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_toupper_broken" >&5 -$as_echo "$vim_cv_toupper_broken" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_toupper_broken" >&5 +printf "%s\n" "$vim_cv_toupper_broken" >&6; } if test "x$vim_cv_toupper_broken" = "xyes" ; then - $as_echo "#define BROKEN_TOUPPER 1" >>confdefs.h + printf "%s\n" "#define BROKEN_TOUPPER 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __DATE__ and __TIME__ work" >&5 -$as_echo_n "checking whether __DATE__ and __TIME__ work... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __DATE__ and __TIME__ work" >&5 +printf %s "checking whether __DATE__ and __TIME__ work... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { printf("(" __DATE__ " " __TIME__ ")"); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DATE_TIME 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_DATE_TIME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((unused)) is allowed" >&5 -$as_echo_n "checking whether __attribute__((unused)) is allowed... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __attribute__((unused)) is allowed" >&5 +printf %s "checking whether __attribute__((unused)) is allowed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { int x __attribute__((unused)); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ATTRIBUTE_UNUSED 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ATTRIBUTE_UNUSED 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -ac_fn_c_check_header_mongrel "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" -if test "x$ac_cv_header_elf_h" = xyes; then : +ac_fn_c_check_header_compile "$LINENO" "elf.h" "ac_cv_header_elf_h" "$ac_includes_default" +if test "x$ac_cv_header_elf_h" = xyes +then : HAS_ELF=1 fi - if test "$HAS_ELF" = 1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5 -$as_echo_n "checking for main in -lelf... " >&6; } -if ${ac_cv_lib_elf_main+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for main in -lelf" >&5 +printf %s "checking for main in -lelf... " >&6; } +if test ${ac_cv_lib_elf_main+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lelf $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11171,28 +11643,28 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext int -main () +main (void) { return main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_elf_main=yes -else +else $as_nop ac_cv_lib_elf_main=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5 -$as_echo "$ac_cv_lib_elf_main" >&6; } -if test "x$ac_cv_lib_elf_main" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBELF 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_main" >&5 +printf "%s\n" "$ac_cv_lib_elf_main" >&6; } +if test "x$ac_cv_lib_elf_main" = xyes +then : + printf "%s\n" "#define HAVE_LIBELF 1" >>confdefs.h LIBS="-lelf $LIBS" @@ -11202,19 +11674,20 @@ fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval \${$as_ac_Header+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_Header=`printf "%s\n" "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 +printf %s "checking for $ac_hdr that defines DIR... " >&6; } +if eval test \${$as_ac_Header+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include <$ac_hdr> int -main () +main (void) { if ((DIR *) 0) return 0; @@ -11222,19 +11695,21 @@ return 0; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : eval "$as_ac_Header=yes" -else +else $as_nop eval "$as_ac_Header=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi eval ac_res=\$$as_ac_Header - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Header"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF ac_header_dirent=$ac_hdr; break @@ -11243,11 +11718,12 @@ fi done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11255,56 +11731,59 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' dir; do +for ac_lib in '' dir +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 +printf %s "checking for library containing opendir... " >&6; } +if test ${ac_cv_search_opendir+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_func_search_save_LIBS=$LIBS cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11312,46 +11791,48 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char opendir (); int -main () +main (void) { return opendir (); ; return 0; } _ACEOF -for ac_lib in '' x; do +for ac_lib in '' x +do if test -z "$ac_lib"; then ac_res="none required" else ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - if ac_fn_c_try_link "$LINENO"; then : + if ac_fn_c_try_link "$LINENO" +then : ac_cv_search_opendir=$ac_res fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : + if test ${ac_cv_search_opendir+y} +then : break fi done -if ${ac_cv_search_opendir+:} false; then : +if test ${ac_cv_search_opendir+y} +then : -else +else $as_nop ac_cv_search_opendir=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 +printf "%s\n" "$ac_cv_search_opendir" >&6; } ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : +if test "$ac_res" != no +then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -11360,134 +11841,352 @@ fi if test $ac_cv_header_sys_wait_h = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that defines union wait" >&5 -$as_echo_n "checking for sys/wait.h that defines union wait... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that defines union wait" >&5 +printf %s "checking for sys/wait.h that defines union wait... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { union wait xx, yy; xx = yy ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - $as_echo "#define HAVE_UNION_WAIT 1" >>confdefs.h + printf "%s\n" "#define HAVE_UNION_WAIT 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -for ac_header in stdint.h stdlib.h string.h \ - sys/select.h sys/utsname.h termcap.h fcntl.h \ - sgtty.h sys/ioctl.h sys/time.h sys/types.h \ - termio.h iconv.h inttypes.h langinfo.h math.h \ - unistd.h stropts.h errno.h sys/resource.h \ - sys/systeminfo.h locale.h sys/stream.h termios.h \ - libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ - utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ - util/debug.h util/msg18n.h frame.h sys/acl.h \ - sys/access.h sys/sysinfo.h wchar.h wctype.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default" +if test "x$ac_cv_header_stdint_h" = xyes +then : + printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes +then : + printf "%s\n" "#define HAVE_STDLIB_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default" +if test "x$ac_cv_header_string_h" = xyes +then : + printf "%s\n" "#define HAVE_STRING_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_select_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_utsname_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "termcap.h" "ac_cv_header_termcap_h" "$ac_includes_default" +if test "x$ac_cv_header_termcap_h" = xyes +then : + printf "%s\n" "#define HAVE_TERMCAP_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default" +if test "x$ac_cv_header_fcntl_h" = xyes +then : + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sgtty.h" "ac_cv_header_sgtty_h" "$ac_includes_default" +if test "x$ac_cv_header_sgtty_h" = xyes +then : + printf "%s\n" "#define HAVE_SGTTY_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ioctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_time_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_types_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "termio.h" "ac_cv_header_termio_h" "$ac_includes_default" +if test "x$ac_cv_header_termio_h" = xyes +then : + printf "%s\n" "#define HAVE_TERMIO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default" +if test "x$ac_cv_header_iconv_h" = xyes +then : + printf "%s\n" "#define HAVE_ICONV_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "inttypes.h" "ac_cv_header_inttypes_h" "$ac_includes_default" +if test "x$ac_cv_header_inttypes_h" = xyes +then : + printf "%s\n" "#define HAVE_INTTYPES_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_langinfo_h" = xyes +then : + printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "math.h" "ac_cv_header_math_h" "$ac_includes_default" +if test "x$ac_cv_header_math_h" = xyes +then : + printf "%s\n" "#define HAVE_MATH_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default" +if test "x$ac_cv_header_unistd_h" = xyes +then : + printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$ac_includes_default" +if test "x$ac_cv_header_stropts_h" = xyes +then : + printf "%s\n" "#define HAVE_STROPTS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default" +if test "x$ac_cv_header_errno_h" = xyes +then : + printf "%s\n" "#define HAVE_ERRNO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_resource_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/systeminfo.h" "ac_cv_header_sys_systeminfo_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_systeminfo_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSTEMINFO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = xyes +then : + printf "%s\n" "#define HAVE_LOCALE_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/stream.h" "ac_cv_header_sys_stream_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_stream_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STREAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" "$ac_includes_default" +if test "x$ac_cv_header_termios_h" = xyes +then : + printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libc.h" "ac_cv_header_libc_h" "$ac_includes_default" +if test "x$ac_cv_header_libc_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBC_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_statfs_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_poll_h" = xyes +then : + printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_poll_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "$ac_includes_default" +if test "x$ac_cv_header_pwd_h" = xyes +then : + printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "$ac_includes_default" +if test "x$ac_cv_header_utime_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_param_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/ptms.h" "ac_cv_header_sys_ptms_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_ptms_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PTMS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +if test "x$ac_cv_header_libgen_h" = xyes +then : + printf "%s\n" "#define HAVE_LIBGEN_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "util/debug.h" "ac_cv_header_util_debug_h" "$ac_includes_default" +if test "x$ac_cv_header_util_debug_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIL_DEBUG_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "util/msg18n.h" "ac_cv_header_util_msg18n_h" "$ac_includes_default" +if test "x$ac_cv_header_util_msg18n_h" = xyes +then : + printf "%s\n" "#define HAVE_UTIL_MSG18N_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "frame.h" "ac_cv_header_frame_h" "$ac_includes_default" +if test "x$ac_cv_header_frame_h" = xyes +then : + printf "%s\n" "#define HAVE_FRAME_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_acl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_ACL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/access.h" "ac_cv_header_sys_access_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_access_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_ACCESS_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "sys/sysinfo.h" "ac_cv_header_sys_sysinfo_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_sysinfo_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSINFO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "wchar.h" "ac_cv_header_wchar_h" "$ac_includes_default" +if test "x$ac_cv_header_wchar_h" = xyes +then : + printf "%s\n" "#define HAVE_WCHAR_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "wctype.h" "ac_cv_header_wctype_h" "$ac_includes_default" +if test "x$ac_cv_header_wctype_h" = xyes +then : + printf "%s\n" "#define HAVE_WCTYPE_H 1" >>confdefs.h fi -done - -for ac_header in sys/ptem.h -do : - ac_fn_c_check_header_compile "$LINENO" "sys/ptem.h" "ac_cv_header_sys_ptem_h" "#if defined HAVE_SYS_STREAM_H +ac_fn_c_check_header_compile "$LINENO" "sys/ptem.h" "ac_cv_header_sys_ptem_h" "#if defined HAVE_SYS_STREAM_H # include #endif " -if test "x$ac_cv_header_sys_ptem_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_PTEM_H 1 -_ACEOF +if test "x$ac_cv_header_sys_ptem_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_PTEM_H 1" >>confdefs.h fi -done - -for ac_header in sys/sysctl.h -do : - ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if defined HAVE_SYS_PARAM_H +ac_fn_c_check_header_compile "$LINENO" "sys/sysctl.h" "ac_cv_header_sys_sysctl_h" "#if defined HAVE_SYS_PARAM_H # include #endif " -if test "x$ac_cv_header_sys_sysctl_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_SYSCTL_H 1 -_ACEOF +if test "x$ac_cv_header_sys_sysctl_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_SYSCTL_H 1" >>confdefs.h fi -done - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_np.h" >&5 -$as_echo_n "checking for pthread_np.h... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_np.h" >&5 +printf %s "checking for pthread_np.h... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { int i; i = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_PTHREAD_NP_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_PTHREAD_NP_H 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -for ac_header in strings.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" -if test "x$ac_cv_header_strings_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRINGS_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "$ac_includes_default" +if test "x$ac_cv_header_strings_h" = xyes +then : + printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h fi -done - if test "x$MACOS_X" = "xyes"; then - $as_echo "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h + printf "%s\n" "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h else -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if strings.h can be included after string.h" >&5 -$as_echo_n "checking if strings.h can be included after string.h... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strings.h can be included after string.h" >&5 +printf %s "checking if strings.h can be included after string.h... " >&6; } cppflags_save=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11508,32 +12207,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { int i; i = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - $as_echo "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop + printf "%s\n" "#define NO_STRINGS_WITH_STRING_H 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext CPPFLAGS=$cppflags_save fi if test $ac_cv_c_compiler_gnu = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 -$as_echo_n "checking whether $CC needs -traditional... " >&6; } -if ${ac_cv_prog_gcc_traditional+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 +printf %s "checking whether $CC needs -traditional... " >&6; } +if test ${ac_cv_prog_gcc_traditional+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_pattern="Autoconf.*'x'" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11541,12 +12242,13 @@ else Autoconf TIOCGETP _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes -else +else $as_nop ac_cv_prog_gcc_traditional=no fi -rm -f conftest* +rm -rf conftest* if test $ac_cv_prog_gcc_traditional = no; then @@ -11556,30 +12258,32 @@ rm -f conftest* Autoconf TCGETA _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then : + $EGREP "$ac_pattern" >/dev/null 2>&1 +then : ac_cv_prog_gcc_traditional=yes fi -rm -f conftest* +rm -rf conftest* fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 -$as_echo "$ac_cv_prog_gcc_traditional" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5 +printf "%s\n" "$ac_cv_prog_gcc_traditional" >&6; } if test $ac_cv_prog_gcc_traditional = yes; then CC="$CC -traditional" fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 -$as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if ${ac_cv_c_const+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 +printf %s "checking for an ANSI C-conforming const... " >&6; } +if test ${ac_cv_c_const+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { #ifndef __cplusplus @@ -11592,7 +12296,7 @@ main () /* NEC SVR4.0.2 mips cc rejects this. */ struct point {int x, y;}; static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. + /* IBM XL C 1.02.0.0 rejects this. It does not let you subtract one const X* pointer from another in an arm of an if-expression whose if-part is not a constant expression */ @@ -11620,7 +12324,7 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying + { /* IBM XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ struct s { int j; const int *ap[3]; } bx; struct s *b = &bx; b->j = 5; @@ -11636,31 +12340,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_const=yes -else +else $as_nop ac_cv_c_const=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 -$as_echo "$ac_cv_c_const" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5 +printf "%s\n" "$ac_cv_c_const" >&6; } if test $ac_cv_c_const = no; then -$as_echo "#define const /**/" >>confdefs.h +printf "%s\n" "#define const /**/" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 -$as_echo_n "checking for working volatile... " >&6; } -if ${ac_cv_c_volatile+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5 +printf %s "checking for working volatile... " >&6; } +if test ${ac_cv_c_volatile+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { volatile int x; @@ -11670,92 +12376,118 @@ return !x && !y; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_volatile=yes -else +else $as_nop ac_cv_c_volatile=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 -$as_echo "$ac_cv_c_volatile" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5 +printf "%s\n" "$ac_cv_c_volatile" >&6; } if test $ac_cv_c_volatile = no; then -$as_echo "#define volatile /**/" >>confdefs.h +printf "%s\n" "#define volatile /**/" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = xyes; then : +if test "x$ac_cv_type_mode_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define mode_t int -_ACEOF +printf "%s\n" "#define mode_t int" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = xyes; then : +if test "x$ac_cv_type_off_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define off_t long int -_ACEOF +printf "%s\n" "#define off_t long int" >>confdefs.h fi -ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = xyes; then : -else + ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default +" +if test "x$ac_cv_type_pid_t" = xyes +then : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #if defined _WIN64 && !defined __CYGWIN__ + LLP64 + #endif + +int +main (void) +{ + + ; + return 0; +} -cat >>confdefs.h <<_ACEOF -#define pid_t int _ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + ac_pid_type='int' +else $as_nop + ac_pid_type='__int64' +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + +printf "%s\n" "#define pid_t $ac_pid_type" >>confdefs.h + fi + ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = xyes; then : +if test "x$ac_cv_type_size_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF +printf "%s\n" "#define size_t unsigned int" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 -$as_echo_n "checking for uid_t in sys/types.h... " >&6; } -if ${ac_cv_type_uid_t+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 +printf %s "checking for uid_t in sys/types.h... " >&6; } +if test ${ac_cv_type_uid_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "uid_t" >/dev/null 2>&1; then : + $EGREP "uid_t" >/dev/null 2>&1 +then : ac_cv_type_uid_t=yes -else +else $as_nop ac_cv_type_uid_t=no fi -rm -f conftest* +rm -rf conftest* fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 -$as_echo "$ac_cv_type_uid_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5 +printf "%s\n" "$ac_cv_type_uid_t" >&6; } if test $ac_cv_type_uid_t = no; then -$as_echo "#define uid_t int" >>confdefs.h +printf "%s\n" "#define uid_t int" >>confdefs.h -$as_echo "#define gid_t int" >>confdefs.h +printf "%s\n" "#define gid_t int" >>confdefs.h fi @@ -11764,78 +12496,43 @@ case $ac_cv_c_uint32_t in #( no|yes) ;; #( *) -$as_echo "#define _UINT32_T 1" >>confdefs.h +printf "%s\n" "#define _UINT32_T 1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define uint32_t $ac_cv_c_uint32_t -_ACEOF +printf "%s\n" "#define uint32_t $ac_cv_c_uint32_t" >>confdefs.h ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; } -if ${ac_cv_header_time+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_time=yes -else - ac_cv_header_time=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5 -$as_echo "$ac_cv_header_time" >&6; } -if test $ac_cv_header_time = yes; then -$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h - -fi ac_fn_c_check_type "$LINENO" "ino_t" "ac_cv_type_ino_t" "$ac_includes_default" -if test "x$ac_cv_type_ino_t" = xyes; then : +if test "x$ac_cv_type_ino_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define ino_t long -_ACEOF +printf "%s\n" "#define ino_t long" >>confdefs.h fi ac_fn_c_check_type "$LINENO" "dev_t" "ac_cv_type_dev_t" "$ac_includes_default" -if test "x$ac_cv_type_dev_t" = xyes; then : +if test "x$ac_cv_type_dev_t" = xyes +then : -else +else $as_nop -cat >>confdefs.h <<_ACEOF -#define dev_t unsigned -_ACEOF +printf "%s\n" "#define dev_t unsigned" >>confdefs.h fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if ${ac_cv_c_bigendian+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 +printf %s "checking whether byte ordering is bigendian... " >&6; } +if test ${ac_cv_c_bigendian+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_bigendian=unknown # See if we're dealing with a universal compiler. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11846,7 +12543,8 @@ else typedef int dummy; _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # Check for potential -arch flags. It is not universal unless # there are at least two -arch flags with different values. @@ -11870,7 +12568,7 @@ if ac_fn_c_try_compile "$LINENO"; then : fi done fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext if test $ac_cv_c_bigendian = unknown; then # See if sys/param.h defines the BYTE_ORDER macro. cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -11879,7 +12577,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include int -main () +main (void) { #if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ @@ -11891,7 +12589,8 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -11899,7 +12598,7 @@ if ac_fn_c_try_compile "$LINENO"; then : #include int -main () +main (void) { #if BYTE_ORDER != BIG_ENDIAN not big endian @@ -11909,14 +12608,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). @@ -11925,7 +12625,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext #include int -main () +main (void) { #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) bogus endian macros @@ -11935,14 +12635,15 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : # It does; now see whether it defined to _BIG_ENDIAN or not. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { #ifndef _BIG_ENDIAN not big endian @@ -11952,31 +12653,33 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_bigendian=yes -else +else $as_nop ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi if test $ac_cv_c_bigendian = unknown; then # Compile a test program. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : # Try to guess by grepping values from an object file. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -short int ascii_mm[] = +unsigned short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = + unsigned short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; int use_ascii (int i) { return ascii_mm[i] + ascii_ii[i]; } - short int ebcdic_ii[] = + unsigned short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = + unsigned short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; int use_ebcdic (int i) { return ebcdic_mm[i] + ebcdic_ii[i]; @@ -11984,14 +12687,15 @@ short int ascii_mm[] = extern int foo; int -main () +main (void) { return use_ascii (foo) == use_ebcdic (foo); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then ac_cv_c_bigendian=yes fi @@ -12004,13 +12708,13 @@ if ac_fn_c_try_compile "$LINENO"; then : fi fi fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -else +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ $ac_includes_default int -main () +main (void) { /* Are we little or big endian? From Harbison&Steele. */ @@ -12026,9 +12730,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : ac_cv_c_bigendian=no -else +else $as_nop ac_cv_c_bigendian=yes fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -12037,17 +12742,17 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 +printf "%s\n" "$ac_cv_c_bigendian" >&6; } case $ac_cv_c_bigendian in #( yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h + printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h ;; #( no) ;; #( universal) -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h ;; #( *) @@ -12055,32 +12760,34 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 -$as_echo_n "checking for inline... " >&6; } -if ${ac_cv_c_inline+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 +printf %s "checking for inline... " >&6; } +if test ${ac_cv_c_inline+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifndef __cplusplus typedef int foo_t; -static $ac_kw foo_t static_foo () {return 0; } -$ac_kw foo_t foo () {return 0; } +static $ac_kw foo_t static_foo (void) {return 0; } +$ac_kw foo_t foo (void) {return 0; } #endif _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_c_inline=$ac_kw fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test "$ac_cv_c_inline" != no && break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 -$as_echo "$ac_cv_c_inline" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5 +printf "%s\n" "$ac_cv_c_inline" >&6; } case $ac_cv_c_inline in inline | yes) ;; @@ -12098,11 +12805,11 @@ _ACEOF esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5 -$as_echo_n "checking for rlim_t... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rlim_t" >&5 +printf %s "checking for rlim_t... " >&6; } if eval "test \"`echo '$''{'ac_cv_type_rlim_t'+set}'`\" = set"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_rlim_t" >&5 -$as_echo "(cached) $ac_cv_type_rlim_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_rlim_t" >&5 +printf "%s\n" "(cached) $ac_cv_type_rlim_t" >&6; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12118,15 +12825,16 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then : + $EGREP "(^|[^a-zA-Z_0-9])rlim_t[^a-zA-Z_0-9]" >/dev/null 2>&1 +then : ac_cv_type_rlim_t=yes -else +else $as_nop ac_cv_type_rlim_t=no fi -rm -f conftest* +rm -rf conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5 -$as_echo "$ac_cv_type_rlim_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_rlim_t" >&5 +printf "%s\n" "$ac_cv_type_rlim_t" >&6; } fi if test $ac_cv_type_rlim_t = no; then cat >> confdefs.h <<\EOF @@ -12134,11 +12842,11 @@ if test $ac_cv_type_rlim_t = no; then EOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stack_t" >&5 -$as_echo_n "checking for stack_t... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stack_t" >&5 +printf %s "checking for stack_t... " >&6; } if eval "test \"`echo '$''{'ac_cv_type_stack_t'+set}'`\" = set"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_stack_t" >&5 -$as_echo "(cached) $ac_cv_type_stack_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (cached) $ac_cv_type_stack_t" >&5 +printf "%s\n" "(cached) $ac_cv_type_stack_t" >&6; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12152,15 +12860,16 @@ else _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "stack_t" >/dev/null 2>&1; then : + $EGREP "stack_t" >/dev/null 2>&1 +then : ac_cv_type_stack_t=yes -else +else $as_nop ac_cv_type_stack_t=no fi -rm -f conftest* +rm -rf conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_stack_t" >&5 -$as_echo "$ac_cv_type_stack_t" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_stack_t" >&5 +printf "%s\n" "$ac_cv_type_stack_t" >&6; } fi if test $ac_cv_type_stack_t = no; then cat >> confdefs.h <<\EOF @@ -12168,8 +12877,8 @@ if test $ac_cv_type_stack_t = no; then EOF fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stack_t has an ss_base field" >&5 -$as_echo_n "checking whether stack_t has an ss_base field... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stack_t has an ss_base field" >&5 +printf %s "checking whether stack_t has an ss_base field... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12182,72 +12891,76 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include "confdefs.h" int -main () +main (void) { stack_t sigstk; sigstk.ss_base = 0; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SS_BASE 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SS_BASE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext olibs="$LIBS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-tlib argument" >&5 -$as_echo_n "checking --with-tlib argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-tlib argument" >&5 +printf %s "checking --with-tlib argument... " >&6; } # Check whether --with-tlib was given. -if test "${with_tlib+set}" = set; then : +if test ${with_tlib+y} +then : withval=$with_tlib; fi if test -n "$with_tlib"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_tlib" >&5 -$as_echo "$with_tlib" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_tlib" >&5 +printf "%s\n" "$with_tlib" >&6; } LIBS="$LIBS -l$with_tlib" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking with $with_tlib library" >&5 -$as_echo_n "checking for linking with $with_tlib library... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for linking with $with_tlib library" >&5 +printf %s "checking for linking with $with_tlib library... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } -else +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OK" >&5 +printf "%s\n" "OK" >&6; } +else $as_nop as_fn_error $? "FAILED" "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext olibs="$LIBS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5 -$as_echo "empty: automatic terminal library selection" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: empty: automatic terminal library selection" >&5 +printf "%s\n" "empty: automatic terminal library selection" >&6; } case "$vim_cv_uname_output" in OSF1|SCO_SV) tlibs="tinfo ncurses curses termlib termcap";; *) tlibs="tinfo ncurses termlib termcap curses";; esac for libname in $tlibs; do - as_ac_Lib=`$as_echo "ac_cv_lib_${libname}''_tgetent" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5 -$as_echo_n "checking for tgetent in -l${libname}... " >&6; } -if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 -else + as_ac_Lib=`printf "%s\n" "ac_cv_lib_${libname}""_tgetent" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l${libname}" >&5 +printf %s "checking for tgetent in -l${libname}... " >&6; } +if eval test \${$as_ac_Lib+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-l${libname} $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12256,33 +12969,32 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char tgetent (); int -main () +main (void) { return tgetent (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : eval "$as_ac_Lib=yes" -else +else $as_nop eval "$as_ac_Lib=no" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi eval ac_res=\$$as_ac_Lib - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_Lib"\" = x"yes" +then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 +#define `printf "%s\n" "HAVE_LIB${libname}" | $as_tr_cpp` 1 _ACEOF LIBS="-l${libname} $LIBS" @@ -12290,9 +13002,10 @@ _ACEOF fi if test "x$olibs" != "x$LIBS"; then - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : res="FAIL" -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12305,9 +13018,10 @@ else #endif int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : res="OK" -else +else $as_nop res="FAIL" fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -12317,55 +13031,58 @@ fi if test "$res" = "OK"; then break fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libname library is not usable" >&5 -$as_echo "$libname library is not usable" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libname library is not usable" >&5 +printf "%s\n" "$libname library is not usable" >&6; } LIBS="$olibs" fi done if test "x$olibs" = "x$LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no terminal library found" >&5 -$as_echo "no terminal library found" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no terminal library found" >&5 +printf "%s\n" "no terminal library found" >&6; } fi fi if test "x$olibs" = "x$LIBS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent()" >&5 -$as_echo_n "checking for tgetent()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent()" >&5 +printf %s "checking for tgetent()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int tgetent(char *, const char *); int -main () +main (void) { char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } +else $as_nop as_fn_error $? "NOT FOUND! You need to install a terminal library; for example ncurses. On Linux that would be the libncurses-dev package. Or specify the name of the library with --with-tlib." "$LINENO" 5 fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5 -$as_echo_n "checking whether we talk terminfo... " >&6; } -if ${vim_cv_terminfo+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we talk terminfo" >&5 +printf %s "checking whether we talk terminfo... " >&6; } +if test ${vim_cv_terminfo+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_terminfo'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12384,11 +13101,12 @@ int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(!strcmp(s==0 ? "" : s, "1")); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_terminfo=no -else +else $as_nop vim_cv_terminfo=yes @@ -12399,25 +13117,27 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_terminfo" >&5 -$as_echo "$vim_cv_terminfo" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_terminfo" >&5 +printf "%s\n" "$vim_cv_terminfo" >&6; } if test "x$vim_cv_terminfo" = "xyes" ; then - $as_echo "#define TERMINFO 1" >>confdefs.h + printf "%s\n" "#define TERMINFO 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5 -$as_echo_n "checking what tgetent() returns for an unknown terminal... " >&6; } -if ${vim_cv_tgetent+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking what tgetent() returns for an unknown terminal" >&5 +printf %s "checking what tgetent() returns for an unknown terminal... " >&6; } +if test ${vim_cv_tgetent+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "failed to compile test program." "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12433,11 +13153,12 @@ int main() {char s[10000]; int res = tgetent(s, "thisterminaldoesnotexist"); exit(res != 0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_tgetent=zero -else +else $as_nop vim_cv_tgetent=non-zero @@ -12448,16 +13169,16 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgetent" >&5 -$as_echo "$vim_cv_tgetent" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_tgetent" >&5 +printf "%s\n" "$vim_cv_tgetent" >&6; } if test "x$vim_cv_tgetent" = "xzero" ; then - $as_echo "#define TGETENT_ZERO_ERR 0" >>confdefs.h + printf "%s\n" "#define TGETENT_ZERO_ERR 0" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains ospeed" >&5 -$as_echo_n "checking whether termcap.h contains ospeed... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains ospeed" >&5 +printf %s "checking whether termcap.h contains ospeed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12466,22 +13187,23 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { ospeed = 20000 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_OSPEED 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_OSPEED 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ospeed can be extern" >&5 -$as_echo_n "checking whether ospeed can be extern... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ospeed can be extern" >&5 +printf %s "checking whether ospeed can be extern... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12491,30 +13213,31 @@ $as_echo_n "checking whether ospeed can be extern... " >&6; } extern short ospeed; int -main () +main (void) { ospeed = 20000 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define OSPEED_EXTERN 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define OSPEED_EXTERN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains UP, BC and PC" >&5 -$as_echo_n "checking whether termcap.h contains UP, BC and PC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termcap.h contains UP, BC and PC" >&5 +printf %s "checking whether termcap.h contains UP, BC and PC... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12523,22 +13246,23 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { if (UP == 0 && BC == 0) PC = 1 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_UP_BC_PC 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_UP_BC_PC 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UP, BC and PC can be extern" >&5 -$as_echo_n "checking whether UP, BC and PC can be extern... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether UP, BC and PC can be extern" >&5 +printf %s "checking whether UP, BC and PC can be extern... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12548,30 +13272,31 @@ $as_echo_n "checking whether UP, BC and PC can be extern... " >&6; } extern char *UP, *BC, PC; int -main () +main (void) { if (UP == 0 && BC == 0) PC = 1 ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define UP_BC_PC_EXTERN 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define UP_BC_PC_EXTERN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether tputs() uses outfuntype" >&5 -$as_echo_n "checking whether tputs() uses outfuntype... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether tputs() uses outfuntype" >&5 +printf %s "checking whether tputs() uses outfuntype... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12580,25 +13305,26 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { extern int xx(); tputs("test", 1, (outfuntype)xx) ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_OUTFUNTYPE 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_OUTFUNTYPE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether del_curterm() can be used" >&5 -$as_echo_n "checking whether del_curterm() can be used... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether del_curterm() can be used" >&5 +printf %s "checking whether del_curterm() can be used... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12608,26 +13334,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include int -main () +main (void) { if (cur_term) del_curterm(cur_term); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DEL_CURTERM 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_DEL_CURTERM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5 -$as_echo_n "checking whether sys/select.h and sys/time.h may both be included... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/select.h and sys/time.h may both be included" >&5 +printf %s "checking whether sys/select.h and sys/time.h may both be included... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12635,39 +13362,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #include #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define SYS_SELECT_WITH_SYS_TIME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 -$as_echo_n "checking for /dev/ptc... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/ptc" >&5 +printf %s "checking for /dev/ptc... " >&6; } if test -r /dev/ptc; then - $as_echo "#define HAVE_DEV_PTC 1" >>confdefs.h + printf "%s\n" "#define HAVE_DEV_PTC 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys" >&5 -$as_echo_n "checking for SVR4 ptys... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SVR4 ptys" >&5 +printf %s "checking for SVR4 ptys... " >&6; } if test -c /dev/ptmx ; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12678,7 +13405,7 @@ int unlockpt(int); int grantpt(int); int -main () +main (void) { ptsname(0); @@ -12688,23 +13415,24 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SVR4_PTYS 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SVR4_PTYS 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptyranges" >&5 -$as_echo_n "checking for ptyranges... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ptyranges" >&5 +printf %s "checking for ptyranges... " >&6; } if test -d /dev/ptym ; then pdir='/dev/ptym' else @@ -12718,34 +13446,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "yes" >/dev/null 2>&1; then : + $EGREP "yes" >/dev/null 2>&1 +then : ptys=`echo /dev/ptyp??` -else +else $as_nop ptys=`echo $pdir/pty??` fi -rm -f conftest* +rm -rf conftest* if test "$ptys" != "$pdir/pty??" ; then p0=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\).$/\1/g' | sort -u | tr -d '\012'` p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\012'` - cat >>confdefs.h <<_ACEOF -#define PTYRANGE0 "$p0" -_ACEOF + printf "%s\n" "#define PTYRANGE0 \"$p0\"" >>confdefs.h - cat >>confdefs.h <<_ACEOF -#define PTYRANGE1 "$p1" -_ACEOF + printf "%s\n" "#define PTYRANGE1 \"$p1\"" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $p0 / $p1" >&5 -$as_echo "$p0 / $p1" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $p0 / $p1" >&5 +printf "%s\n" "$p0 / $p1" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: don't know" >&5 -$as_echo "don't know" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: don't know" >&5 +printf "%s\n" "don't know" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sigcontext" >&5 -$as_echo_n "checking for struct sigcontext... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sigcontext" >&5 +printf %s "checking for struct sigcontext... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12757,35 +13482,38 @@ int test_sig() return 1; } int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_SIGCONTEXT 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_SIGCONTEXT 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5 -$as_echo_n "checking getcwd implementation is broken... " >&6; } -if ${vim_cv_getcwd_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking getcwd implementation is broken" >&5 +printf %s "checking getcwd implementation is broken... " >&6; } +if test ${vim_cv_getcwd_broken+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_getcwd_broken'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12803,11 +13531,12 @@ int main() } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_getcwd_broken=no -else +else $as_nop vim_cv_getcwd_broken=yes @@ -12818,63 +13547,363 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_getcwd_broken" >&5 -$as_echo "$vim_cv_getcwd_broken" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_getcwd_broken" >&5 +printf "%s\n" "$vim_cv_getcwd_broken" >&6; } if test "x$vim_cv_getcwd_broken" = "xyes" ; then - $as_echo "#define BAD_GETCWD 1" >>confdefs.h + printf "%s\n" "#define BAD_GETCWD 1" >>confdefs.h - for ac_func in getwd -do : ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd" -if test "x$ac_cv_func_getwd" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETWD 1 -_ACEOF - -fi -done +if test "x$ac_cv_func_getwd" = xyes +then : + printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h fi -for ac_func in fchdir fchown fchmod fsync getcwd getpseudotty \ - getpwent getpwnam getpwuid getrlimit gettimeofday localtime_r lstat \ - memset mkdtemp nanosleep opendir putenv qsort readlink select setenv \ - getpgid setpgid setsid sigaltstack sigstack sigset sigsetjmp sigaction \ - sigprocmask sigvec strcasecmp strcoll strerror strftime stricmp strncasecmp \ - strnicmp strpbrk strptime strtol tgetent towlower towupper iswupper \ - tzset usleep utime utimes mblen ftruncate unsetenv posix_openpt \ - clock_gettime -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF +fi + +ac_fn_c_check_func "$LINENO" "fchdir" "ac_cv_func_fchdir" +if test "x$ac_cv_func_fchdir" = xyes +then : + printf "%s\n" "#define HAVE_FCHDIR 1" >>confdefs.h fi -done +ac_fn_c_check_func "$LINENO" "fchown" "ac_cv_func_fchown" +if test "x$ac_cv_func_fchown" = xyes +then : + printf "%s\n" "#define HAVE_FCHOWN 1" >>confdefs.h -for ac_header in sys/select.h sys/socket.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +fi +ac_fn_c_check_func "$LINENO" "fchmod" "ac_cv_func_fchmod" +if test "x$ac_cv_func_fchmod" = xyes +then : + printf "%s\n" "#define HAVE_FCHMOD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "fsync" "ac_cv_func_fsync" +if test "x$ac_cv_func_fsync" = xyes +then : + printf "%s\n" "#define HAVE_FSYNC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd" +if test "x$ac_cv_func_getcwd" = xyes +then : + printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpseudotty" "ac_cv_func_getpseudotty" +if test "x$ac_cv_func_getpseudotty" = xyes +then : + printf "%s\n" "#define HAVE_GETPSEUDOTTY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpwent" "ac_cv_func_getpwent" +if test "x$ac_cv_func_getpwent" = xyes +then : + printf "%s\n" "#define HAVE_GETPWENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpwnam" "ac_cv_func_getpwnam" +if test "x$ac_cv_func_getpwnam" = xyes +then : + printf "%s\n" "#define HAVE_GETPWNAM 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpwuid" "ac_cv_func_getpwuid" +if test "x$ac_cv_func_getpwuid" = xyes +then : + printf "%s\n" "#define HAVE_GETPWUID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit" +if test "x$ac_cv_func_getrlimit" = xyes +then : + printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday" +if test "x$ac_cv_func_gettimeofday" = xyes +then : + printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" +if test "x$ac_cv_func_localtime_r" = xyes +then : + printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "lstat" "ac_cv_func_lstat" +if test "x$ac_cv_func_lstat" = xyes +then : + printf "%s\n" "#define HAVE_LSTAT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "memset" "ac_cv_func_memset" +if test "x$ac_cv_func_memset" = xyes +then : + printf "%s\n" "#define HAVE_MEMSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp" +if test "x$ac_cv_func_mkdtemp" = xyes +then : + printf "%s\n" "#define HAVE_MKDTEMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" +if test "x$ac_cv_func_nanosleep" = xyes +then : + printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "opendir" "ac_cv_func_opendir" +if test "x$ac_cv_func_opendir" = xyes +then : + printf "%s\n" "#define HAVE_OPENDIR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv" +if test "x$ac_cv_func_putenv" = xyes +then : + printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "qsort" "ac_cv_func_qsort" +if test "x$ac_cv_func_qsort" = xyes +then : + printf "%s\n" "#define HAVE_QSORT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "readlink" "ac_cv_func_readlink" +if test "x$ac_cv_func_readlink" = xyes +then : + printf "%s\n" "#define HAVE_READLINK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "select" "ac_cv_func_select" +if test "x$ac_cv_func_select" = xyes +then : + printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" +if test "x$ac_cv_func_setenv" = xyes +then : + printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid" +if test "x$ac_cv_func_getpgid" = xyes +then : + printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setpgid" "ac_cv_func_setpgid" +if test "x$ac_cv_func_setpgid" = xyes +then : + printf "%s\n" "#define HAVE_SETPGID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid" +if test "x$ac_cv_func_setsid" = xyes +then : + printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigaltstack" "ac_cv_func_sigaltstack" +if test "x$ac_cv_func_sigaltstack" = xyes +then : + printf "%s\n" "#define HAVE_SIGALTSTACK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigstack" "ac_cv_func_sigstack" +if test "x$ac_cv_func_sigstack" = xyes +then : + printf "%s\n" "#define HAVE_SIGSTACK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigset" "ac_cv_func_sigset" +if test "x$ac_cv_func_sigset" = xyes +then : + printf "%s\n" "#define HAVE_SIGSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp" +if test "x$ac_cv_func_sigsetjmp" = xyes +then : + printf "%s\n" "#define HAVE_SIGSETJMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" +if test "x$ac_cv_func_sigaction" = xyes +then : + printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" +if test "x$ac_cv_func_sigprocmask" = xyes +then : + printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "sigvec" "ac_cv_func_sigvec" +if test "x$ac_cv_func_sigvec" = xyes +then : + printf "%s\n" "#define HAVE_SIGVEC 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" +if test "x$ac_cv_func_strcasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strcoll" "ac_cv_func_strcoll" +if test "x$ac_cv_func_strcoll" = xyes +then : + printf "%s\n" "#define HAVE_STRCOLL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strerror" "ac_cv_func_strerror" +if test "x$ac_cv_func_strerror" = xyes +then : + printf "%s\n" "#define HAVE_STRERROR 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime" +if test "x$ac_cv_func_strftime" = xyes +then : + printf "%s\n" "#define HAVE_STRFTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "stricmp" "ac_cv_func_stricmp" +if test "x$ac_cv_func_stricmp" = xyes +then : + printf "%s\n" "#define HAVE_STRICMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strncasecmp" "ac_cv_func_strncasecmp" +if test "x$ac_cv_func_strncasecmp" = xyes +then : + printf "%s\n" "#define HAVE_STRNCASECMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strnicmp" "ac_cv_func_strnicmp" +if test "x$ac_cv_func_strnicmp" = xyes +then : + printf "%s\n" "#define HAVE_STRNICMP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strpbrk" "ac_cv_func_strpbrk" +if test "x$ac_cv_func_strpbrk" = xyes +then : + printf "%s\n" "#define HAVE_STRPBRK 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime" +if test "x$ac_cv_func_strptime" = xyes +then : + printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" +if test "x$ac_cv_func_strtol" = xyes +then : + printf "%s\n" "#define HAVE_STRTOL 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "tgetent" "ac_cv_func_tgetent" +if test "x$ac_cv_func_tgetent" = xyes +then : + printf "%s\n" "#define HAVE_TGETENT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "towlower" "ac_cv_func_towlower" +if test "x$ac_cv_func_towlower" = xyes +then : + printf "%s\n" "#define HAVE_TOWLOWER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "towupper" "ac_cv_func_towupper" +if test "x$ac_cv_func_towupper" = xyes +then : + printf "%s\n" "#define HAVE_TOWUPPER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "iswupper" "ac_cv_func_iswupper" +if test "x$ac_cv_func_iswupper" = xyes +then : + printf "%s\n" "#define HAVE_ISWUPPER 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset" +if test "x$ac_cv_func_tzset" = xyes +then : + printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep" +if test "x$ac_cv_func_usleep" = xyes +then : + printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime" +if test "x$ac_cv_func_utime" = xyes +then : + printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes" +if test "x$ac_cv_func_utimes" = xyes +then : + printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "mblen" "ac_cv_func_mblen" +if test "x$ac_cv_func_mblen" = xyes +then : + printf "%s\n" "#define HAVE_MBLEN 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "ftruncate" "ac_cv_func_ftruncate" +if test "x$ac_cv_func_ftruncate" = xyes +then : + printf "%s\n" "#define HAVE_FTRUNCATE 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" +if test "x$ac_cv_func_unsetenv" = xyes +then : + printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "posix_openpt" "ac_cv_func_posix_openpt" +if test "x$ac_cv_func_posix_openpt" = xyes +then : + printf "%s\n" "#define HAVE_POSIX_OPENPT 1" >>confdefs.h + +fi +ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime" +if test "x$ac_cv_func_clock_gettime" = xyes +then : + printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h fi -done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 -$as_echo_n "checking types of arguments for select... " >&6; } -if ${ac_cv_func_select_args+:} false; then : - $as_echo_n "(cached) " >&6 -else - for ac_arg234 in 'fd_set *' 'int *' 'void *'; do + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5 +printf %s "checking types of arguments for select... " >&6; } +if test ${ac_cv_func_select_args+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_cv_func_select_args='int,int *,struct timeval *' +for ac_arg234 in 'fd_set *' 'int *' 'void *'; do for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -12888,7 +13917,7 @@ $ac_includes_default #endif int -main () +main (void) { extern int select ($ac_arg1, $ac_arg234, $ac_arg234, $ac_arg234, @@ -12897,52 +13926,46 @@ extern int select ($ac_arg1, return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3 fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done done done -# Provide a safe default value. -: "${ac_cv_func_select_args=int,int *,struct timeval *}" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 -$as_echo "$ac_cv_func_select_args" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5 +printf "%s\n" "$ac_cv_func_select_args" >&6; } ac_save_IFS=$IFS; IFS=',' set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'` IFS=$ac_save_IFS shift -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG1 $1 -_ACEOF +printf "%s\n" "#define SELECT_TYPE_ARG1 $1" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG234 ($2) -_ACEOF +printf "%s\n" "#define SELECT_TYPE_ARG234 ($2)" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define SELECT_TYPE_ARG5 ($3) -_ACEOF +printf "%s\n" "#define SELECT_TYPE_ARG5 ($3)" >>confdefs.h -rm -f conftest* +rm -rf conftest* -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if ${ac_cv_sys_largefile_source+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 +printf %s "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_source+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include /* for off_t */ #include int -main () +main (void) { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -12950,10 +13973,11 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_sys_largefile_source=no; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -12961,7 +13985,7 @@ rm -f core conftest.err conftest.$ac_objext \ #include /* for off_t */ #include int -main () +main (void) { int (*fp) (FILE *, off_t, int) = fseeko; return fseeko (stdin, 0, 0) && fp (stdin, 0, 0); @@ -12969,23 +13993,22 @@ int (*fp) (FILE *, off_t, int) = fseeko; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_sys_largefile_source=1; break fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext ac_cv_sys_largefile_source=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 -$as_echo "$ac_cv_sys_largefile_source" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5 +printf "%s\n" "$ac_cv_sys_largefile_source" >&6; } case $ac_cv_sys_largefile_source in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -_ACEOF +printf "%s\n" "#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source" >>confdefs.h ;; esac rm -rf conftest* @@ -12995,23 +14018,25 @@ rm -rf conftest* # If you want fseeko and ftello with glibc, upgrade to a fixed glibc. if test $ac_cv_sys_largefile_source != unknown; then -$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h +printf "%s\n" "#define HAVE_FSEEKO 1" >>confdefs.h fi # Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : +if test ${enable_largefile+y} +then : enableval=$enable_largefile; fi if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if ${ac_cv_sys_largefile_CC+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 +printf %s "checking for special C compiler options needed for large files... " >&6; } +if test ${ac_cv_sys_largefile_CC+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC @@ -13025,44 +14050,47 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : + if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_largefile_CC=' -n32'; break fi -rm -f core conftest.err conftest.$ac_objext +rm -f core conftest.err conftest.$ac_objext conftest.beam break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 +printf "%s\n" "$ac_cv_sys_largefile_CC" >&6; } if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if ${ac_cv_sys_file_offset_bits+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +printf %s "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } +if test ${ac_cv_sys_file_offset_bits+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13071,22 +14099,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 @@ -13095,43 +14124,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_file_offset_bits=64; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_file_offset_bits=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 +printf "%s\n" "$ac_cv_sys_file_offset_bits" >&6; } case $ac_cv_sys_file_offset_bits in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -_ACEOF +printf "%s\n" "#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits" >>confdefs.h ;; esac rm -rf conftest* if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if ${ac_cv_sys_large_files+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 +printf %s "checking for _LARGE_FILES value needed for large files... " >&6; } +if test ${ac_cv_sys_large_files+y} +then : + printf %s "(cached) " >&6 +else $as_nop while :; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13140,22 +14169,23 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=no; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define _LARGE_FILES 1 @@ -13164,71 +14194,69 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) +#define LARGE_OFF_T (((off_t) 1 << 31 << 31) - 1 + ((off_t) 1 << 31 << 31)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_sys_large_files=1; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ac_cv_sys_large_files=unknown break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 +printf "%s\n" "$ac_cv_sys_large_files" >&6; } case $ac_cv_sys_large_files in #( no | unknown) ;; *) -cat >>confdefs.h <<_ACEOF -#define _LARGE_FILES $ac_cv_sys_large_files -_ACEOF +printf "%s\n" "#define _LARGE_FILES $ac_cv_sys_large_files" >>confdefs.h ;; esac rm -rf conftest* fi - - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-canberra argument" >&5 -$as_echo_n "checking --enable-canberra argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-canberra argument" >&5 +printf %s "checking --enable-canberra argument... " >&6; } # Check whether --enable-canberra was given. -if test "${enable_canberra+set}" = set; then : +if test ${enable_canberra+y} +then : enableval=$enable_canberra; -else +else $as_nop enable_canberra="maybe" fi if test "$enable_canberra" = "maybe"; then if test "$features" = "huge"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 -$as_echo "Defaulting to yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 +printf "%s\n" "Defaulting to yes" >&6; } enable_canberra="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 -$as_echo "Defaulting to no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 +printf "%s\n" "Defaulting to no" >&6; } enable_canberra="no" fi else if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny features" >&5 -$as_echo "cannot use sound with tiny features" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny features" >&5 +printf "%s\n" "cannot use sound with tiny features" >&6; } enable_canberra="no" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 -$as_echo "$enable_canberra" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 +printf "%s\n" "$enable_canberra" >&6; } fi fi if test "$enable_canberra" = "yes"; then @@ -13240,8 +14268,8 @@ if test "$enable_canberra" = "yes"; then canberra_lib=-lcanberra canberra_cflags=-D_REENTRANT fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5 -$as_echo_n "checking for libcanberra... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcanberra" >&5 +printf %s "checking for libcanberra... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then @@ -13254,7 +14282,7 @@ $as_echo_n "checking for libcanberra... " >&6; } # include int -main () +main (void) { ca_context *hello; @@ -13263,41 +14291,43 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_CANBERRA 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_CANBERRA 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; try installing libcanberra-dev" >&5 -$as_echo "no; try installing libcanberra-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; try installing libcanberra-dev" >&5 +printf "%s\n" "no; try installing libcanberra-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-libsodium argument" >&5 -$as_echo_n "checking --enable-libsodium argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-libsodium argument" >&5 +printf %s "checking --enable-libsodium argument... " >&6; } # Check whether --enable-libsodium was given. -if test "${enable_libsodium+set}" = set; then : +if test ${enable_libsodium+y} +then : enableval=$enable_libsodium; -else +else $as_nop enable_libsodium="maybe" fi if test "$enable_libsodium" = "maybe"; then if test "$features" = "huge"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 -$as_echo "Defaulting to yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to yes" >&5 +printf "%s\n" "Defaulting to yes" >&6; } enable_libsodium="yes" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 -$as_echo "Defaulting to no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Defaulting to no" >&5 +printf "%s\n" "Defaulting to no" >&6; } enable_libsodium="no" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libsodium" >&5 -$as_echo "$enable_libsodium" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_libsodium" >&5 +printf "%s\n" "$enable_libsodium" >&6; } fi if test "$enable_libsodium" = "yes"; then if test "x$PKG_CONFIG" != "xno"; then @@ -13308,8 +14338,8 @@ if test "$enable_libsodium" = "yes"; then libsodium_lib=-lsodium libsodium_cflags= fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium" >&5 -$as_echo_n "checking for libsodium... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium" >&5 +printf %s "checking for libsodium... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $libsodium_cflags" @@ -13320,7 +14350,7 @@ $as_echo_n "checking for libsodium... " >&6; } # include int -main () +main (void) { printf("%d", sodium_init()); @@ -13328,15 +14358,16 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SODIUM 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SODIUM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no; try installing libsodium-dev" >&5 -$as_echo "no; try installing libsodium-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no; try installing libsodium-dev" >&5 +printf "%s\n" "no; try installing libsodium-dev" >&6; }; CFLAGS="$ac_save_CFLAGS"; LIBS="$ac_save_LIBS" fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext # MacVim: Hack to statically link against libsodium instead of dynamic link, as we can't distribute app bundles with @@ -13344,26 +14375,26 @@ rm -f core conftest.err conftest.$ac_objext \ # linkage if a dylib exists in the same folder, and as such we have to manually specify the library path instead # of using -l syntax. This also means it won't work with AC_LINK_IFELSE as specifying full lib path only works # if you have separate compile/link stages but AC_LINK_IFELSE just compiles/link in one command. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium.a" >&5 -$as_echo_n "checking for libsodium.a... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium.a" >&5 +printf %s "checking for libsodium.a... " >&6; } if test -f ${local_dir}/lib/libsodium.a; then LIBS="$ac_save_LIBS ${local_dir}/lib/libsodium.a" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ${local_dir}/lib/libsodium.a instead of -lsodium" >&5 -$as_echo "Using ${local_dir}/lib/libsodium.a instead of -lsodium" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ${local_dir}/lib/libsodium.a instead of -lsodium" >&5 +printf "%s\n" "Using ${local_dir}/lib/libsodium.a instead of -lsodium" >&6; }; else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libsodium.a not found - keeping using -lsodium" >&5 -$as_echo "libsodium.a not found - keeping using -lsodium" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libsodium.a not found - keeping using -lsodium" >&5 +printf "%s\n" "libsodium.a not found - keeping using -lsodium" >&6; }; fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_blksize" >&5 -$as_echo_n "checking for st_blksize... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for st_blksize" >&5 +printf %s "checking for st_blksize... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { struct stat st; int n; @@ -13374,27 +14405,30 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ST_BLKSIZE 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ST_BLKSIZE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create without -lrt" >&5 -$as_echo_n "checking for timer_create without -lrt... " >&6; } -if ${vim_cv_timer_create+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create without -lrt" >&5 +printf %s "checking for timer_create without -lrt... " >&6; } +if test ${vim_cv_timer_create+y} +then : + printf %s "(cached) " >&6 +else $as_nop -if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&5 -$as_echo "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&2;} +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&5 +printf "%s\n" "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create'" >&2;} -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13407,7 +14441,7 @@ else static void set_flag(union sigval sv) {} int -main () +main (void) { struct timespec ts; @@ -13423,9 +14457,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_timer_create=yes -else +else $as_nop vim_cv_timer_create=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13433,23 +14468,25 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create" >&5 -$as_echo "$vim_cv_timer_create" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create" >&5 +printf "%s\n" "$vim_cv_timer_create" >&6; } if test "x$vim_cv_timer_create" = "xno" ; then save_LIBS="$LIBS" LIBS="$LIBS -lrt" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create with -lrt" >&5 -$as_echo_n "checking for timer_create with -lrt... " >&6; } -if ${vim_cv_timer_create_with_lrt+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create with -lrt" >&5 +printf %s "checking for timer_create with -lrt... " >&6; } +if test ${vim_cv_timer_create_with_lrt+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&5 -$as_echo "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&2;} + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&5 +printf "%s\n" "$as_me: WARNING: failed to build test program; if cross-compiling please set 'vim_cv_timer_create_with_lrt'" >&2;} -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13462,7 +14499,7 @@ else static void set_flag(union sigval sv) {} int -main () +main (void) { struct timespec ts; @@ -13478,9 +14515,10 @@ main () return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_timer_create_with_lrt=yes -else +else $as_nop vim_cv_timer_create_with_lrt=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -13488,34 +14526,36 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create_with_lrt" >&5 -$as_echo "$vim_cv_timer_create_with_lrt" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_timer_create_with_lrt" >&5 +printf "%s\n" "$vim_cv_timer_create_with_lrt" >&6; } LIBS="$save_LIBS" else vim_cv_timer_create_with_lrt=no fi if test "x$vim_cv_timer_create" = "xyes" ; then - $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h fi if test "x$vim_cv_timer_create_with_lrt" = "xyes" ; then - $as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h + printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h LIBS="$LIBS -lrt" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5 -$as_echo_n "checking whether stat() ignores a trailing slash... " >&6; } -if ${vim_cv_stat_ignores_slash+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stat() ignores a trailing slash" >&5 +printf %s "checking whether stat() ignores a trailing slash... " >&6; } +if test ${vim_cv_stat_ignores_slash+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_stat_ignores_slash'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13529,11 +14569,12 @@ else int main() {struct stat st; exit(stat("configure/", &st) != 0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_stat_ignores_slash=yes -else +else $as_nop vim_cv_stat_ignores_slash=no @@ -13544,19 +14585,20 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_stat_ignores_slash" >&5 -$as_echo "$vim_cv_stat_ignores_slash" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_stat_ignores_slash" >&5 +printf "%s\n" "$vim_cv_stat_ignores_slash" >&6; } if test "x$vim_cv_stat_ignores_slash" = "xyes" ; then - $as_echo "#define STAT_IGNORES_SLASH 1" >>confdefs.h + printf "%s\n" "#define STAT_IGNORES_SLASH 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanoseconds field of struct stat" >&5 -$as_echo_n "checking for nanoseconds field of struct stat... " >&6; } -if ${ac_cv_struct_st_mtim_nsec+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanoseconds field of struct stat" >&5 +printf %s "checking for nanoseconds field of struct stat... " >&6; } +if test ${ac_cv_struct_st_mtim_nsec+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_save_CPPFLAGS="$CPPFLAGS" ac_cv_struct_st_mtim_nsec=no # st_mtim.tv_nsec -- the usual case @@ -13573,33 +14615,32 @@ else #include #include int -main () +main (void) { struct stat s; s.ST_MTIM_NSEC; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : ac_cv_struct_st_mtim_nsec=$ac_val; break fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext done CPPFLAGS="$ac_save_CPPFLAGS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_st_mtim_nsec" >&5 -$as_echo "$ac_cv_struct_st_mtim_nsec" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_st_mtim_nsec" >&5 +printf "%s\n" "$ac_cv_struct_st_mtim_nsec" >&6; } if test $ac_cv_struct_st_mtim_nsec != no; then -cat >>confdefs.h <<_ACEOF -#define ST_MTIM_NSEC $ac_cv_struct_st_mtim_nsec -_ACEOF +printf "%s\n" "#define ST_MTIM_NSEC $ac_cv_struct_st_mtim_nsec" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open()" >&5 -$as_echo_n "checking for iconv_open()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv_open()" >&5 +printf %s "checking for iconv_open()... " >&6; } save_LIBS="$LIBS" LIBS="$LIBS -liconv" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13610,18 +14651,19 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { iconv_open("fr", "to"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes; with -liconv" >&5 -$as_echo "yes; with -liconv" >&6; }; $as_echo "#define HAVE_ICONV 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes; with -liconv" >&5 +printf "%s\n" "yes; with -liconv" >&6; }; printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h -else +else $as_nop LIBS="$save_LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13631,30 +14673,31 @@ else #endif int -main () +main (void) { iconv_open("fr", "to"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ICONV 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo(CODESET)" >&5 -$as_echo_n "checking for nl_langinfo(CODESET)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo(CODESET)" >&5 +printf %s "checking for nl_langinfo(CODESET)... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13663,29 +14706,31 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { char *cs = nl_langinfo(CODESET); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_NL_LANGINFO_CODESET 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_NL_LANGINFO_CODESET 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5 -$as_echo_n "checking for strtod in -lm... " >&6; } -if ${ac_cv_lib_m_strtod+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strtod in -lm" >&5 +printf %s "checking for strtod in -lm... " >&6; } +if test ${ac_cv_lib_m_strtod+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13694,41 +14739,38 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char strtod (); int -main () +main (void) { return strtod (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_m_strtod=yes -else +else $as_nop ac_cv_lib_m_strtod=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5 -$as_echo "$ac_cv_lib_m_strtod" >&6; } -if test "x$ac_cv_lib_m_strtod" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_strtod" >&5 +printf "%s\n" "$ac_cv_lib_m_strtod" >&6; } +if test "x$ac_cv_lib_m_strtod" = xyes +then : + printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h LIBS="-lm $LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isinf()" >&5 -$as_echo_n "checking for isinf()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isinf()" >&5 +printf %s "checking for isinf()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13741,26 +14783,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { int r = isinf(1.11); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ISINF 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ISINF 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan()" >&5 -$as_echo_n "checking for isnan()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isnan()" >&5 +printf %s "checking for isnan()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13773,41 +14816,44 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #endif int -main () +main (void) { int r = isnan(1.11); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_ISNAN 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_ISNAN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-acl argument" >&5 -$as_echo_n "checking --disable-acl argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-acl argument" >&5 +printf %s "checking --disable-acl argument... " >&6; } # Check whether --enable-acl was given. -if test "${enable_acl+set}" = set; then : +if test ${enable_acl+y} +then : enableval=$enable_acl; -else +else $as_nop enable_acl="yes" fi if test "$enable_acl" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5 -$as_echo_n "checking for acl_get_file in -lposix1e... " >&6; } -if ${ac_cv_lib_posix1e_acl_get_file+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lposix1e" >&5 +printf %s "checking for acl_get_file in -lposix1e... " >&6; } +if test ${ac_cv_lib_posix1e_acl_get_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lposix1e $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13816,37 +14862,37 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char acl_get_file (); int -main () +main (void) { return acl_get_file (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_posix1e_acl_get_file=yes -else +else $as_nop ac_cv_lib_posix1e_acl_get_file=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5 -$as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; } -if test "x$ac_cv_lib_posix1e_acl_get_file" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix1e_acl_get_file" >&5 +printf "%s\n" "$ac_cv_lib_posix1e_acl_get_file" >&6; } +if test "x$ac_cv_lib_posix1e_acl_get_file" = xyes +then : LIBS="$LIBS -lposix1e" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 -$as_echo_n "checking for acl_get_file in -lacl... " >&6; } -if ${ac_cv_lib_acl_acl_get_file+:} false; then : - $as_echo_n "(cached) " >&6 -else +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5 +printf %s "checking for acl_get_file in -lacl... " >&6; } +if test ${ac_cv_lib_acl_acl_get_file+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lacl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13855,36 +14901,36 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char acl_get_file (); int -main () +main (void) { return acl_get_file (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_acl_acl_get_file=yes -else +else $as_nop ac_cv_lib_acl_acl_get_file=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5 -$as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } -if test "x$ac_cv_lib_acl_acl_get_file" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_get_file" >&5 +printf "%s\n" "$ac_cv_lib_acl_acl_get_file" >&6; } +if test "x$ac_cv_lib_acl_acl_get_file" = xyes +then : LIBS="$LIBS -lacl" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 -$as_echo_n "checking for fgetxattr in -lattr... " >&6; } -if ${ac_cv_lib_attr_fgetxattr+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 +printf %s "checking for fgetxattr in -lattr... " >&6; } +if test ${ac_cv_lib_attr_fgetxattr+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lattr $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13893,30 +14939,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char fgetxattr (); int -main () +main (void) { return fgetxattr (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_attr_fgetxattr=yes -else +else $as_nop ac_cv_lib_attr_fgetxattr=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 -$as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } -if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 +printf "%s\n" "$ac_cv_lib_attr_fgetxattr" >&6; } +if test "x$ac_cv_lib_attr_fgetxattr" = xyes +then : LIBS="$LIBS -lattr" fi @@ -13925,8 +14970,8 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5 -$as_echo_n "checking for POSIX ACL support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX ACL support" >&5 +printf %s "checking for POSIX ACL support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -13936,7 +14981,7 @@ $as_echo_n "checking for POSIX ACL support... " >&6; } #endif acl_t acl; int -main () +main (void) { acl = acl_get_file("foo", ACL_TYPE_ACCESS); acl_set_file("foo", ACL_TYPE_ACCESS, acl); @@ -13945,22 +14990,24 @@ acl = acl_get_file("foo", ACL_TYPE_ACCESS); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_POSIX_ACL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_POSIX_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5 -$as_echo_n "checking for acl_get in -lsec... " >&6; } -if ${ac_cv_lib_sec_acl_get+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_get in -lsec" >&5 +printf %s "checking for acl_get in -lsec... " >&6; } +if test ${ac_cv_lib_sec_acl_get+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lsec $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13969,35 +15016,34 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char acl_get (); int -main () +main (void) { return acl_get (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_sec_acl_get=yes -else +else $as_nop ac_cv_lib_sec_acl_get=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5 -$as_echo "$ac_cv_lib_sec_acl_get" >&6; } -if test "x$ac_cv_lib_sec_acl_get" = xyes; then : - LIBS="$LIBS -lsec"; $as_echo "#define HAVE_SOLARIS_ZFS_ACL 1" >>confdefs.h +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sec_acl_get" >&5 +printf "%s\n" "$ac_cv_lib_sec_acl_get" >&6; } +if test "x$ac_cv_lib_sec_acl_get" = xyes +then : + LIBS="$LIBS -lsec"; printf "%s\n" "#define HAVE_SOLARIS_ZFS_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris ACL support" >&5 -$as_echo_n "checking for Solaris ACL support... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solaris ACL support" >&5 +printf %s "checking for Solaris ACL support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14005,7 +15051,7 @@ $as_echo_n "checking for Solaris ACL support... " >&6; } # include #endif int -main () +main (void) { acl("foo", GETACLCNT, 0, NULL); @@ -14013,21 +15059,22 @@ acl("foo", GETACLCNT, 0, NULL); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SOLARIS_ACL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SOLARIS_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5 -$as_echo_n "checking for AIX ACL support... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for AIX ACL support" >&5 +printf %s "checking for AIX ACL support... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14048,7 +15095,7 @@ $as_echo_n "checking for AIX ACL support... " >&6; } int aclsize; struct acl *aclent; int -main () +main (void) { aclsize = sizeof(struct acl); aclent = (void *)malloc(aclsize); @@ -14058,24 +15105,25 @@ aclsize = sizeof(struct acl); return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_AIX_ACL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_AIX_ACL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi if test "x$GTK_CFLAGS" != "x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pango_shape_full" >&5 -$as_echo_n "checking for pango_shape_full... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pango_shape_full" >&5 +printf %s "checking for pango_shape_full... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS" @@ -14084,110 +15132,116 @@ $as_echo_n "checking for pango_shape_full... " >&6; } /* end confdefs.h. */ #include int -main () +main (void) { pango_shape_full(NULL, 0, NULL, 0, NULL, NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_PANGO_SHAPE_FULL 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_PANGO_SHAPE_FULL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5 -$as_echo_n "checking --enable-gpm argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-gpm argument" >&5 +printf %s "checking --enable-gpm argument... " >&6; } # Check whether --enable-gpm was given. -if test "${enable_gpm+set}" = set; then : +if test ${enable_gpm+y} +then : enableval=$enable_gpm; -else +else $as_nop enable_gpm="yes" fi if test "$enable_gpm" = "yes" -o "$enable_gpm" = "dynamic"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5 -$as_echo "$enable_gpm" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5 -$as_echo_n "checking for gpm... " >&6; } -if ${vi_cv_have_gpm+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_gpm" >&5 +printf "%s\n" "$enable_gpm" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gpm" >&5 +printf %s "checking for gpm... " >&6; } +if test ${vi_cv_have_gpm+y} +then : + printf %s "(cached) " >&6 +else $as_nop olibs="$LIBS" ; LIBS="-lgpm" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { Gpm_GetLibVersion(NULL); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vi_cv_have_gpm=yes -else +else $as_nop vi_cv_have_gpm=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS="$olibs" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5 -$as_echo "$vi_cv_have_gpm" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_gpm" >&5 +printf "%s\n" "$vi_cv_have_gpm" >&6; } if test $vi_cv_have_gpm = yes; then if test "$enable_gpm" = "yes"; then LIBS="$LIBS -lgpm" else - $as_echo "#define DYNAMIC_GPM 1" >>confdefs.h + printf "%s\n" "#define DYNAMIC_GPM 1" >>confdefs.h fi - $as_echo "#define HAVE_GPM 1" >>confdefs.h + printf "%s\n" "#define HAVE_GPM 1" >>confdefs.h fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5 -$as_echo_n "checking --disable-sysmouse argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-sysmouse argument" >&5 +printf %s "checking --disable-sysmouse argument... " >&6; } # Check whether --enable-sysmouse was given. -if test "${enable_sysmouse+set}" = set; then : +if test ${enable_sysmouse+y} +then : enableval=$enable_sysmouse; -else +else $as_nop enable_sysmouse="yes" fi if test "$enable_sysmouse" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5 -$as_echo_n "checking for sysmouse... " >&6; } -if ${vi_cv_have_sysmouse+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysmouse" >&5 +printf %s "checking for sysmouse... " >&6; } +if test ${vi_cv_have_sysmouse+y} +then : + printf %s "(cached) " >&6 +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include #include int -main () +main (void) { struct mouse_info mouse; mouse.operation = MOUSE_MODE; @@ -14198,132 +15252,137 @@ struct mouse_info mouse; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : vi_cv_have_sysmouse=yes -else +else $as_nop vi_cv_have_sysmouse=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_sysmouse" >&5 -$as_echo "$vi_cv_have_sysmouse" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vi_cv_have_sysmouse" >&5 +printf "%s\n" "$vi_cv_have_sysmouse" >&6; } if test $vi_cv_have_sysmouse = yes; then - $as_echo "#define HAVE_SYSMOUSE 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYSMOUSE 1" >>confdefs.h fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FD_CLOEXEC" >&5 -$as_echo_n "checking for FD_CLOEXEC... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FD_CLOEXEC" >&5 +printf %s "checking for FD_CLOEXEC... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #if HAVE_FCNTL_H # include #endif int -main () +main (void) { int flag = FD_CLOEXEC; ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_FD_CLOEXEC 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_FD_CLOEXEC 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rename" >&5 -$as_echo_n "checking for rename... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rename" >&5 +printf %s "checking for rename... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { rename("this", "that") ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_RENAME 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_RENAME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dirfd" >&5 -$as_echo_n "checking for dirfd... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dirfd" >&5 +printf %s "checking for dirfd... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { DIR * dir=opendir("dirname"); dirfd(dir); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_DIRFD 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_DIRFD 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock" >&5 -$as_echo_n "checking for flock... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flock" >&5 +printf %s "checking for flock... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { flock(10, LOCK_SH); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_FLOCK 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysctl" >&5 -$as_echo_n "checking for sysctl... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysctl" >&5 +printf %s "checking for sysctl... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { int mib[2], r; size_t len; @@ -14337,24 +15396,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCTL 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSCTL 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5 -$as_echo_n "checking for sysinfo... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo" >&5 +printf %s "checking for sysinfo... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { struct sysinfo sinfo; int t; @@ -14366,25 +15426,26 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSINFO 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo.mem_unit" >&5 -$as_echo_n "checking for sysinfo.mem_unit... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo.mem_unit" >&5 +printf %s "checking for sysinfo.mem_unit... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { struct sysinfo sinfo; sinfo.mem_unit = 1; @@ -14393,24 +15454,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO_MEM_UNIT 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSINFO_MEM_UNIT 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysinfo.uptime" >&5 -$as_echo_n "checking for sysinfo.uptime... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysinfo.uptime" >&5 +printf %s "checking for sysinfo.uptime... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include int -main () +main (void) { struct sysinfo sinfo; long ut; @@ -14422,23 +15484,24 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSINFO_UPTIME 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSINFO_UPTIME 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5 -$as_echo_n "checking for sysconf... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5 +printf %s "checking for sysconf... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { (void)sysconf(_SC_PAGESIZE); (void)sysconf(_SC_PHYS_PAGES); @@ -14447,23 +15510,24 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCONF 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _SC_SIGSTKSZ via sysconf()" >&5 -$as_echo_n "checking for _SC_SIGSTKSZ via sysconf()... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _SC_SIGSTKSZ via sysconf()" >&5 +printf %s "checking for _SC_SIGSTKSZ via sysconf()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { (void)sysconf(_SC_SIGSTKSZ); @@ -14471,31 +15535,34 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_SYSCONF_SIGSTKSZ 1" >>confdefs.h +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_SYSCONF_SIGSTKSZ 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 -$as_echo "not usable" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not usable" >&5 +printf "%s\n" "not usable" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -$as_echo_n "checking size of int... " >&6; } -if ${ac_cv_sizeof_int+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +printf %s "checking size of int... " >&6; } +if test ${ac_cv_sizeof_int+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default" +then : -else +else $as_nop if test "$ac_cv_type_int" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int) See \`config.log' for more details" "$LINENO" 5; } else @@ -14504,31 +15571,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -$as_echo "$ac_cv_sizeof_int" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 +printf "%s\n" "$ac_cv_sizeof_int" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_INT $ac_cv_sizeof_int -_ACEOF +printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if ${ac_cv_sizeof_long+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +printf %s "checking size of long... " >&6; } +if test ${ac_cv_sizeof_long+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default" +then : -else +else $as_nop if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) See \`config.log' for more details" "$LINENO" 5; } else @@ -14537,31 +15604,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 +printf "%s\n" "$ac_cv_sizeof_long" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF +printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 -$as_echo_n "checking size of time_t... " >&6; } -if ${ac_cv_sizeof_time_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 +printf %s "checking size of time_t... " >&6; } +if test ${ac_cv_sizeof_time_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t" "$ac_includes_default" +then : -else +else $as_nop if test "$ac_cv_type_time_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (time_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -14570,31 +15637,31 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 -$as_echo "$ac_cv_sizeof_time_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 +printf "%s\n" "$ac_cv_sizeof_time_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_TIME_T $ac_cv_sizeof_time_t -_ACEOF +printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. # This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 -$as_echo_n "checking size of off_t... " >&6; } -if ${ac_cv_sizeof_off_t+:} false; then : - $as_echo_n "(cached) " >&6 -else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default"; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 +printf %s "checking size of off_t... " >&6; } +if test ${ac_cv_sizeof_off_t+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t" "$ac_includes_default" +then : -else +else $as_nop if test "$ac_cv_type_off_t" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (off_t) See \`config.log' for more details" "$LINENO" 5; } else @@ -14603,32 +15670,27 @@ See \`config.log' for more details" "$LINENO" 5; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -$as_echo "$ac_cv_sizeof_off_t" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 +printf "%s\n" "$ac_cv_sizeof_off_t" >&6; } -cat >>confdefs.h <<_ACEOF -#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -_ACEOF +printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VIM_SIZEOF_INT $ac_cv_sizeof_int -_ACEOF +printf "%s\n" "#define VIM_SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h -cat >>confdefs.h <<_ACEOF -#define VIM_SIZEOF_LONG $ac_cv_sizeof_long -_ACEOF +printf "%s\n" "#define VIM_SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 -$as_echo_n "checking uint32_t is 32 bits... " >&6; } -if test "$cross_compiling" = yes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 -$as_echo "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5 +printf %s "checking uint32_t is 32 bits... " >&6; } +if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cannot check uint32_t when cross-compiling." >&5 +printf "%s\n" "$as_me: WARNING: cannot check uint32_t when cross-compiling." >&2;} +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14645,10 +15707,11 @@ int main() { return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } -else +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5 +printf "%s\n" "ok" >&6; } +else $as_nop as_fn_error $? "WRONG! uint32_t not defined correctly." "$LINENO" 5 fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ @@ -14679,26 +15742,29 @@ int main() { exit(0); /* libc version works properly. */ }' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5 -$as_echo_n "checking whether memmove handles overlaps... " >&6; } -if ${vim_cv_memmove_handles_overlap+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memmove handles overlaps" >&5 +printf %s "checking whether memmove handles overlaps... " >&6; } +if test ${vim_cv_memmove_handles_overlap+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_memmove_handles_overlap'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define mch_memmove(s,d,l) memmove(d,s,l) $bcopy_test_prog _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_memmove_handles_overlap=yes -else +else $as_nop vim_cv_memmove_handles_overlap=no @@ -14709,33 +15775,36 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memmove_handles_overlap" >&5 -$as_echo "$vim_cv_memmove_handles_overlap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memmove_handles_overlap" >&5 +printf "%s\n" "$vim_cv_memmove_handles_overlap" >&6; } if test "x$vim_cv_memmove_handles_overlap" = "xyes" ; then - $as_echo "#define USEMEMMOVE 1" >>confdefs.h + printf "%s\n" "#define USEMEMMOVE 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5 -$as_echo_n "checking whether bcopy handles overlaps... " >&6; } -if ${vim_cv_bcopy_handles_overlap+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether bcopy handles overlaps" >&5 +printf %s "checking whether bcopy handles overlaps... " >&6; } +if test ${vim_cv_bcopy_handles_overlap+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_bcopy_handles_overlap'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define mch_bcopy(s,d,l) bcopy(d,s,l) $bcopy_test_prog _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_bcopy_handles_overlap=yes -else +else $as_nop vim_cv_bcopy_handles_overlap=no @@ -14746,33 +15815,36 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_bcopy_handles_overlap" >&5 -$as_echo "$vim_cv_bcopy_handles_overlap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_bcopy_handles_overlap" >&5 +printf "%s\n" "$vim_cv_bcopy_handles_overlap" >&6; } if test "x$vim_cv_bcopy_handles_overlap" = "xyes" ; then - $as_echo "#define USEBCOPY 1" >>confdefs.h + printf "%s\n" "#define USEBCOPY 1" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5 -$as_echo_n "checking whether memcpy handles overlaps... " >&6; } -if ${vim_cv_memcpy_handles_overlap+:} false; then : - $as_echo_n "(cached) " >&6 -else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether memcpy handles overlaps" >&5 +printf %s "checking whether memcpy handles overlaps... " >&6; } +if test ${vim_cv_memcpy_handles_overlap+y} +then : + printf %s "(cached) " >&6 +else $as_nop - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes +then : as_fn_error $? "cross-compiling: please set 'vim_cv_memcpy_handles_overlap'" "$LINENO" 5 -else +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #define mch_memcpy(s,d,l) memcpy(d,s,l) $bcopy_test_prog _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +if ac_fn_c_try_run "$LINENO" +then : vim_cv_memcpy_handles_overlap=yes -else +else $as_nop vim_cv_memcpy_handles_overlap=no @@ -14783,11 +15855,11 @@ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memcpy_handles_overlap" >&5 -$as_echo "$vim_cv_memcpy_handles_overlap" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $vim_cv_memcpy_handles_overlap" >&5 +printf "%s\n" "$vim_cv_memcpy_handles_overlap" >&6; } if test "x$vim_cv_memcpy_handles_overlap" = "xyes" ; then - $as_echo "#define USEMEMCPY 1" >>confdefs.h + printf "%s\n" "#define USEMEMCPY 1" >>confdefs.h fi fi @@ -14800,96 +15872,94 @@ if test "x$with_x" = "xyes"; then LIBS="$LIBS $X_LIBS $GUI_LIB_LOC $GUI_X_LIBS $X_PRE_LIBS $X_LIB $X_EXTRA_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether X_LOCALE needed" >&5 -$as_echo_n "checking whether X_LOCALE needed... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether X_LOCALE needed" >&5 +printf %s "checking whether X_LOCALE needed... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_compile "$LINENO" +then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char _Xsetlocale (); int -main () +main (void) { return _Xsetlocale (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define X_LOCALE 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define X_LOCALE 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xutf8SetWMProperties() can be used" >&5 -$as_echo_n "checking whether Xutf8SetWMProperties() can be used... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Xutf8SetWMProperties() can be used" >&5 +printf %s "checking whether Xutf8SetWMProperties() can be used... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char Xutf8SetWMProperties (); int -main () +main (void) { return Xutf8SetWMProperties (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define HAVE_XUTF8SETWMPROPERTIES 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define HAVE_XUTF8SETWMPROPERTIES 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext CFLAGS=$cflags_save LIBS=$libs_save fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5 -$as_echo_n "checking for _xpg4_setrunelocale in -lxpg4... " >&6; } -if ${ac_cv_lib_xpg4__xpg4_setrunelocale+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _xpg4_setrunelocale in -lxpg4" >&5 +printf %s "checking for _xpg4_setrunelocale in -lxpg4... " >&6; } +if test ${ac_cv_lib_xpg4__xpg4_setrunelocale+y} +then : + printf %s "(cached) " >&6 +else $as_nop ac_check_lib_save_LIBS=$LIBS LIBS="-lxpg4 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -14898,36 +15968,35 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* Override any GCC internal prototype to avoid an error. Use char because int might match the return type of a GCC builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif char _xpg4_setrunelocale (); int -main () +main (void) { return _xpg4_setrunelocale (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +if ac_fn_c_try_link "$LINENO" +then : ac_cv_lib_xpg4__xpg4_setrunelocale=yes -else +else $as_nop ac_cv_lib_xpg4__xpg4_setrunelocale=no fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 -$as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } -if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = xyes; then : +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 +printf "%s\n" "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } +if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = xyes +then : LIBS="$LIBS -lxpg4" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 -$as_echo_n "checking how to create tags... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to create tags" >&5 +printf %s "checking how to create tags... " >&6; } test -f tags && mv tags tags.save if (eval ctags --version /dev/null | grep Exuberant) < /dev/null 1>&5 2>&1; then TAGPRG="ctags -I INIT+,INIT2+,INIT3+,INIT4+,INIT5+ --fields=+S" @@ -14946,33 +16015,34 @@ else (eval ctags -i+m /dev/null) < /dev/null 1>&5 2>&1 && TAGPRG="ctags -i+m" fi test -f tags.save && mv tags.save tags -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TAGPRG" >&5 -$as_echo "$TAGPRG" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TAGPRG" >&5 +printf "%s\n" "$TAGPRG" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run man with a section nr" >&5 -$as_echo_n "checking how to run man with a section nr... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run man with a section nr" >&5 +printf %s "checking how to run man with a section nr... " >&6; } MANDEF="man" (eval MANPAGER=cat PAGER=cat man -s 2 read) < /dev/null > /dev/null 2>&5 && MANDEF="man -s" -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANDEF" >&5 -$as_echo "$MANDEF" >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MANDEF" >&5 +printf "%s\n" "$MANDEF" >&6; } if test "$MANDEF" = "man -s"; then - $as_echo "#define USEMAN_S 1" >>confdefs.h + printf "%s\n" "#define USEMAN_S 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking --disable-nls argument" >&5 -$as_echo_n "checking --disable-nls argument... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --disable-nls argument" >&5 +printf %s "checking --disable-nls argument... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then : +if test ${enable_nls+y} +then : enableval=$enable_nls; -else +else $as_nop enable_nls="yes" fi if test "$enable_nls" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } INSTALL_LANGS=install-languages @@ -14981,11 +16051,12 @@ $as_echo "no" >&6; } # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_MSGFMT+:} false; then : - $as_echo_n "(cached) " >&6 -else +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_MSGFMT+y} +then : + printf %s "(cached) " >&6 +else $as_nop if test -n "$MSGFMT"; then ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test. else @@ -14993,11 +16064,15 @@ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then ac_cv_prog_MSGFMT="msgfmt" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -15008,16 +16083,16 @@ fi fi MSGFMT=$ac_cv_prog_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +printf "%s\n" "$MSGFMT" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NLS" >&5 -$as_echo_n "checking for NLS... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NLS" >&5 +printf %s "checking for NLS... " >&6; } if test -f po/Makefile; then have_gettext="no" if test -n "$MSGFMT"; then @@ -15027,86 +16102,85 @@ $as_echo_n "checking for NLS... " >&6; } /* end confdefs.h. */ #include int -main () +main (void) { gettext("Test"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5 -$as_echo "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs -else +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gettext() works" >&5 +printf "%s\n" "gettext() works" >&6; }; have_gettext="yes"; LIBS=$olibs +else $as_nop LIBS="-lintl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int -main () +main (void) { gettext("Test"); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5 -$as_echo "gettext() works with -lintl" >&6; }; have_gettext="yes"; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gettext() works with -lintl" >&5 +printf "%s\n" "gettext() works with -lintl" >&6; }; have_gettext="yes"; LIBS="$olibs -lintl" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5 -$as_echo "gettext() doesn't work" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: gettext() doesn't work" >&5 +printf "%s\n" "gettext() doesn't work" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5 -$as_echo "msgfmt not found - disabled" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5 +printf "%s\n" "msgfmt not found - disabled" >&6; }; fi if test $have_gettext = "yes" -a "x$features" != "xtiny"; then - $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h + printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h MAKEMO=yes - for ac_func in bind_textdomain_codeset -do : - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_BIND_TEXTDOMAIN_CODESET 1 -_ACEOF + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes +then : + printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h fi -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _nl_msg_cat_cntr" >&5 -$as_echo_n "checking for _nl_msg_cat_cntr... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for _nl_msg_cat_cntr" >&5 +printf %s "checking for _nl_msg_cat_cntr... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include extern int _nl_msg_cat_cntr; int -main () +main (void) { ++_nl_msg_cat_cntr; ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; $as_echo "#define HAVE_NL_MSG_CAT_CNTR 1" >>confdefs.h +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; printf "%s\n" "#define HAVE_NL_MSG_CAT_CNTR 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext # MacVim: Hack to statically link against libintl instead of dynamic link, as we can't distribute app bundles with @@ -15114,68 +16188,68 @@ rm -f core conftest.err conftest.$ac_objext \ # linkage if a dylib exists in the same folder, and as such we have to manually specify the library path instead # of using -l syntax. This also means it won't work with AC_LINK_IFELSE as specifying full lib path only works # if you have separate compile/link stages but AC_LINK_IFELSE just compiles/link in one command. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libintl.a" >&5 -$as_echo_n "checking for libintl.a... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libintl.a" >&5 +printf %s "checking for libintl.a... " >&6; } if test -f ${local_dir}/lib/libintl.a; then LIBS="$olibs ${local_dir}/lib/libintl.a" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ${local_dir}/lib/libintl.a instead of -lintl" >&5 -$as_echo "Using ${local_dir}/lib/libintl.a instead of -lintl" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Using ${local_dir}/lib/libintl.a instead of -lintl" >&5 +printf "%s\n" "Using ${local_dir}/lib/libintl.a instead of -lintl" >&6; }; else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libintl.a not found - keeping using -lintl" >&5 -$as_echo "libintl.a not found - keeping using -lintl" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libintl.a not found - keeping using -lintl" >&5 +printf "%s\n" "libintl.a not found - keeping using -lintl" >&6; }; fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5 -$as_echo_n "checking if msgfmt supports --desktop... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if msgfmt supports --desktop" >&5 +printf %s "checking if msgfmt supports --desktop... " >&6; } MSGFMT_DESKTOP= if "$MSGFMT" --help | grep -e '--desktop' >/dev/null; then if "$MSGFMT" --version | grep '0.19.[3-7]$' >/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: broken" >&5 -$as_echo "broken" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: broken" >&5 +printf "%s\n" "broken" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } MSGFMT_DESKTOP="gvim.desktop vim.desktop" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5 -$as_echo "no \"po/Makefile\" - disabled" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no \"po/Makefile\" - disabled" >&5 +printf "%s\n" "no \"po/Makefile\" - disabled" >&6; }; fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi -ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" -if test "x$ac_cv_header_dlfcn_h" = xyes; then : +ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default" +if test "x$ac_cv_header_dlfcn_h" = xyes +then : DLL=dlfcn.h -else - ac_fn_c_check_header_mongrel "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" -if test "x$ac_cv_header_dl_h" = xyes; then : +else $as_nop + ac_fn_c_check_header_compile "$LINENO" "dl.h" "ac_cv_header_dl_h" "$ac_includes_default" +if test "x$ac_cv_header_dl_h" = xyes +then : DLL=dl.h fi - fi - if test x${DLL} = xdlfcn.h; then -$as_echo "#define HAVE_DLFCN_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen()" >&5 -$as_echo_n "checking for dlopen()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen()" >&5 +printf %s "checking for dlopen()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlopen(); @@ -15185,24 +16259,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen() in -ldl" >&5 -$as_echo_n "checking for dlopen() in -ldl... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen() in -ldl" >&5 +printf %s "checking for dlopen() in -ldl... " >&6; } olibs=$LIBS LIBS="$LIBS -ldl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlopen(); @@ -15212,29 +16287,30 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym()" >&5 -$as_echo_n "checking for dlsym()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym()" >&5 +printf %s "checking for dlsym()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlsym(); @@ -15244,24 +16320,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLSYM 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym() in -ldl" >&5 -$as_echo_n "checking for dlsym() in -ldl... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym() in -ldl" >&5 +printf %s "checking for dlsym() in -ldl... " >&6; } olibs=$LIBS LIBS="$LIBS -ldl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* dlsym(); @@ -15271,33 +16348,34 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_DLSYM 1" >>confdefs.h +printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext elif test x${DLL} = xdl.h; then -$as_echo "#define HAVE_DL_H 1" >>confdefs.h +printf "%s\n" "#define HAVE_DL_H 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load()" >&5 -$as_echo_n "checking for shl_load()... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load()" >&5 +printf %s "checking for shl_load()... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* shl_load(); @@ -15307,24 +16385,25 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHL_LOAD 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load() in -ldld" >&5 -$as_echo_n "checking for shl_load() in -ldld... " >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load() in -ldld" >&5 +printf %s "checking for shl_load() in -ldld... " >&6; } olibs=$LIBS LIBS="$LIBS -ldld" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int -main () +main (void) { extern void* shl_load(); @@ -15334,35 +16413,31 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; }; +if ac_fn_c_try_link "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; }; -$as_echo "#define HAVE_SHL_LOAD 1" >>confdefs.h +printf "%s\n" "#define HAVE_SHL_LOAD 1" >>confdefs.h -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; }; +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; }; LIBS=$olibs fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext \ +rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext fi -for ac_header in setjmp.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" -if test "x$ac_cv_header_setjmp_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SETJMP_H 1 -_ACEOF +ac_fn_c_check_header_compile "$LINENO" "setjmp.h" "ac_cv_header_setjmp_h" "$ac_includes_default" +if test "x$ac_cv_header_setjmp_h" = xyes +then : + printf "%s\n" "#define HAVE_SETJMP_H 1" >>confdefs.h fi -done - if test "x$MACOS_X" = "xyes" -a -n "$PERL"; then if echo $LIBS | grep -e '-ldl' >/dev/null; then @@ -15372,38 +16447,39 @@ if test "x$MACOS_X" = "xyes" -a -n "$PERL"; then fi if test "$MACOS_X" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5 -$as_echo_n "checking whether we need macOS frameworks... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we need macOS frameworks" >&5 +printf %s "checking whether we need macOS frameworks... " >&6; } if test "$MACOS_X_DARWIN" = "yes"; then if test "$features" = "tiny"; then OS_EXTRA_SRC=`echo "$OS_EXTRA_SRC" | sed -e 's+os_macosx.m++'` OS_EXTRA_OBJ=`echo "$OS_EXTRA_OBJ" | sed -e 's+objects/os_macosx.o++'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5 -$as_echo "yes, we need CoreServices" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, we need CoreServices" >&5 +printf "%s\n" "yes, we need CoreServices" >&6; } LIBS="$LIBS -framework CoreServices" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5 -$as_echo "yes, we need AppKit" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, we need AppKit" >&5 +printf "%s\n" "yes, we need AppKit" >&6; } LIBS="$LIBS -framework AppKit" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi if test "x$MACOS_X" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-xcodecfg argument" >&5 -$as_echo_n "checking --with-xcodecfg argument... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --with-xcodecfg argument" >&5 +printf %s "checking --with-xcodecfg argument... " >&6; } # Check whether --with-xcodecfg was given. -if test "${with_xcodecfg+set}" = set; then : +if test ${with_xcodecfg+y} +then : withval=$with_xcodecfg; XCODEFLAGS="$XCODEFLAGS -configuration $withval" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using default" >&5 -$as_echo "using default" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +printf "%s\n" "$withval" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using default" >&5 +printf "%s\n" "using default" >&6; } fi @@ -15427,47 +16503,47 @@ fi DEPEND_CFLAGS_FILTER= if test "$GCC" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 -$as_echo_n "checking for GCC 3 or later... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GCC 3 or later" >&5 +printf %s "checking for GCC 3 or later... " >&6; } gccmajor=`echo "$gccversion" | sed -e 's/^\([1-9][0-9]*\)\..*$/\1/g'` if test "$gccmajor" -gt "2"; then DEPEND_CFLAGS_FILTER="| sed 's+-I */+-isystem /+g'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5 -$as_echo_n "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we need -D_FORTIFY_SOURCE=1" >&5 +printf %s "checking whether we need -D_FORTIFY_SOURCE=1... " >&6; } if test "$gccmajor" -gt "3"; then CFLAGS=`echo "$CFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE/ /g' -e 's/ *-U_FORTIFY_SOURCE//g' -e 's/$/ -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=1/'` CPPFLAGS=`echo "$CPPFLAGS" | sed -e 's/-D_FORTIFY_SOURCE=.,//g' -e 's/ *-Wp,-D_FORTIFY_SOURCE=. / /g' -e 's/,-D_FORTIFY_SOURCE=. //g' -e 's/ *-D_FORTIFY_SOURCE=.//g' -e 's/ *-Wp,-U_FORTIFY_SOURCE/ /g' -e 's/ *-U_FORTIFY_SOURCE//g'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to force -D_FILE_OFFSET_BITS=64" >&5 -$as_echo_n "checking whether we need to force -D_FILE_OFFSET_BITS=64... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we need to force -D_FILE_OFFSET_BITS=64" >&5 +printf %s "checking whether we need to force -D_FILE_OFFSET_BITS=64... " >&6; } if echo "$CFLAGS $LUA_CFLAGS $MZSCHEME_CFLAGS $PERL_CFLAGS $PYTHON_CFLAGS $PYTHON3_CFLAGS $TCL_CFLAGS $RUBY_CFLAGS $GTK_CFLAGS" | grep -q D_FILE_OFFSET_BITS 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - $as_echo "#define _FILE_OFFSET_BITS 64" >>confdefs.h + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi LDFLAGS=`echo "$LDFLAGS" | sed -e 's/-L /-L/g'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5 -$as_echo_n "checking linker --as-needed support... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker --as-needed support" >&5 +printf %s "checking linker --as-needed support... " >&6; } LINK_AS_NEEDED= # Check if linker supports --as-needed and --no-as-needed options if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then @@ -15477,11 +16553,11 @@ if $CC -Wl,--help 2>/dev/null | grep as-needed > /dev/null; then LINK_AS_NEEDED=yes fi if test "$LINK_AS_NEEDED" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi @@ -15519,8 +16595,8 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; + *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 +printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( @@ -15550,15 +16626,15 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; /^ac_cv_env_/b end t clear :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/ t end s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then if test "x$cache_file" != "x/dev/null"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 +printf "%s\n" "$as_me: updating cache $cache_file" >&6;} if test ! -f "$cache_file" || test -h "$cache_file"; then cat confcache >"$cache_file" else @@ -15572,8 +16648,8 @@ $as_echo "$as_me: updating cache $cache_file" >&6;} fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 +printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -15590,7 +16666,7 @@ U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` + ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -15607,8 +16683,8 @@ LTLIBOBJS=$ac_ltlibobjs ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 +printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;} as_write_fail=0 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL @@ -15631,14 +16707,16 @@ cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +as_nop=: +if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1 +then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST -else +else $as_nop case `(set -o) 2>/dev/null` in #( *posix*) : set -o posix ;; #( @@ -15648,46 +16726,46 @@ esac fi + +# Reset variables that may have inherited troublesome values from +# the environment. + +# IFS needs to be set, to space, tab, and newline, in precisely that order. +# (If _AS_PATH_WALK were called with IFS unset, it would have the +# side effect of setting IFS to empty, thus disabling word splitting.) +# Quoting is to prevent editors from complaining about space-tab. as_nl=' ' export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' -fi +IFS=" "" $as_nl" + +PS1='$ ' +PS2='> ' +PS4='+ ' + +# Ensure predictable behavior from utilities with locale-dependent output. +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE + +# We cannot yet rely on "unset" to work, but we need these variables +# to be unset--not just set to an empty or harmless value--now, to +# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct +# also avoids known problems related to "unset" and subshell syntax +# in other old shells (e.g. bash 2.01 and pdksh 5.2.14). +for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH +do eval test \${$as_var+y} \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : +done + +# Ensure that fds 0, 1, and 2 are open. +if (exec 3>&0) 2>/dev/null; then :; else exec 0&1) 2>/dev/null; then :; else exec 1>/dev/null; fi +if (exec 3>&2) ; then :; else exec 2>/dev/null; fi # The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then +if ${PATH_SEPARATOR+false} :; then PATH_SEPARATOR=: (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || @@ -15696,13 +16774,6 @@ if test "${PATH_SEPARATOR+set}" != set; then fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - # Find who we are. Look in the path if we contain no directory separator. as_myself= case $0 in #(( @@ -15711,8 +16782,12 @@ case $0 in #(( for as_dir in $PATH do IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + test -r "$as_dir$0" && as_myself=$as_dir$0 && break done IFS=$as_save_IFS @@ -15724,30 +16799,10 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 exit 1 fi -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH # as_fn_error STATUS ERROR [LINENO LOG_FD] @@ -15760,13 +16815,14 @@ as_fn_error () as_status=$1; test $as_status -eq 0 && as_status=1 if test "$4"; then as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $2" >&2 + printf "%s\n" "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error + # as_fn_set_status STATUS # ----------------------- # Set $? to STATUS, without forking. @@ -15793,18 +16849,20 @@ as_fn_unset () { eval $1=; unset $1;} } as_unset=as_fn_unset + # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take # advantage of any shell optimizations that allow amortized linear growth over # repeated appends, instead of the typical quadratic growth present in naive # implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null +then : eval 'as_fn_append () { eval $1+=\$2 }' -else +else $as_nop as_fn_append () { eval $1=\$$1\$2 @@ -15816,12 +16874,13 @@ fi # as_fn_append # Perform arithmetic evaluation on the ARGs, and store the result in the # global $as_val. Take advantage of shells that can avoid forks. The arguments # must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null +then : eval 'as_fn_arith () { as_val=$(( $* )) }' -else +else $as_nop as_fn_arith () { as_val=`expr "$@" || test $? -eq 1` @@ -15852,7 +16911,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | +printf "%s\n" X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -15874,6 +16933,10 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits + +# Determine whether it's possible to make 'echo' print without a newline. +# These variables are no longer used directly by Autoconf, but are AC_SUBSTed +# for compatibility with existing Makefiles. ECHO_C= ECHO_N= ECHO_T= case `echo -n x` in #((((( -n*) @@ -15887,6 +16950,12 @@ case `echo -n x` in #((((( ECHO_N='-n';; esac +# For backward compatibility with old third-party macros, we provide +# the shell variables $as_echo and $as_echo_n. New code should use +# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively. +as_echo='printf %s\n' +as_echo_n='printf %s' + rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file @@ -15928,7 +16997,7 @@ as_fn_mkdir_p () as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -15937,7 +17006,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | +printf "%s\n" X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -16000,7 +17069,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.69. Invocation command line was +generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -16058,14 +17127,16 @@ $config_headers Report bugs to the package provider." _ACEOF +ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` +ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"` cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" +ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.69, +configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" -Copyright (C) 2012 Free Software Foundation, Inc. +Copyright (C) 2021 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -16103,15 +17174,15 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; + printf "%s\n" "$ac_cs_version"; exit ;; --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; + printf "%s\n" "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" @@ -16119,7 +17190,7 @@ do --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; @@ -16128,7 +17199,7 @@ do as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; + printf "%s\n" "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; @@ -16156,7 +17227,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' export CONFIG_SHELL exec "\$@" @@ -16170,7 +17241,7 @@ exec 5>>auto/config.log sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - $as_echo "$ac_log" + printf "%s\n" "$ac_log" } >&5 _ACEOF @@ -16196,8 +17267,8 @@ done # We use the long form for the default assignment because of an extremely # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers + test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files + test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers fi # Have a temporary directory for convenience. Make it in the build tree @@ -16533,7 +17604,7 @@ do esac || as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" done @@ -16541,17 +17612,17 @@ do # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 +printf "%s\n" "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. case $configure_input in #( *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | + ac_sed_conf_input=`printf "%s\n" "$configure_input" | sed 's/[\\\\&|]/\\\\&/g'`;; #( *) ac_sed_conf_input=$configure_input;; esac @@ -16568,7 +17639,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | +printf "%s\n" X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -16592,9 +17663,9 @@ $as_echo X"$ac_file" | case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` + ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` + ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -16647,8 +17718,8 @@ ac_sed_dataroot=' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' @@ -16690,9 +17761,9 @@ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ "$ac_tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$ac_tmp/stdin" @@ -16708,20 +17779,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} # if test x"$ac_file" != x-; then { - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -$as_echo "$as_me: $ac_file is unchanged" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 +printf "%s\n" "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else - $as_echo "/* $configure_input */" \ + printf "%s\n" "/* $configure_input */" >&1 \ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi @@ -16762,8 +17833,9 @@ if test "$no_create" != yes; then $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi + diff --git a/src/charset.c b/src/charset.c index 14373c1c3d..3495a0ee17 100644 --- a/src/charset.c +++ b/src/charset.c @@ -809,7 +809,7 @@ win_linetabsize_cts(chartabsize_T *cts, colnr_T len) cts->cts_vcol += win_lbr_chartabsize(cts, NULL); #ifdef FEAT_PROP_POPUP // check for a virtual text at the end of a line or on an empty line - if (cts->cts_has_prop_with_text && *cts->cts_ptr == NUL) + if (len == MAXCOL && cts->cts_has_prop_with_text && *cts->cts_ptr == NUL) { (void)win_lbr_chartabsize(cts, NULL); cts->cts_vcol += cts->cts_cur_text_width; @@ -1097,9 +1097,14 @@ lbr_chartabsize_adv(chartabsize_T *cts) * inserts text. * This function is used very often, keep it fast!!!! * - * If "headp" not NULL, set *headp to the size of what we for 'showbreak' - * string at start of line. Warning: *headp is only set if it's a non-zero - * value, init to 0 before calling. + * If "headp" not NULL, set "*headp" to the size of 'showbreak'/'breakindent' + * included in the return value. + * When "cts->cts_max_head_vcol" is positive, only count in "*headp" the size + * of 'showbreak'/'breakindent' before "cts->cts_max_head_vcol". + * When "cts->cts_max_head_vcol" is negative, only count in "*headp" the size + * of 'showbreak'/'breakindent' before where cursor should be placed. + * + * Warning: "*headp" may not be set if it's 0, init to 0 before calling. */ int win_lbr_chartabsize( @@ -1113,16 +1118,8 @@ win_lbr_chartabsize( char_u *s = cts->cts_ptr; colnr_T vcol = cts->cts_vcol; #ifdef FEAT_LINEBREAK - int c; int size; - colnr_T col2; - colnr_T col_adj = 0; // vcol + screen size of tab - colnr_T colmax; - int added; int mb_added = 0; - int numberextra; - char_u *ps; - int tab_corr = (*s == TAB); int n; char_u *sbr; int no_sbr = FALSE; @@ -1154,12 +1151,17 @@ win_lbr_chartabsize( } #if defined(FEAT_LINEBREAK) || defined(FEAT_PROP_POPUP) + int has_lcs_eol = wp->w_p_list && wp->w_lcs_chars.eol != NUL; + /* * First get the normal size, without 'linebreak' or text properties */ size = win_chartabsize(wp, s, vcol); - if (*s == NUL) + if (*s == NUL && !has_lcs_eol) size = 0; // NUL is not displayed +# ifdef FEAT_LINEBREAK + int is_doublewidth = has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1; +# endif # ifdef FEAT_PROP_POPUP if (cts->cts_has_prop_with_text) @@ -1172,8 +1174,11 @@ win_lbr_chartabsize( // The "$" for 'list' mode will go between the EOL and // the text prop, account for that. - if (wp->w_p_list && wp->w_lcs_chars.eol != NUL) + if (has_lcs_eol) + { ++vcol; + --size; + } for (i = 0; i < cts->cts_text_prop_count; ++i) { @@ -1188,8 +1193,7 @@ win_lbr_chartabsize( || (tp->tp_col == MAXCOL && ((tp->tp_flags & TP_FLAG_ALIGN_ABOVE) ? col == 0 - : s[0] == NUL - && cts->cts_with_trailing))) + : s[0] == NUL && cts->cts_with_trailing))) && -tp->tp_id - 1 < gap->ga_len) { char_u *p = ((char_u **)gap->ga_data)[-tp->tp_id - 1]; @@ -1232,22 +1236,115 @@ win_lbr_chartabsize( if (tp->tp_col != MAXCOL && tp->tp_col - 1 > col) break; } - if (wp->w_p_list && wp->w_lcs_chars.eol != NUL) + if (has_lcs_eol) + { --vcol; + ++size; + } } # endif # ifdef FEAT_LINEBREAK - c = *s; - if (tab_corr) - col_adj = size - 1; + if (is_doublewidth && wp->w_p_wrap && in_win_border(wp, vcol + size - 2)) + { + ++size; // Count the ">" in the last column. + mb_added = 1; + } + + /* + * May have to add something for 'breakindent' and/or 'showbreak' + * string at the start of a screen line. + */ + int head = mb_added; + sbr = no_sbr ? empty_option : get_showbreak_value(wp); + // When "size" is 0, no new screen line is started. + if (size > 0 && wp->w_p_wrap && (*sbr != NUL || wp->w_p_bri)) + { + int col_off_prev = win_col_off(wp); + int width2 = wp->w_width - col_off_prev + win_col_off2(wp); + colnr_T wcol = vcol + col_off_prev; +#ifdef FEAT_PROP_POPUP + wcol -= wp->w_virtcol_first_char; +#endif + colnr_T max_head_vcol = cts->cts_max_head_vcol; + int added = 0; + + // cells taken by 'showbreak'/'breakindent' before current char + int head_prev = 0; + if (wcol >= wp->w_width) + { + wcol -= wp->w_width; + col_off_prev = wp->w_width - width2; + if (wcol >= width2 && width2 > 0) + wcol %= width2; + if (*sbr != NUL) + head_prev += vim_strsize(sbr); + if (wp->w_p_bri) + head_prev += get_breakindent_win(wp, line); + if (wcol < head_prev) + { + head_prev -= wcol; + wcol += head_prev; + added += head_prev; + if (max_head_vcol <= 0 || vcol < max_head_vcol) + head += head_prev; + } + else + head_prev = 0; + wcol += col_off_prev; + } + + if (wcol + size > wp->w_width) + { + // cells taken by 'showbreak'/'breakindent' halfway current char + int head_mid = 0; + if (*sbr != NUL) + head_mid += vim_strsize(sbr); + if (wp->w_p_bri) + head_mid += get_breakindent_win(wp, line); + if (head_mid > 0 && wcol + size > wp->w_width) + { + // Calculate effective window width. + int prev_rem = wp->w_width - wcol; + int width = width2 - head_mid; + + if (width <= 0) + width = 1; + // Divide "size - prev_rem" by "width", rounding up. + int cnt = (size - prev_rem + width - 1) / width; + added += cnt * head_mid; + + if (max_head_vcol == 0 || vcol + size + added < max_head_vcol) + head += cnt * head_mid; + else if (max_head_vcol > vcol + head_prev + prev_rem) + head += (max_head_vcol - (vcol + head_prev + prev_rem) + + width2 - 1) / width2 * head_mid; +#ifdef FEAT_PROP_POPUP + else if (max_head_vcol < 0) + { + int off = 0; + if (*s != NUL + && ((State & MODE_NORMAL) || cts->cts_start_incl)) + off += cts->cts_cur_text_width; + if (off >= prev_rem) + head += (1 + (off - prev_rem) / width) * head_mid; + } +#endif + } + } + + size += added; + } + + if (headp != NULL) + *headp = head; /* * If 'linebreak' set check at a blank before a non-blank if the line * needs a break here */ if (wp->w_p_lbr - && VIM_ISBREAK(c) + && VIM_ISBREAK((int)s[0]) && !VIM_ISBREAK((int)s[1]) && wp->w_p_wrap && wp->w_width != 0) @@ -1256,9 +1353,9 @@ win_lbr_chartabsize( * Count all characters from first non-blank after a blank up to next * non-blank after a blank. */ - numberextra = win_col_off(wp); - col2 = vcol; - colmax = (colnr_T)(wp->w_width - numberextra - col_adj); + int numberextra = win_col_off(wp); + colnr_T col_adj = size - 1; + colnr_T colmax = (colnr_T)(wp->w_width - numberextra - col_adj); if (vcol >= colmax) { colmax += col_adj; @@ -1267,101 +1364,27 @@ win_lbr_chartabsize( colmax += (((vcol - colmax) / n) + 1) * n - col_adj; } + colnr_T vcol2 = vcol; for (;;) { - ps = s; + char_u *ps = s; MB_PTR_ADV(s); - c = *s; + int c = *s; if (!(c != NUL && (VIM_ISBREAK(c) || (!VIM_ISBREAK(c) - && (col2 == vcol || !VIM_ISBREAK((int)*ps)))))) + && (vcol2 == vcol || !VIM_ISBREAK((int)*ps)))))) break; - col2 += win_chartabsize(wp, s, col2); - if (col2 >= colmax) // doesn't fit + vcol2 += win_chartabsize(wp, s, vcol2); + if (vcol2 >= colmax) // doesn't fit { size = colmax - vcol + col_adj; break; } } } - else if (has_mbyte && size == 2 && MB_BYTE2LEN(*s) > 1 - && wp->w_p_wrap && in_win_border(wp, vcol)) - { - ++size; // Count the ">" in the last column. - mb_added = 1; - } - /* - * May have to add something for 'breakindent' and/or 'showbreak' - * string at start of line. - * Set *headp to the size of what we add. - * Do not use 'showbreak' at the NUL after the text. - */ - added = 0; - sbr = (c == NUL || no_sbr) ? empty_option : get_showbreak_value(wp); - if ((*sbr != NUL || wp->w_p_bri) && wp->w_p_wrap && vcol != 0) - { - colnr_T sbrlen = 0; - int numberwidth = win_col_off(wp); - - numberextra = numberwidth; - vcol += numberextra + mb_added; -#ifdef FEAT_PROP_POPUP - vcol -= wp->w_virtcol_first_char; -#endif - if (vcol >= (colnr_T)wp->w_width) - { - vcol -= wp->w_width; - numberextra = wp->w_width - (numberextra - win_col_off2(wp)); - if (vcol >= numberextra && numberextra > 0) - vcol %= numberextra; - if (*sbr != NUL) - { - sbrlen = (colnr_T)MB_CHARLEN(sbr); - if (vcol >= sbrlen) - vcol -= sbrlen; - } - if (vcol >= numberextra && numberextra > 0) - vcol = vcol % numberextra; - else if (vcol > 0 && numberextra > 0) - vcol += numberwidth - win_col_off2(wp); - - numberwidth -= win_col_off2(wp); - } - if (vcol == 0 || vcol + size + sbrlen > (colnr_T)wp->w_width) - { - added = 0; - if (*sbr != NUL) - { - if (size + sbrlen + numberwidth > (colnr_T)wp->w_width) - { - // calculate effective window width - int width = (colnr_T)wp->w_width - sbrlen - numberwidth; - int prev_width = vcol - ? ((colnr_T)wp->w_width - (sbrlen + vcol)) : 0; - - if (width <= 0) - width = (colnr_T)1; - added += ((size - prev_width) / width) * vim_strsize(sbr); - if ((size - prev_width) % width) - // wrapped, add another length of 'sbr' - added += vim_strsize(sbr); - } - else - added += vim_strsize(sbr); - } - if (wp->w_p_bri) - added += get_breakindent_win(wp, line); - - size += added; - if (vcol != 0) - added = 0; - } - } - if (headp != NULL) - *headp = added + mb_added; return size; # endif #endif @@ -1483,6 +1506,7 @@ getvcol( } init_chartabsize_arg(&cts, wp, pos->lnum, 0, line, line); + cts.cts_max_head_vcol = -1; /* * This function is used very often, do some speed optimizations. diff --git a/src/cmdexpand.c b/src/cmdexpand.c index 0f91380ada..0472dde9e5 100644 --- a/src/cmdexpand.c +++ b/src/cmdexpand.c @@ -4034,7 +4034,7 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) { xpc.xp_pattern = pat; xpc.xp_pattern_len = (int)STRLEN(xpc.xp_pattern); - xpc.xp_line = pat; + xpc.xp_line = pat; xpc.xp_context = cmdcomplete_str_to_type(type); if (xpc.xp_context == EXPAND_NOTHING) @@ -4045,26 +4045,26 @@ f_getcompletion(typval_T *argvars, typval_T *rettv) if (xpc.xp_context == EXPAND_USER_DEFINED) { - // Must be "custom,funcname" pattern - if (STRNCMP(type, "custom,", 7) != 0) - { - semsg(_(e_invalid_argument_str), type); - return; - } + // Must be "custom,funcname" pattern + if (STRNCMP(type, "custom,", 7) != 0) + { + semsg(_(e_invalid_argument_str), type); + return; + } - xpc.xp_arg = type + 7; + xpc.xp_arg = type + 7; } if (xpc.xp_context == EXPAND_USER_LIST) { - // Must be "customlist,funcname" pattern - if (STRNCMP(type, "customlist,", 11) != 0) - { - semsg(_(e_invalid_argument_str), type); - return; - } + // Must be "customlist,funcname" pattern + if (STRNCMP(type, "customlist,", 11) != 0) + { + semsg(_(e_invalid_argument_str), type); + return; + } - xpc.xp_arg = type + 11; + xpc.xp_arg = type + 11; } # if defined(FEAT_MENU) diff --git a/src/configure.ac b/src/configure.ac index fab2da26d8..1dd3aed249 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1,10 +1,9 @@ dnl configure.ac: autoconf script for Vim -dnl Process this file with autoconf 2.69 to produce "configure". -dnl This should also work with other versions of autoconf, but 2.70 and later -dnl generate lots of hard to fix "obsolete" warnings. +dnl Process this file with autoconf 2.71 to produce "configure". -AC_INIT(vim.h) +AC_INIT +AC_CONFIG_SRCDIR([vim.h]) AC_CONFIG_HEADERS(auto/config.h:config.h.in) dnl Being able to run configure means the system is Unix (compatible). @@ -12,11 +11,10 @@ AC_DEFINE(UNIX) AC_PROG_MAKE_SET dnl Checks for programs. -AC_PROG_CC_C99 dnl required by almost everything +AC_PROG_CC dnl required by almost everything AC_PROG_CPP dnl required by header file checks -AC_PROGRAM_EGREP dnl required by AC_EGREP_CPP +AC_PROG_EGREP dnl required by AC_EGREP_CPP AC_PROG_FGREP dnl finds working grep -F -AC_ISC_POSIX dnl required by AC_C_CROSS AC_PROG_AWK dnl required for "make html" in ../doc dnl Don't strip if we don't have it @@ -25,9 +23,6 @@ AC_CHECK_PROG(STRIP, strip, strip, :) dnl Check for extension of executables AC_EXEEXT -dnl Check for standard headers. We don't use this in Vim but other stuff -dnl in autoconf needs it, where it uses STDC_HEADERS. -AC_HEADER_STDC AC_HEADER_SYS_WAIT dnl Check that the C99 features that Vim uses are supported: @@ -714,7 +709,7 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then if test "X$vi_cv_path_luajit" != "X"; then dnl -- find LuaJIT version AC_CACHE_CHECK(LuaJIT version, vi_cv_version_luajit, - [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-[[a-z0-9]]*\)* .*/\1/'` ]) + [ vi_cv_version_luajit=`${vi_cv_path_luajit} -v 2>&1 | sed 's/LuaJIT \([[0-9.]]*\)\.[[0-9]]\(-*[[a-z0-9]]*\)* .*/\1/'` ]) AC_CACHE_CHECK(Lua version of LuaJIT, vi_cv_version_lua_luajit, [ vi_cv_version_lua_luajit=`${vi_cv_path_luajit} -e "print(_VERSION)" | sed 's/.* //'` ]) vi_cv_path_lua="$vi_cv_path_luajit" @@ -1316,6 +1311,7 @@ if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then AC_DEFINE(DYNAMIC_PERL) AC_CACHE_VAL(vi_cv_dll_name_perl, [vi_cv_dll_name_perl="$libperl"]) PERL_CFLAGS="-DDYNAMIC_PERL_DLL=\\\"$vi_cv_dll_name_perl\\\" $PERL_CFLAGS" + PERL_LIBS="" fi fi @@ -1651,6 +1647,18 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; ${vi_cv_path_python3} -c \ "import sys; print(sys.exec_prefix)"` ]) + dnl -- python3's include path + AC_CACHE_CHECK(Python's include path,vi_cv_path_python3_include, + [ vi_cv_path_python3_include=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"include\"))"` ]) + + dnl -- python3's platform include path + AC_CACHE_CHECK(Python's include path,vi_cv_path_python3_platinclude, + [ vi_cv_path_python3_platinclude=` + ${vi_cv_path_python3} -c \ + "import sysconfig; print(sysconfig.get_path(\"platinclude\"))"` ]) + dnl -- python3's internal library path AC_CACHE_VAL(vi_cv_path_python3path, @@ -1729,10 +1737,10 @@ eof ]) PYTHON3_LIBS="${vi_cv_path_python3_plibs}" - if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + if test "${vi_cv_path_python3_include}" = "${vi_cv_path_python3_platinclude}"; then + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include}" else - PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" + PYTHON3_CFLAGS="-I${vi_cv_path_python3_include} -I${vi_cv_path_python3_platinclude}" fi if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then dnl Define PYTHON3_HOME if --with-python-config-dir was used @@ -3572,7 +3580,8 @@ AC_TYPE_SIZE_T AC_TYPE_UID_T AC_TYPE_UINT32_T -AC_HEADER_TIME +AC_CHECK_HEADERS_ONCE([sys/time.h]) + AC_CHECK_TYPE(ino_t, long) AC_CHECK_TYPE(dev_t, unsigned) AC_C_BIGENDIAN(,,,) @@ -3823,8 +3832,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ AC_DEFINE(SYS_SELECT_WITH_SYS_TIME), AC_MSG_RESULT(no)) -dnl AC_DECL_SYS_SIGLIST - dnl Checks for pty.c (copied from screen) ========================== AC_MSG_CHECKING(for /dev/ptc) if test -r /dev/ptc; then diff --git a/src/drawline.c b/src/drawline.c index 49ea25e8ee..6d7abadc0d 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -1110,14 +1110,10 @@ win_line( int n_attr3 = 0; // chars with overruling special attr int saved_attr3 = 0; // char_attr saved for n_attr3 - int n_skip = 0; // nr of cells to skip for 'nowrap' or - // concealing -#ifdef FEAT_PROP_POPUP - int skip_cells = 0; // nr of cells to skip for virtual text - // after the line, when w_skipcol is - // larger than the text length -#endif - + int skip_cells = 0; // nr of cells to skip for w_leftcol or + // w_skipcol or concealing + int skipped_cells = 0; // nr of skipped cells for virtual text + // to be added to wlv.vcol later int fromcol_prev = -2; // start of inverting after cursor int noinvcur = FALSE; // don't invert the cursor int lnum_in_visual_area = FALSE; @@ -1665,11 +1661,14 @@ win_line( char_u *prev_ptr = ptr; chartabsize_T cts; int charsize = 0; + int head = 0; init_chartabsize_arg(&cts, wp, lnum, wlv.vcol, line, ptr); + cts.cts_max_head_vcol = v; while (cts.cts_vcol < v && *cts.cts_ptr != NUL) { - charsize = win_lbr_chartabsize(&cts, NULL); + head = 0; + charsize = win_lbr_chartabsize(&cts, &head); cts.cts_vcol += charsize; prev_ptr = cts.cts_ptr; MB_PTR_ADV(cts.cts_ptr); @@ -1698,20 +1697,9 @@ win_line( { wlv.vcol -= charsize; ptr = prev_ptr; - // If the character fits on the screen, don't need to skip it. - // Except for a TAB. - if (((*mb_ptr2cells)(ptr) >= charsize || *ptr == TAB) - && wlv.col == 0) - n_skip = v - wlv.vcol; } - -#ifdef FEAT_PROP_POPUP - // If there the text doesn't reach to the desired column, need to skip - // "skip_cells" cells when virtual text follows. - if ((!wp->w_p_wrap || (lnum == wp->w_topline && wp->w_skipcol > 0)) - && v > wlv.vcol) - skip_cells = v - wlv.vcol; -#endif + if (v > wlv.vcol) + skip_cells = v - wlv.vcol - head; // Adjust for when the inverted text is before the screen, // and when the start of the inverted text is before the screen. @@ -2205,6 +2193,7 @@ win_line( wlv.n_attr_skip -= skip_cells; if (wlv.n_attr_skip < 0) wlv.n_attr_skip = 0; + skipped_cells += skip_cells; skip_cells = 0; } else @@ -2212,6 +2201,7 @@ win_line( // the whole text is left of the window, drop // it and advance to the next one skip_cells -= wlv.n_extra; + skipped_cells += wlv.n_extra; wlv.n_extra = 0; wlv.n_attr_skip = 0; bail_out = TRUE; @@ -2592,11 +2582,15 @@ win_line( #ifdef FEAT_LINEBREAK c0 = *ptr; #endif -#ifdef FEAT_PROP_POPUP if (c == NUL) + { +#ifdef FEAT_PROP_POPUP // text is finished, may display a "below" virtual text did_line = TRUE; #endif + // no more cells to skip + skip_cells = 0; + } if (has_mbyte) { @@ -2762,7 +2756,7 @@ win_line( // If a double-width char doesn't fit at the left side display // a '<' in the first column. Don't do this for unprintable // characters. - if (n_skip > 0 && mb_l > 1 && wlv.n_extra == 0) + if (skip_cells > 0 && mb_l > 1 && wlv.n_extra == 0) { wlv.n_extra = 1; wlv.c_extra = MB_FILLER_CHAR; @@ -2893,14 +2887,6 @@ win_line( wlv.n_extra = win_lbr_chartabsize(&cts, NULL) - 1; clear_chartabsize_arg(&cts); - // We have just drawn the showbreak value, no need to add - // space for it again. - if (wlv.vcol == wlv.vcol_sbr) - { - wlv.n_extra -= MB_CHARLEN(get_showbreak_value(wp)); - if (wlv.n_extra < 0) - wlv.n_extra = 0; - } if (on_last_col && c != TAB) // Do not continue search/match highlighting over the // line break, but for TABs the highlighting should @@ -3438,10 +3424,10 @@ win_line( wlv.n_extra = 0; n_attr = 0; } - else if (n_skip == 0) + else if (skip_cells == 0) { is_concealing = TRUE; - n_skip = 1; + skip_cells = 1; } mb_c = c; if (enc_utf8 && utf_char2len(c) > 1) @@ -3459,7 +3445,7 @@ win_line( is_concealing = FALSE; } - if (n_skip > 0 && did_decrement_ptr) + if (skip_cells > 0 && did_decrement_ptr) // not showing the '>', put pointer back to avoid getting stuck ++ptr; @@ -3472,7 +3458,7 @@ win_line( if (!did_wcol && wlv.draw_state == WL_LINE && wp == curwin && lnum == wp->w_cursor.lnum && conceal_cursor_line(wp) - && (int)wp->w_virtcol <= wlv.vcol + n_skip) + && (int)wp->w_virtcol <= wlv.vcol + skip_cells) { # ifdef FEAT_RIGHTLEFT if (wp->w_p_rl) @@ -3743,7 +3729,11 @@ win_line( && (*ptr != NUL || lcs_eol_one > 0 || (wlv.n_extra > 0 && (wlv.c_extra != NUL - || *wlv.p_extra != NUL)))) + || *wlv.p_extra != NUL)) +#ifdef FEAT_PROP_POPUP + || text_prop_next < text_prop_count +#endif + )) { c = wp->w_lcs_chars.ext; wlv.char_attr = hl_combine_attr(wlv.win_attr, HL_ATTR(HLF_AT)); @@ -3801,7 +3791,7 @@ win_line( // Store character to be displayed. // Skip characters that are left of the screen for 'nowrap'. - if (wlv.draw_state < WL_LINE || n_skip <= 0) + if (wlv.draw_state < WL_LINE || skip_cells <= 0) { // Store the character. #if defined(FEAT_RIGHTLEFT) @@ -3897,7 +3887,7 @@ win_line( #ifdef FEAT_CONCEAL else if (wp->w_p_cole > 0 && is_concealing) { - --n_skip; + --skip_cells; ++wlv.vcol_off_co; if (wlv.n_extra > 0) wlv.vcol_off_co += wlv.n_extra; @@ -3977,7 +3967,13 @@ win_line( } #endif // FEAT_CONCEAL else - --n_skip; + --skip_cells; + + if (wlv.draw_state > WL_NR && skipped_cells > 0) + { + wlv.vcol += skipped_cells; + skipped_cells = 0; + } // Only advance the "wlv.vcol" when after the 'number' or // 'relativenumber' column. @@ -4018,6 +4014,7 @@ win_line( #endif #ifdef FEAT_PROP_POPUP || text_prop_above || text_prop_follows + || text_prop_next < text_prop_count #endif || (wp->w_p_list && wp->w_lcs_chars.eol != NUL && wlv.p_extra != at_end_str) diff --git a/src/edit.c b/src/edit.c index e47e2c4430..6be1b6abee 100644 --- a/src/edit.c +++ b/src/edit.c @@ -3714,8 +3714,13 @@ ins_esc( State = MODE_NORMAL; may_trigger_modechanged(); - // need to position cursor again when on a TAB - if (gchar_cursor() == TAB) + // need to position cursor again when on a TAB and when on a char with + // virtual text. + if (gchar_cursor() == TAB +#ifdef FEAT_PROP_POPUP + || curbuf->b_has_textprop +#endif + ) curwin->w_valid &= ~(VALID_WROW|VALID_WCOL|VALID_VIRTCOL); setmouse(); diff --git a/src/errors.h b/src/errors.h index 00c32a98e1..f780ec5ea0 100644 --- a/src/errors.h +++ b/src/errors.h @@ -1571,9 +1571,12 @@ EXTERN char e_too_many_signs_defined[] EXTERN char e_unknown_printer_font_str[] INIT(= N_("E613: Unknown printer font: %s")); #endif -// E614 unused -// E615 unused -// E616 unused +EXTERN char e_class_required[] + INIT(= N_("E614: Class required")); +EXTERN char e_object_required[] + INIT(= N_("E615: Object required")); +EXTERN char e_object_required_for_argument_nr[] + INIT(= N_("E616: Object required for argument %d")); #ifdef FEAT_GUI_GTK EXTERN char e_cannot_be_changed_in_gtk_GUI[] INIT(= N_("E617: Cannot be changed in the GTK GUI")); @@ -1782,7 +1785,8 @@ EXTERN char e_can_only_compare_list_with_list[] INIT(= N_("E691: Can only compare List with List")); EXTERN char e_invalid_operation_for_list[] INIT(= N_("E692: Invalid operation for List")); -// E693 unused +EXTERN char e_list_or_class_required_for_argument_nr[] + INIT(= N_("E693: List or Class required for argument %d")); EXTERN char e_invalid_operation_for_funcrefs[] INIT(= N_("E694: Invalid operation for Funcrefs")); EXTERN char e_cannot_index_a_funcref[] @@ -3485,6 +3489,17 @@ EXTERN char e_warning_pointer_block_corrupted[] INIT(= N_("E1364: Warning: Pointer block corrupted")); EXTERN char e_cannot_use_a_return_type_with_new[] INIT(= N_("E1365: Cannot use a return type with the \"new\" function")); +EXTERN char e_cannot_access_private_method_str[] + INIT(= N_("E1366: Cannot access private method: %s")); +EXTERN char e_member_str_of_interface_str_has_different_access[] + INIT(= N_("E1367: Access level of member \"%s\" of interface \"%s\" is different")); + +EXTERN char e_static_cannot_be_followed_by_this[] + INIT(= N_("E1368: Static cannot be followed by \"this\" in a member name")); +EXTERN char e_duplicate_member_str[] + INIT(= N_("E1369: Duplicate member: %s")); +EXTERN char e_cannot_define_new_function_as_static[] + INIT(= N_("E1370: Cannot define a \"new\" function as static")); EXTERN char e_cannot_mix_positional_and_non_positional_str[] INIT(= N_("E1400: Cannot mix positional and non-positional arguments: %s")); EXTERN char e_fmt_arg_nr_unused_str[] @@ -3502,4 +3517,4 @@ EXTERN char e_member_str_type_mismatch_expected_str_but_got_str[] EXTERN char e_method_str_type_mismatch_expected_str_but_got_str[] INIT(= N_("E1407: Member \"%s\": type mismatch, expected %s but got %s")); -// E1366 - E1399 unused +// E1371 - E1399 unused diff --git a/src/evalfunc.c b/src/evalfunc.c index 6fb301f580..709c407ae2 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -275,6 +275,19 @@ arg_number(type_T *type, type_T *decl_type UNUSED, argcontext_T *context) return check_arg_type(&t_number, type, context); } +/* + * Check "type" is an object. + */ + static int +arg_object(type_T *type, type_T *decl_type UNUSED, argcontext_T *context) +{ + if (type->tt_type == VAR_OBJECT + || type_any_or_unknown(type)) + return OK; + arg_type_mismatch(&t_object, type, context->arg_idx + 1); + return FAIL; +} + /* * Check "type" is a dict of 'any'. */ @@ -743,6 +756,20 @@ arg_string_or_func(type_T *type, type_T *decl_type UNUSED, argcontext_T *context return FAIL; } +/* + * Check "type" is a list of 'any' or a class. + */ + static int +arg_class_or_list(type_T *type, type_T *decl_type UNUSED, argcontext_T *context) +{ + if (type->tt_type == VAR_CLASS + || type->tt_type == VAR_LIST + || type_any_or_unknown(type)) + return OK; + arg_type_mismatch(&t_class, type, context->arg_idx + 1); + return FAIL; +} + /* * Check "type" is a list of 'any' or a blob or a string. */ @@ -1124,6 +1151,7 @@ static argcheck_T arg1_len[] = {arg_len1}; static argcheck_T arg3_libcall[] = {arg_string, arg_string, arg_string_or_nr}; static argcheck_T arg14_maparg[] = {arg_string, arg_string, arg_bool, arg_bool}; static argcheck_T arg2_filter[] = {arg_list_or_dict_or_blob_or_string_mod, arg_filter_func}; +static argcheck_T arg2_instanceof[] = {arg_object, arg_class_or_list}; static argcheck_T arg2_map[] = {arg_list_or_dict_or_blob_or_string_mod, arg_map_func}; static argcheck_T arg2_mapnew[] = {arg_list_or_dict_or_blob_or_string, NULL}; static argcheck_T arg25_matchadd[] = {arg_string, arg_string, arg_number, arg_number, arg_dict_any}; @@ -2123,6 +2151,8 @@ static funcentry_T global_functions[] = ret_string, f_inputsecret}, {"insert", 2, 3, FEARG_1, arg23_insert, ret_first_arg, f_insert}, + {"instanceof", 2, 2, FEARG_1, arg2_instanceof, + ret_bool, f_instanceof}, {"interrupt", 0, 0, 0, NULL, ret_void, f_interrupt}, {"invert", 1, 1, FEARG_1, arg1_number, diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 3581ab6187..8d757ed472 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -2592,8 +2592,8 @@ do_one_cmd( #ifdef FEAT_EVAL // A command will reset "is_export" when exporting an item. If it is still - // set something went wrong. - if (is_export) + // set something went wrong or the command was never executed. + if (!ea.skip && is_export) { if (errormsg == NULL) errormsg = _(e_export_with_invalid_argument); diff --git a/src/ex_getln.c b/src/ex_getln.c index a76319d47e..9486d33ed9 100644 --- a/src/ex_getln.c +++ b/src/ex_getln.c @@ -4179,7 +4179,7 @@ get_cmdline_completion(void) char_u *cmd_compl = cmdcomplete_type_to_str(p->xpc->xp_context); if (cmd_compl == NULL) - return NULL; + return NULL; if (p->xpc->xp_context == EXPAND_USER_LIST || p->xpc->xp_context == EXPAND_USER_DEFINED) { diff --git a/src/globals.h b/src/globals.h index 4e9d839728..a340a8623f 100644 --- a/src/globals.h +++ b/src/globals.h @@ -534,7 +534,13 @@ EXTERN int garbage_collect_at_exit INIT(= FALSE); #define t_super (static_types[80]) #define t_const_super (static_types[81]) -EXTERN type_T static_types[82] +#define t_object (static_types[82]) +#define t_const_object (static_types[83]) + +#define t_class (static_types[84]) +#define t_const_class (static_types[85]) + +EXTERN type_T static_types[86] #ifdef DO_INIT = { // 0: t_unknown @@ -700,6 +706,14 @@ EXTERN type_T static_types[82] // 80: t_super (VAR_CLASS with tt_member set to &t_bool {VAR_CLASS, 0, 0, TTFLAG_STATIC, &t_bool, NULL, NULL}, {VAR_CLASS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, &t_bool, NULL, NULL}, + + // 82: t_object + {VAR_OBJECT, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL}, + {VAR_OBJECT, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL}, + + // 84: t_class + {VAR_CLASS, 0, 0, TTFLAG_STATIC, NULL, NULL, NULL}, + {VAR_CLASS, 0, 0, TTFLAG_STATIC|TTFLAG_CONST, NULL, NULL, NULL}, } #endif ; diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 1f8b2ebcc7..3f0cf8c5aa 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4845,7 +4845,11 @@ is_cjk_font(PangoFontDescription *font_desc) { uc = (cjk_langs[i][0] == 'k') ? 0xAC00 : 0x4E00; is_cjk = (pango_coverage_get(coverage, uc) == PANGO_COVERAGE_EXACT); +#if PANGO_VERSION_CHECK(1, 52, 0) + g_object_unref(coverage); +#else pango_coverage_unref(coverage); +#endif } } diff --git a/src/if_perl.xs b/src/if_perl.xs index 315999b0d1..879ee2d646 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -37,13 +37,6 @@ #include "vim.h" -/* Work around for perl-5.18. - * Don't include "perl\lib\CORE\inline.h" for now, - * include it after Perl_sv_free2 is defined. */ -#ifdef DYNAMIC_PERL -# define PERL_NO_INLINE_FUNCTIONS -#endif - #ifdef _MSC_VER // Work around for using MSVC and ActivePerl 5.18. # define __inline__ __inline @@ -197,7 +190,9 @@ typedef int perl_key; # define perl_run dll_perl_run # define perl_destruct dll_perl_destruct # define perl_free dll_perl_free -# define Perl_get_context dll_Perl_get_context +# if defined(WIN32) || ((PERL_REVISION == 5) && (PERL_VERSION < 38)) +# define Perl_get_context dll_Perl_get_context +# endif # define Perl_croak dll_Perl_croak # ifdef PERL5101_OR_LATER # define Perl_croak_xs_usage dll_Perl_croak_xs_usage @@ -346,7 +341,9 @@ static void (*perl_destruct)(PerlInterpreter*); static void (*perl_free)(PerlInterpreter*); static int (*perl_run)(PerlInterpreter*); static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); +# if defined(WIN32) || ((PERL_REVISION == 5) && (PERL_VERSION < 38)) static void* (*Perl_get_context)(void); +# endif static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__noreturn__; # ifdef PERL5101_OR_LATER /* Perl-5.18 has a different Perl_croak_xs_usage signature. */ @@ -516,7 +513,9 @@ static struct { {"perl_free", (PERL_PROC*)&perl_free}, {"perl_run", (PERL_PROC*)&perl_run}, {"perl_parse", (PERL_PROC*)&perl_parse}, +# if defined(WIN32) || ((PERL_REVISION == 5) && (PERL_VERSION < 38)) {"Perl_get_context", (PERL_PROC*)&Perl_get_context}, +# endif {"Perl_croak", (PERL_PROC*)&Perl_croak}, # ifdef PERL5101_OR_LATER {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, @@ -658,235 +657,11 @@ static struct { {"", NULL}, }; -/* Work around for perl-5.18. - * For now, only the definitions of S_SvREFCNT_dec are needed in - * "perl\lib\CORE\inline.h". */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 18) -static void -S_SvREFCNT_dec(pTHX_ SV *sv) -{ - if (LIKELY(sv != NULL)) { - U32 rc = SvREFCNT(sv); - if (LIKELY(rc > 1)) - SvREFCNT(sv) = rc - 1; - else - Perl_sv_free2(aTHX_ sv, rc); - } -} -# endif - -/* perl-5.32 needs Perl_SvREFCNT_dec */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) -# define Perl_SvREFCNT_dec S_SvREFCNT_dec -# endif - -/* perl-5.26 also needs S_TOPMARK and S_POPMARK. */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 26) -PERL_STATIC_INLINE I32 -S_TOPMARK(pTHX) -{ - DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, - "MARK top %p %" IVdf "\n", - PL_markstack_ptr, - (IV)*PL_markstack_ptr))); - return *PL_markstack_ptr; -} - -PERL_STATIC_INLINE I32 -S_POPMARK(pTHX) -{ - DEBUG_s(DEBUG_v(PerlIO_printf(Perl_debug_log, - "MARK pop %p %" IVdf "\n", - (PL_markstack_ptr-1), - (IV)*(PL_markstack_ptr-1)))); - assert((PL_markstack_ptr > PL_markstack) || !"MARK underflow"); - return *PL_markstack_ptr--; -} -# endif - -// MacVim fix: GIMME_V before 5.32 uses Perl_block_gimme from inline.h. Just -// use GIMME for simplicity as it's completely inlined without needing to -// implement Perl_block_gimme(). -# if (PERL_REVISION == 5) && (PERL_VERSION < 32) -#undef GIMME_V -#define GIMME_V GIMME -# endif - -/* perl-5.32 needs Perl_POPMARK */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) -# define Perl_POPMARK S_POPMARK -# endif - -# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) -PERL_STATIC_INLINE U8 -Perl_gimme_V(pTHX) -{ - I32 cxix; - U8 gimme = (PL_op->op_flags & OPf_WANT); - - if (gimme) - return gimme; - cxix = PL_curstackinfo->si_cxsubix; - if (cxix < 0) - return -# if (PERL_REVISION == 5) && (PERL_VERSION >= 34) - PL_curstackinfo->si_type == PERLSI_SORT ? G_SCALAR: -# endif - G_VOID; - assert(cxstack[cxix].blk_gimme & G_WANT); - return (cxstack[cxix].blk_gimme & G_WANT); -} -# endif - -# if (PERL_REVISION == 5) && (PERL_VERSION >= 38) -# define PERL_ARGS_ASSERT_SVPVXTRUE \ - assert(sv) -PERL_STATIC_INLINE bool -Perl_SvPVXtrue(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SVPVXTRUE; - - if (! (XPV *) SvANY(sv)) { - return false; - } - - if ( ((XPV *) SvANY(sv))->xpv_cur > 1) { /* length > 1 */ - return true; - } - - if (( (XPV *) SvANY(sv))->xpv_cur == 0) { - return false; - } - - return *sv->sv_u.svu_pv != '0'; -} - -# define PERL_ARGS_ASSERT_SVGETMAGIC \ - assert(sv) -PERL_STATIC_INLINE void -Perl_SvGETMAGIC(pTHX_ SV *sv) -{ - PERL_ARGS_ASSERT_SVGETMAGIC; - - if (UNLIKELY(SvGMAGICAL(sv))) { - mg_get(sv); - } -} - -PERL_STATIC_INLINE char * -Perl_SvPV_helper(pTHX_ - SV * const sv, - STRLEN * const lp, - const U32 flags, - const PL_SvPVtype type, - char * (*non_trivial)(pTHX_ SV *, STRLEN * const, const U32), - const bool or_null, - const U32 return_flags - ) -{ - /* 'type' should be known at compile time, so this is reduced to a single - * conditional at runtime */ - if ( (type == SvPVbyte_type_ && SvPOK_byte_nog(sv)) - || (type == SvPVforce_type_ && SvPOK_pure_nogthink(sv)) - || (type == SvPVutf8_type_ && SvPOK_utf8_nog(sv)) - || (type == SvPVnormal_type_ && SvPOK_nog(sv)) - || (type == SvPVutf8_pure_type_ && SvPOK_utf8_pure_nogthink(sv)) - || (type == SvPVbyte_pure_type_ && SvPOK_byte_pure_nogthink(sv)) - ) { - if (lp) { - *lp = SvCUR(sv); - } - - /* Similarly 'return_flags is known at compile time, so this becomes - * branchless */ - if (return_flags & SV_MUTABLE_RETURN) { - return SvPVX_mutable(sv); - } - else if(return_flags & SV_CONST_RETURN) { - return (char *) SvPVX_const(sv); - } - else { - return SvPVX(sv); - } - } - - if (or_null) { /* This is also known at compile time */ - if (flags & SV_GMAGIC) { /* As is this */ - SvGETMAGIC(sv); - } - - if (! SvOK(sv)) { - if (lp) { /* As is this */ - *lp = 0; - } - - return NULL; - } - } - - /* Can't trivially handle this, call the function */ - return non_trivial(aTHX_ sv, lp, (flags|return_flags)); -} - -# define PERL_ARGS_ASSERT_SVNV \ - assert(sv) -PERL_STATIC_INLINE NV -Perl_SvNV(pTHX_ SV *sv) { - PERL_ARGS_ASSERT_SVNV; - - if (SvNOK_nog(sv)) - return SvNVX(sv); - return sv_2nv(sv); -} - -# define PERL_ARGS_ASSERT_SVIV \ - assert(sv) -PERL_STATIC_INLINE IV -Perl_SvIV(pTHX_ SV *sv) { - PERL_ARGS_ASSERT_SVIV; - - if (SvIOK_nog(sv)) - return SvIVX(sv); - return sv_2iv(sv); -} -# endif - -/* perl-5.34 needs Perl_SvTRUE_common; used in SvTRUE_nomg_NN */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 34) -PERL_STATIC_INLINE bool -Perl_SvTRUE_common(pTHX_ SV * sv, const bool sv_2bool_is_fallback) -{ - if (UNLIKELY(SvIMMORTAL_INTERP(sv))) - return SvIMMORTAL_TRUE(sv); - - if (! SvOK(sv)) - return FALSE; - - if (SvPOK(sv)) - return SvPVXtrue(sv); - - if (SvIOK(sv)) - return SvIVX(sv) != 0; /* casts to bool */ - - if (SvROK(sv) && !(SvOBJECT(SvRV(sv)) && HvAMAGIC(SvSTASH(SvRV(sv))))) - return TRUE; - - if (sv_2bool_is_fallback) - return sv_2bool_nomg(sv); - - return isGV_with_GP(sv); -} -# endif - -/* perl-5.32 needs Perl_SvTRUE */ -# if (PERL_REVISION == 5) && (PERL_VERSION >= 32) -PERL_STATIC_INLINE bool -Perl_SvTRUE(pTHX_ SV *sv) { - if (!LIKELY(sv)) - return FALSE; - SvGETMAGIC(sv); - return SvTRUE_nomg_NN(sv); -} +# if (PERL_REVISION == 5) && (PERL_VERSION <= 30) +// In 5.30, GIMME_V requires linking to Perl_block_gimme() instead of being +// completely inline. Just use the deprecated GIMME for simplicity. +# undef GIMME_V +# define GIMME_V GIMME # endif /* @@ -1689,6 +1464,64 @@ vim_IOLayer_init(void) } #endif /* PERLIO_LAYERS && !USE_SFIO */ +#ifdef DYNAMIC_PERL + +// Certain functionality that we use like SvREFCNT_dec are inlined for +// performance reasons. They reference Perl APIs like Perl_sv_free2(), which +// would cause linking errors in dynamic builds as we don't link against Perl +// during build time. Manually fix it here by redirecting these functions +// towards the dynamically loaded version. + +# if (PERL_REVISION == 5) && (PERL_VERSION >= 18) +# undef Perl_sv_free2 +void Perl_sv_free2(pTHX_ SV* sv, const U32 refcnt) +{ + (*dll_Perl_sv_free2)(aTHX_ sv, refcnt); +} +# else +# undef Perl_sv_free2 +void Perl_sv_free2(pTHX_ SV* sv) +{ + (*dll_Perl_sv_free2)(aTHX_ sv); +} +# endif + +# if (PERL_REVISION == 5) && (PERL_VERSION >= 14) +# undef Perl_sv_2bool_flags +bool Perl_sv_2bool_flags(pTHX_ SV* sv, I32 flags) +{ + return (*dll_Perl_sv_2bool_flags)(aTHX_ sv, flags); +} +# endif + +# if (PERL_REVISION == 5) && (PERL_VERSION >= 28) +# undef Perl_mg_get +int Perl_mg_get(pTHX_ SV* sv) +{ + return (*dll_Perl_mg_get)(aTHX_ sv); +} +# endif + +# undef Perl_sv_2nv_flags +NV Perl_sv_2nv_flags(pTHX_ SV *const sv, const I32 flags) +{ + return (*dll_Perl_sv_2nv_flags)(aTHX_ sv, flags); +} + +# ifdef PERL589_OR_LATER +# undef Perl_sv_2iv_flags +IV Perl_sv_2iv_flags(pTHX_ SV* sv, I32 flags) +{ + return (*dll_Perl_sv_2iv_flags)(aTHX_ sv, flags); +} +# endif + +# ifdef PERL_USE_THREAD_LOCAL +PERL_THREAD_LOCAL void *PL_current_context; +# endif + +#endif // DYNAMIC_PERL + XS(boot_VIM); static void diff --git a/src/if_py_both.h b/src/if_py_both.h index c1d7675cb3..6e2ef26e7d 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -109,7 +109,7 @@ PyObject* Vim_PyObject_New(PyTypeObject *type, size_t objsize) { PyObject *obj = (PyObject *)PyObject_Malloc(objsize); if (obj == NULL) - return PyErr_NoMemory(); + return PyErr_NoMemory(); return PyObject_Init(obj, type); } # undef PyObject_NEW @@ -270,7 +270,7 @@ int Vim_PyRun_SimpleString(const char *str) // This function emulates CPython's implementation. PyObject* m = PyImport_AddModule("__main__"); if (m == NULL) - return -1; + return -1; PyObject* d = PyModule_GetDict(m); PyObject* output = Vim_PyRun_String(str, Py_file_input, d, d); if (output == NULL) diff --git a/src/json.c b/src/json.c index acf7ac57cf..e2a011309c 100644 --- a/src/json.c +++ b/src/json.c @@ -105,8 +105,7 @@ json_encode_lsp_msg(typval_T *val) ga_init2(&lspga, 1, 4000); // Header according to LSP specification. vim_snprintf((char *)IObuff, IOSIZE, - "Content-Length: %u\r\n" - "Content-Type: application/vscode-jsonrpc; charset=utf-8\r\n\r\n", + "Content-Length: %u\r\n\r\n", ga.ga_len - 1); ga_concat(&lspga, IObuff); ga_concat_len(&lspga, ga.ga_data, ga.ga_len); diff --git a/src/message.c b/src/message.c index 43c134db63..ebd6bae4d2 100644 --- a/src/message.c +++ b/src/message.c @@ -1847,7 +1847,11 @@ str2special( } c = *str; - if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) + if ((c == K_SPECIAL +#ifdef FEAT_GUI + || c == CSI +#endif + ) && str[1] != NUL && str[2] != NUL) { if (str[1] == KS_MODIFIER) { @@ -1855,7 +1859,11 @@ str2special( str += 3; c = *str; } - if (c == K_SPECIAL && str[1] != NUL && str[2] != NUL) + if ((c == K_SPECIAL +#ifdef FEAT_GUI + || c == CSI +#endif + ) && str[1] != NUL && str[2] != NUL) { c = TO_SPECIAL(str[1], str[2]); str += 2; diff --git a/src/misc2.c b/src/misc2.c index 6ac519d305..6653908a23 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -150,7 +150,7 @@ coladvance2( if ((addspaces || finetune) && !VIsual_active) { - curwin->w_curswant = linetabsize_str(line) + one_more; + curwin->w_curswant = linetabsize(curwin, pos->lnum) + one_more; if (curwin->w_curswant > 0) --curwin->w_curswant; } @@ -166,7 +166,7 @@ coladvance2( && wcol >= (colnr_T)width && width > 0) { - csize = linetabsize_str(line); + csize = linetabsize(curwin, pos->lnum); if (csize > 0) csize--; diff --git a/src/move.c b/src/move.c index 2ba02cf5dc..9c025d42b3 100644 --- a/src/move.c +++ b/src/move.c @@ -1205,16 +1205,6 @@ curs_columns( n = (curwin->w_wcol - curwin->w_width) / width2 + 1; curwin->w_wcol -= n * width2; curwin->w_wrow += n; - -#ifdef FEAT_LINEBREAK - // When cursor wraps to first char of next line in Insert - // mode, the 'showbreak' string isn't shown, backup to first - // column - char_u *sbr = get_showbreak_value(curwin); - if (*sbr && *ml_get_cursor() == NUL - && curwin->w_wcol == vim_strsize(sbr)) - curwin->w_wcol = 0; -#endif } } diff --git a/src/normal.c b/src/normal.c index 73c244ec89..996cc380d3 100644 --- a/src/normal.c +++ b/src/normal.c @@ -2310,7 +2310,7 @@ find_decl( static int nv_screengo(oparg_T *oap, int dir, long dist) { - int linelen = linetabsize_str(ml_get_curline()); + int linelen = linetabsize(curwin, curwin->w_cursor.lnum); int retval = OK; int atend = FALSE; int n; @@ -2380,7 +2380,7 @@ nv_screengo(oparg_T *oap, int dir, long dist) } cursor_up_inner(curwin, 1); - linelen = linetabsize_str(ml_get_curline()); + linelen = linetabsize(curwin, curwin->w_cursor.lnum); if (linelen > width1) curwin->w_curswant += (((linelen - width1 - 1) / width2) + 1) * width2; @@ -2417,7 +2417,7 @@ nv_screengo(oparg_T *oap, int dir, long dist) // clipped to column 0. if (curwin->w_curswant >= width1) curwin->w_curswant -= width2; - linelen = linetabsize_str(ml_get_curline()); + linelen = linetabsize(curwin, curwin->w_cursor.lnum); } } } @@ -6067,7 +6067,7 @@ nv_g_cmd(cmdarg_T *cap) { oap->motion_type = MCHAR; oap->inclusive = FALSE; - i = linetabsize_str(ml_get_curline()); + i = linetabsize(curwin, curwin->w_cursor.lnum); if (cap->count0 > 0 && cap->count0 <= 100) coladvance((colnr_T)(i * cap->count0 / 100)); else diff --git a/src/option.c b/src/option.c index 3c33363a1d..d24da40b4c 100644 --- a/src/option.c +++ b/src/option.c @@ -68,6 +68,21 @@ static void check_winopt(winopt_T *wop); static int wc_use_keyname(char_u *varp, long *wcp); static void compatible_set(void); +#if defined(FEAT_EVAL) || defined(PROTO) +static char *(p_bin_dep_opts[]) = {"textwidth", "wrapmargin", "modeline", "expandtab", NULL}; +static char *(p_paste_dep_opts[]) = {"autoindent", "expandtab", "ruler", "showmatch", "smarttab", + "softtabstop", "textwidth", "wrapmargin", +#ifdef FEAT_RIGHTLEFT + "hkmap", "revins", +#endif +#ifdef FEAT_VARTABS + "varsofttabstop", +#endif + NULL}; +static void didset_options_sctx(int opt_flags, char **buf); +#endif + + /* * Initialize the 'shell' option to a default value. */ @@ -2781,6 +2796,10 @@ set_options_bin( p_et = p_et_nobin; } } +#if defined(FEAT_EVAL) || defined(PROTO) + // Remember where the dependent option were reset + didset_options_sctx(opt_flags, p_bin_dep_opts); +#endif } /* @@ -2985,7 +3004,8 @@ insecure_flag(int opt_idx, int opt_flags) /* * Redraw the window title and/or tab page text later. */ -void redraw_titles(void) + void +redraw_titles(void) { need_maketitle = TRUE; redraw_tabline = TRUE; @@ -3871,6 +3891,7 @@ did_set_paste(optset_T *args UNUSED) p_wm = 0; p_sts = 0; p_ai = 0; + p_et = 0; #ifdef FEAT_VARTABS if (p_vsts) free_string_option(p_vsts); @@ -3927,6 +3948,11 @@ did_set_paste(optset_T *args UNUSED) old_p_paste = p_paste; +#if defined(FEAT_EVAL) || defined(PROTO) + // Remember where the dependent options were reset + didset_options_sctx((OPT_LOCAL | OPT_GLOBAL), p_paste_dep_opts); +#endif + return NULL; } @@ -7509,6 +7535,14 @@ set_context_in_set_cmd( xp->xp_pattern = p + 1; +#ifdef FEAT_SYN_HL + if (options[opt_idx].var == (char_u *)&p_syn) + { + xp->xp_context = EXPAND_OWNSYNTAX; + return; + } +#endif + if (flags & P_EXPAND) { p = options[opt_idx].var; @@ -8330,3 +8364,19 @@ option_set_callback_func(char_u *optval UNUSED, callback_T *optcb UNUSED) return FAIL; #endif } + +#if defined(FEAT_EVAL) || defined(PROTO) + static void +didset_options_sctx(int opt_flags, char **buf) +{ + for (int i = 0; ; ++i) + { + if (buf[i] == NULL) + break; + + int idx = findoption((char_u *)buf[i]); + if (idx >= 0) + set_option_sctx_idx(idx, opt_flags, current_sctx); + } +} +#endif diff --git a/src/po/ga.po b/src/po/ga.po index 62fa8c8bdd..ae907fe15c 100644 --- a/src/po/ga.po +++ b/src/po/ga.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Vim 7.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-29 15:33-0600\n" -"PO-Revision-Date: 2022-05-19 15:41-0500\n" +"POT-Creation-Date: 2023-08-23 21:51+0000\n" +"PO-Revision-Date: 2023-08-24 15:41-0500\n" "Last-Translator: Kevin Patrick Scannell \n" "Language-Team: Irish \n" "Language: ga\n" @@ -164,6 +164,26 @@ msgstr "Bun" msgid "Top" msgstr "Barr" +#, c-format +msgid "%d%%" +msgstr "%d%%" + +#, c-format +msgid " (%d of %d)" +msgstr " (%d as %d)" + +#, c-format +msgid " ((%d) of %d)" +msgstr " ((%d) as %d)" + +#, c-format +msgid " (file %d of %d)" +msgstr " (comhad %d as %d)" + +#, c-format +msgid " (file (%d) of %d)" +msgstr " (comhad (%d) as %d)" + msgid "[Prompt]" msgstr "[Leid]" @@ -261,7 +281,8 @@ msgid "Warning: Using a weak encryption method; see :help 'cm'" msgstr "Rabhadh: Criptichn lag; fach :help 'cm'" msgid "Note: Encryption of swapfile not supported, disabling swap file" -msgstr "Nta: N fidir an comhad babhtla a chripti; comhad babhtla dhchumas" +msgstr "" +"Nta: N fidir an comhad babhtla a chripti; comhad babhtla dhchumas" msgid "Enter encryption key: " msgstr "Cuir isteach eochair chriptichin: " @@ -275,6 +296,30 @@ msgstr "N msgid "[crypted]" msgstr "[criptithe]" +#, c-format +msgid "xchacha20v2: using custom opslimit \"%llu\" for Key derivation." +msgstr "xchacha20v2: ag baint side as opslimit saincheaptha \"%llu\" agus an eochair dorth." + +#, c-format +msgid "xchacha20v2: using default opslimit \"%llu\" for Key derivation." +msgstr "xchacha20v2: ag baint side as an opslimit ramhshocraithe \"%llu\" agus an eochair dorth." + +#, c-format +msgid "xchacha20v2: using custom memlimit \"%lu\" for Key derivation." +msgstr "xchacha20v2: ag baint side as memlimit saincheaptha \"%lu\" agus an eochair dorth." + +#, c-format +msgid "xchacha20v2: using default memlimit \"%lu\" for Key derivation." +msgstr "xchacha20v2: ag baint side as an memlimit ramhshocraithe \"%lu\" agus an eochair dorth." + +#, c-format +msgid "xchacha20v2: using custom algorithm \"%d\" for Key derivation." +msgstr "xchacha20v2: ag baint side as algartam saincheaptha \"%d\" agus an eochair dorth." + +#, c-format +msgid "xchacha20v2: using default algorithm \"%d\" for Key derivation." +msgstr "xchacha20v2: ag baint side as an algartam ramhshocraithe \"%d\" agus an eochair dorth." + msgid "Entering Debug mode. Type \"cont\" to continue." msgstr "Md dfhabhtaithe thos. Clscrobh \"cont\" le dul ar aghaidh." @@ -321,7 +366,8 @@ msgstr "arg #, c-format msgid "Not enough memory to use internal diff for buffer \"%s\"" -msgstr "Nl go leor cuimhne ar fil chun diff inmhenach a dhanamh ar mhaoln \"%s\"" +msgstr "" +"Nl go leor cuimhne ar fil chun diff inmhenach a dhanamh ar mhaoln \"%s\"" msgid "Patch file" msgstr "Comhad paiste" @@ -559,7 +605,8 @@ msgid "Save changes to \"%s\"?" msgstr "Sbhil athruithe ar \"%s\"?" msgid "Warning: Entered other buffer unexpectedly (check autocommands)" -msgstr "Rabhadh: Chuathas i maoln eile gan sil leis (seiceil na huathorduithe)" +msgstr "" +"Rabhadh: Chuathas i maoln eile gan sil leis (seiceil na huathorduithe)" #, c-format msgid "W20: Required python version 2.x not supported, ignoring file: %s" @@ -585,11 +632,6 @@ msgstr "Cr msgid "Backwards range given, OK to swap" msgstr "Raon droim ar ais, babhtil" -msgid "" -"INTERNAL: Cannot use EX_DFLALL with ADDR_NONE, ADDR_UNSIGNED or ADDR_QUICKFIX" -msgstr "" -"INMHENACH: N fidir EX_DFLALL a sid i gcomhar le ADDR_NONE, ADDR_UNSIGNED n ADDR_QUICKFIX" - #, c-format msgid "%d more file to edit. Quit anyway?" msgid_plural "%d more files to edit. Quit anyway?" @@ -820,10 +862,12 @@ msgstr "Rabhadh" msgid "" "&OK\n" -"&Load File" +"&Load File\n" +"Load File &and Options" msgstr "" "&OK\n" -"&Luchtaigh Comhad" +"&Ldil Comhad\n" +"Ldil Comhad &agus Roghanna" msgid "" msgstr "" @@ -864,25 +908,6 @@ msgstr[4] "+-%s%3ld l msgid "No match at cursor, finding next" msgstr "Nl a leithid ag an gcrsir, ag cuardach ar an chad cheann eile" -msgid " " -msgstr " " - -msgid "Pathname:" -msgstr "Cosn:" - -msgid "OK" -msgstr "OK" - -msgid "Cancel" -msgstr "Cealaigh" - -msgid "Scrollbar Widget: Could not get geometry of thumb pixmap." -msgstr "" -"Giuirlid Scrollbharra: N fidir cimseata an mhapa picteiln a fhil." - -msgid "Vim dialog" -msgstr "Dialg Vim" - msgid "_Save" msgstr "_Sbhil" @@ -904,12 +929,18 @@ msgstr "" "&Nl\n" "&Cealaigh" +msgid "OK" +msgstr "OK" + msgid "Yes" msgstr "T" msgid "No" msgstr "Nl" +msgid "Cancel" +msgstr "Cealaigh" + msgid "Input _Methods" msgstr "_Modhanna Ionchuir" @@ -992,6 +1023,9 @@ msgstr "&OK" msgid "Selection" msgstr "Roghn" +msgid "Vim dialog" +msgstr "Dialg Vim" + msgid "Find &Next" msgstr "An Chad Chea&nn Eile" @@ -1199,7 +1233,7 @@ msgid " # pid database name prepend path\n" msgstr " # pid ainm bunachair cosn tosaigh\n" msgid "Lua library cannot be loaded." -msgstr "N fidir an leabharlann Lua a lucht." +msgstr "N fidir an leabharlann Lua a ldil." msgid "cannot save undo information" msgstr "n fidir eolas cealaithe a shbhil" @@ -1361,9 +1395,6 @@ msgstr " Moladh litrithe (s^N^P)" msgid " Keyword Local completion (^N^P)" msgstr " Comhln lognta lorgfhocal (^N^P)" -msgid "Hit end of paragraph" -msgstr "Sroicheadh croch an pharagraif" - msgid "'dictionary' option is empty" msgstr "t an rogha 'dictionary' folamh" @@ -1396,6 +1427,12 @@ msgstr " M msgid "-- Searching..." msgstr "-- Ag Cuardach..." +msgid "Hit end of paragraph" +msgstr "Sroicheadh croch an pharagraif" + +msgid "Pattern not found" +msgstr "Patrn gan aimsi" + msgid "Back at original" msgstr "Ar ais ag an mbunit" @@ -1655,6 +1692,9 @@ msgstr "" "--not-a-term\t\tN bac le rabhadh faoi ionchur/aschur gan a bheith n " "teirminal" +msgid "--gui-dialog-file {fname} For testing: write dialog text" +msgstr "--gui-dialog-file {fname} Le haghaidh tstla: scrobh tacs na dialige" + msgid "--ttyfail\t\tExit if input or output is not a terminal" msgstr "--ttyfail\t\tScoir mura bhfuil ionchur n aschur ina theirminal" @@ -1665,7 +1705,7 @@ msgid "-U \t\tUse instead of any .gvimrc" msgstr "-U \t\tBain sid as in ionad aon .gvimrc" msgid "--noplugin\t\tDon't load plugin scripts" -msgstr "--noplugin\t\tN luchtaigh breisein" +msgstr "--noplugin\t\tN ldil breisein" msgid "-p[N]\t\tOpen N tab pages (default: one for each file)" msgstr "-p[N]\t\tOscail N cluaisn (ramhshocr: ceann do gach comhad)" @@ -1683,21 +1723,20 @@ msgid "+\t\tStart at line " msgstr "+\t\tTosaigh ar lne " msgid "--cmd \tExecute before loading any vimrc file" -msgstr "--cmd \tRith sula luchtatear aon chomhad vimrc" +msgstr "--cmd \tRith sula ldiltear aon chomhad vimrc" msgid "-c \t\tExecute after loading the first file" -msgstr "-c \t\tRith i ndiaidh an chad chomhad a lucht" +msgstr "-c \t\tRith i ndiaidh an chad chomhad a ldil" msgid "-S \t\tSource file after loading the first file" msgstr "" -"-S \t\tLigh comhad i ndiaidh an chad chomhad a lamh" +"-S \t\tLigh comhad i ndiaidh an chad chomhad a ldil" msgid "-s \tRead Normal mode commands from file " msgstr "-s