From fb040ea36cb8e2158ccd9100600652f94ae90af1 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Mon, 23 Mar 2015 03:49:03 +0000 Subject: Imported from /home/lorry/working-area/delta_nano-tarball/nano-2.4.0.tar.gz. --- AUTHORS | 4 +- BUGS | 161 --- ChangeLog | 2001 ++++++++++++++++++++++++--- INSTALL | 19 +- Makefile.am | 7 +- Makefile.in | 414 +++--- NEWS | 341 +++-- README | 38 +- README.SVN | 11 +- THANKS | 48 +- TODO | 2 +- aclocal.m4 | 851 ++++++++---- compile | 347 +++++ config.guess | 405 +++--- config.h.in | 57 +- config.sub | 286 ++-- configure | 3063 ++++++++++++++++++++++++++++------------- configure.ac | 454 +++--- depcomp | 531 ++++--- doc/Makefile.am | 12 +- doc/Makefile.in | 356 +++-- doc/faq.html | 110 +- doc/man/Makefile.am | 35 +- doc/man/Makefile.in | 445 +++--- doc/man/fr/Makefile.am | 31 +- doc/man/fr/Makefile.in | 266 ++-- doc/man/fr/nano.1 | 254 ++-- doc/man/fr/nano.1.html | 474 ++++--- doc/man/fr/nanorc.5 | 328 ++--- doc/man/fr/nanorc.5.html | 589 ++++---- doc/man/fr/rnano.1 | 114 +- doc/man/fr/rnano.1.html | 159 ++- doc/man/nano.1 | 224 +-- doc/man/nano.1.html | 352 ++--- doc/man/nanorc.5 | 603 ++++---- doc/man/nanorc.5.html | 1035 ++++++++------ doc/man/rnano.1 | 42 +- doc/man/rnano.1.html | 61 +- doc/nanorc.sample.in | 173 +-- doc/syntax/Makefile.am | 35 +- doc/syntax/Makefile.in | 180 ++- doc/syntax/asm.nanorc | 14 +- doc/syntax/awk.nanorc | 28 +- doc/syntax/c.nanorc | 31 +- doc/syntax/changelog.nanorc | 25 + doc/syntax/cmake.nanorc | 4 +- doc/syntax/css.nanorc | 5 +- doc/syntax/debian.nanorc | 33 +- doc/syntax/default.nanorc | 10 + doc/syntax/fortran.nanorc | 32 +- doc/syntax/gentoo.nanorc | 56 +- doc/syntax/go.nanorc | 45 + doc/syntax/groff.nanorc | 21 +- doc/syntax/html.nanorc | 11 +- doc/syntax/java.nanorc | 7 +- doc/syntax/javascript.nanorc | 19 + doc/syntax/json.nanorc | 32 + doc/syntax/lua.nanorc | 62 + doc/syntax/makefile.nanorc | 6 +- doc/syntax/man.nanorc | 22 +- doc/syntax/mgp.nanorc | 5 +- doc/syntax/mutt.nanorc | 7 +- doc/syntax/nanorc.nanorc | 32 +- doc/syntax/objc.nanorc | 26 +- doc/syntax/ocaml.nanorc | 7 +- doc/syntax/patch.nanorc | 15 +- doc/syntax/perl.nanorc | 6 +- doc/syntax/php.nanorc | 25 +- doc/syntax/po.nanorc | 27 + doc/syntax/pov.nanorc | 6 +- doc/syntax/python.nanorc | 25 +- doc/syntax/ruby.nanorc | 36 +- doc/syntax/sh.nanorc | 25 +- doc/syntax/spec.nanorc | 39 + doc/syntax/tcl.nanorc | 10 +- doc/syntax/tex.nanorc | 3 +- doc/syntax/texinfo.nanorc | 20 + doc/syntax/xml.nanorc | 6 +- doc/texinfo/Makefile.in | 237 +++- doc/texinfo/nano.html | 2322 ++++++++++++++++++++++--------- doc/texinfo/nano.info | 1436 +++++++++++++------ doc/texinfo/nano.texi | 1114 +++++++++++---- doc/texinfo/texinfo.tex | 2376 +++++++++++++++++++++----------- install-sh | 35 +- m4/Makefile.in | 128 +- m4/ax_check_compile_flag.m4 | 74 + missing | 461 ++----- mkinstalldirs | 4 +- nano.spec | 16 +- nano.spec.in | 14 +- po/ChangeLog | 27 +- po/LINGUAS | 2 +- po/bg.gmo | Bin 44632 -> 43108 bytes po/bg.po | 1567 ++++++++++++--------- po/ca.gmo | Bin 42795 -> 48896 bytes po/ca.po | 1595 ++++++++++++--------- po/cs.gmo | Bin 45169 -> 49777 bytes po/cs.po | 1669 +++++++++++++--------- po/da.gmo | Bin 40869 -> 38960 bytes po/da.po | 1608 +++++++++++++--------- po/de.gmo | Bin 43502 -> 49237 bytes po/de.po | 2234 ++++++++++++++---------------- po/eo.gmo | Bin 0 -> 46020 bytes po/eo.po | 2356 +++++++++++++++++++++++++++++++ po/es.gmo | Bin 34857 -> 48537 bytes po/es.po | 2291 ++++++++++++++++-------------- po/eu.gmo | Bin 30378 -> 29288 bytes po/eu.po | 1573 ++++++++++++--------- po/fi.gmo | Bin 42295 -> 47749 bytes po/fi.po | 2103 +++++++++++++--------------- po/fr.gmo | Bin 44120 -> 49649 bytes po/fr.po | 2028 ++++++++++++++++----------- po/ga.gmo | Bin 40900 -> 38541 bytes po/ga.po | 1579 ++++++++++++--------- po/gl.gmo | Bin 39445 -> 47939 bytes po/gl.po | 1588 ++++++++++++--------- po/hu.gmo | Bin 43398 -> 40056 bytes po/hu.po | 1559 ++++++++++++--------- po/id.gmo | Bin 11978 -> 11414 bytes po/id.po | 1586 ++++++++++++--------- po/it.gmo | Bin 41599 -> 47050 bytes po/it.po | 1578 +++++++++++---------- po/ja.gmo | Bin 0 -> 40806 bytes po/ja.po | 2351 +++++++++++++++++++++++++++++++ po/ms.gmo | Bin 38121 -> 35931 bytes po/ms.po | 1564 ++++++++++++--------- po/nano.pot | 1380 +++++++++++-------- po/nb.gmo | Bin 33080 -> 44711 bytes po/nb.po | 2019 +++++++++++++++------------ po/nl.gmo | Bin 41816 -> 47284 bytes po/nl.po | 1713 +++++++++++++---------- po/nn.gmo | Bin 6374 -> 6125 bytes po/nn.po | 1512 +++++++++++--------- po/pl.gmo | Bin 42406 -> 46623 bytes po/pl.po | 1532 ++++++++++++--------- po/pt_BR.gmo | Bin 42621 -> 48091 bytes po/pt_BR.po | 2035 +++++++++++++++------------ po/ro.gmo | Bin 21194 -> 50706 bytes po/ro.po | 2651 ++++++++++++++++++----------------- po/ru.gmo | Bin 55436 -> 60338 bytes po/ru.po | 1588 ++++++++++++--------- po/rw.gmo | Bin 1445 -> 0 bytes po/rw.po | 2454 --------------------------------- po/sl.gmo | Bin 0 -> 41342 bytes po/sl.po | 2434 ++++++++++++++++++++++++++++++++ po/sr.gmo | Bin 15315 -> 60652 bytes po/sr.po | 2635 ++++++++++++++++++----------------- po/sv.gmo | Bin 33794 -> 45902 bytes po/sv.po | 2300 +++++++++++++++++-------------- po/tr.gmo | Bin 12504 -> 11897 bytes po/tr.po | 1585 ++++++++++++--------- po/uk.gmo | Bin 12307 -> 63305 bytes po/uk.po | 3138 +++++++++++++++++++----------------------- po/vi.gmo | Bin 45491 -> 51435 bytes po/vi.po | 1841 ++++++++++++++----------- po/zh_CN.gmo | Bin 38488 -> 36711 bytes po/zh_CN.po | 1562 ++++++++++++--------- po/zh_TW.gmo | Bin 22504 -> 37589 bytes po/zh_TW.po | 1930 ++++++++++++++------------ src/Makefile.am | 5 +- src/Makefile.in | 248 +++- src/browser.c | 569 +++----- src/chars.c | 64 +- src/color.c | 213 ++- src/cut.c | 70 +- src/files.c | 816 ++++++++--- src/global.c | 1995 +++++++++++++-------------- src/help.c | 226 ++- src/move.c | 77 +- src/nano.c | 801 ++++++----- src/nano.h | 661 +++------ src/prompt.c | 655 +++------ src/proto.h | 257 ++-- src/rcfile.c | 710 ++++++---- src/search.c | 170 +-- src/text.c | 1391 ++++++++++++------- src/utils.c | 48 +- src/winio.c | 649 ++++----- 178 files changed, 59073 insertions(+), 39637 deletions(-) delete mode 100644 BUGS create mode 100755 compile create mode 100644 doc/syntax/changelog.nanorc create mode 100644 doc/syntax/default.nanorc create mode 100644 doc/syntax/go.nanorc create mode 100644 doc/syntax/javascript.nanorc create mode 100644 doc/syntax/json.nanorc create mode 100644 doc/syntax/lua.nanorc create mode 100644 doc/syntax/po.nanorc create mode 100644 doc/syntax/spec.nanorc create mode 100644 doc/syntax/texinfo.nanorc create mode 100644 m4/ax_check_compile_flag.m4 create mode 100644 po/eo.gmo create mode 100644 po/eo.po create mode 100644 po/ja.gmo create mode 100644 po/ja.po delete mode 100644 po/rw.gmo delete mode 100644 po/rw.po create mode 100644 po/sl.gmo create mode 100644 po/sl.po diff --git a/AUTHORS b/AUTHORS index 1a6a0a3..59ea86b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,10 +1,10 @@ -$Id: AUTHORS 4210 2007-12-20 18:41:04Z dolorous $ +$Id: AUTHORS 4586 2014-02-07 14:57:49Z astyanax $ This file lists people who have made significant contribution to the nano editor. Please see the ChangeLog for specific changes by author. ------------------------------------------------------------------------- Chris Allegretta - * Original program author, former stable series maintainer. + * Original program author, former and current maintainer. David Lawrence Ramsey * Former stable series maintainer. Multiple buffer support, diff --git a/BUGS b/BUGS deleted file mode 100644 index 509fa84..0000000 --- a/BUGS +++ /dev/null @@ -1,161 +0,0 @@ -** Open BUGS ** - -** Fixed BUGS ** -- Marked cutting sometimes leaves a newline in the file unintelligently, - such as when all of a line is selected but the mark doesn't proceed to - the new line. (8) [FIXED/IRRELEVANT] -- Certains are not lined up properly when there are tabs in them at - certain col values. (9) [FIXED] -- edit_refresh() and update_line() do not handle selecting text when the - cursor is beyond COLS (10) [FIXED] -- No way to do a replace with the empty string (11) [FIXED, yay!] -- Spelling support is not elegant like Pico's integration of the 'spell' - program. nano only uses ispell (for now) (12) [FIXED] -- Moving to the end of a line when close to a multiple of COLS and at - least COLS * 2 does not make the screen jump early like it would for - if we were around COLS (bugs in edit_refresh, update_line) (13) - [FIXED, mostly] -- When at the very bottom of the edit window, do_wrap() goes berserk and - puts the cursor somewhere bad; subsequent keystrokes crash the program - (14) [FIXED, mostly] -- Doing a replacement of a substring of the replace string (e.g. - replacing "ed" with "fred" causes an infinite loop). (15) [FIXED] -- Cutting a file with marked text and both marker ends on the same line - causes a random segfault (16) [FIXED] -- Cutting more than one line resets the KEEP_CUTBUFFER flag in 0.9.3. - Error is in bitwise assignment (nano.h). (17) [FIXED] -- The wrapping code does not work right for lines like the following: - * * - Error is in do_wrap, must be rewritten. (18) [FIXED] -- nano fails to follow symlinks, even though -l isn't being used (20). - [Bug in global flag init, FIXED] -- When using --help or --version, the SIGINT character gets lost. (21) - [FIXED] -- edit_refresh() and update_line() (and related functions) have - trouble when a tab is the character that is the boundary at COLS (23) - [FIXED] -- There is an off-by-one error in keeping track of totsize. It is - caused by the fact that we count the newline at the end when we read - in a file but we do not, in fact, display this newline. This should - go away implicitly when the "Magic Line" returns, but it is noted here - for documentation's sake. (24) [FIXED] -- In replace with completely adjacent strings, every other search string - will be missed (try replace ':' in a string like ':::::::::') (28) - [FIXED] -- If nano opens a read-only file with the --tempfile option, and a - change is made to the buffer, and a write is attempted, nano will not - give you a dialog about not being able to write the file, and it will - not let the user exit (29, discovered by Joshua Jensen) [FIXED] -- Using nano -k, marked text is not cut properly. (31) [FIXED] -- Invoking -t or -k has the effect of invoking both options. (32) - [FIXED] -- totsize becomes incorrect after word-wrapping (25) [FIXED] -- Wrapping a line with autoindent mode sometimes causes a segfault (19) - [FIXED] -- When inserting files, the display sometimes fails to display properly - until a pageup/down occurs (22) [FIXED] -- In search/replace code, there is too much refreshing in bottomwin (26) - [FIXED] -- In replace, there is no way to accept the default replace string. (27) - [FIXED] -- Using nano -t, user can not exit until a filename is given via ^O. - (30) [FIXED] -- totsize problems still abound in do_justify (33) [FIXED] -- Using -k, cut text is not pasted properly. (34) [FIXED]. -- Using -k, pasted text is not updated properly if it goes beyond - editbot. (35) [FIXED] -- Doing a cut with -k can screw up the filestruct; fault is in cutting - code. (36) [FIXED] -- Hitting enter on the magic line makes new lines, but they are not - written out to disk when saved..... (37). [FIXED] -- Page up and page down do not work the same way as in Pico (# of - lines). (38) [FIXED] -- When doing a search and the marker is set, the screen does not always - properly update the inverted text (39). [FIXED] -- Searches for a string that only exists on one line multiple times will - fail after finding the last occurrence (discovered by Ken Tyler) (40). - [FIXED] -- Meta-Z is currently broken to toggle suspend. I guess I still don't - know signals very well =-) (41) [FIXED]. -- Unable to cut the entire file using the marker (discovered by Ken - Tyler) (42). [FIXED] -- The keypad does not work when nano runs in the Gnome terminal (43). - [FIXED] -- When reading in a file, if the file is a directory, the contents of - the file being edited are blown away (discovered by Chris Pimlot) - (44). [FIXED] -- In certain terms, nano will leave a "ghost" of screen upon exit when - called from inside mutt (among other settings) (45). [FIXED] -- In replace, hitting the Goto line shortcut key does nothing after a - search string is entered (discovered by Rocco Corsi) (46) [FIXED]. -- When typing in a string in search or replace and hitting - CASE_SENSITIVE or the other search string, the current string edit is - blown away in favor of the last stored search (47) [FIXED] -- If nano fails to open a file when it starts up, doing almost anything - causes a segfault (discovered by Ben Roberts) (48). [FIXED] -- In certain terminals, nano would not work properly with keypad(). - Turned out to be the silly timeout(0) call, which is completely - unneeded, anyway. (49) [FIXED] -- With less than a page of text, doing a page down will move the current - line to the top of the screen, which it shouldn't do. (50) [FIXED] -- With PDCurses, running Meta-X turns off the keypad. (51) [FIXED] -- Resizing the window completely screws up the display if in any other - mode than normal editing (help screen, search and replace, file - browser...) (52) [FIXED] -- Alt speller argument (-s, --speller) does not take a string argument - of more than one word. (53) [FIXED]. -- Cut to end cutting (-k) causes segfaults (try cutting "- Backup making - (filename~)?" line in TODO file) (discovered by - higuita@cadernoverde.com) (54) [FIXED]. -- When using autoindent (-i), wrapped text does not get autoindented - (55, discovered by Mark Senior) [FIXED]. -- When using -R (regex) and -p (Pico mode), subsequent searches after - the first fail if no string is entered (56) [FIXED]. -- Page down on a file of editwinrows fails (again). Reported by Ryan - Krebs (57) [FIXED]. -- File browser aborts on Solaris in qsort() call. (Reported by Matthias - Andree) (58) [FIXED]. -- Can modify the current file in view mode with ^W^R (discovered by - Rocco Corsi) (58) [FIXED]. -- When page up is used after two page downs, the screen doesn't update - properly (discovered by David Lawrence Ramsey) (59) [FIXED]. -- On BSD systems, marked cutting and paste often screws up the last line - in the cutbuffer (discovered by Barry Pederson) (60) [FIXED] -- Blank lines are not kept when cutting with -k (discovered by Rocco) - (61) [FIXED]. -- nano will not suspend properly inside of mutt (62) [FIXED]. -- When switching from Pico mode to normal mode, the previous search is - not displayed until cancelling the search (63) [FIXED]. -- If you change search options but don't change the search string in - normal mode, hitting Enter causes the search/replace to abort (64) - (Jordi Mallach) [FIXED]. -- Cutting one line of text causes the screen to recenter the line - (reported and fixed by David Lawrence Ramsey) (65) [FIXED]. -- When cutting marked text including the bottom of the file, a new - "magic line" is not created" (reported by David Lawrence Ramsey, fixed - by David Lawrence Ramsey & Chris) (66) [FIXED]. -- ^C does not work after a suspend in tcsh (discovered by Trevor Cordes) - (68) [FIXED]. -- Home and End control keys (^A, ^E) do not always work in filename - prompt (bug found by Ian Turner) (69) [1.0 series only] [FIXED]. -- Trying to insert a file of 0 bytes will hang nano (70) [FIXED]. -- Meta-space and ^Space are not yet handled in new backend code (77) [FIXED] -- F-keys do not work with new shortcut backend (72) [FIXED] -- Many menu items are probably missing from the new backend (73) [FIXED] -- Need a 'check-vitals-mapped' function to check that the end used didn't - unbind all the keys for exit or cancel before starting up the editor (74) [FIXED] -- Browser and prompt code still implement old switch on raw key input instead - of new if block for subnfunc values (75) [FIXED] -- New backend code probably does not compile under anything but default options, - if that (76) [FIXED] -- -enable-tiny does not work with new code (78) [FIXED] -- If a user only binds meta sequences to a function like left, right - page up/down, insert, and unbinds all other control and F keys for it, - nano will do the wrong thing when reading the key which is normally - assigned to it (79 - may not be worth fixing) [FIXED] -- Segfault editing at COLS presumably due to new color syntax - highlighting (80) [FIXED] -- Cutting the line at the top of the screen recenters to center (71) [FIXED] - - -$Id: BUGS 4439 2009-11-22 21:35:56Z astyanax $ diff --git a/ChangeLog b/ChangeLog index 28e14ea..88d1d5b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,17 +1,1571 @@ +GNU nano 2.4.0 - 2015.03.22 +2015-03-22 Benno Schulenberg + * src/chars.c (move_mbleft): Start looking for a multibyte char + not at the start of the string, but only as far back as such a + char can possibly be. Change suggested by Mark Majeres. + * src/search.c (findnextstr): Step backward or forward not simply + one byte but one character (possibly multibyte). Fixes Savannah + bug #42175, reported by myself, and the finding of ghosts seen in + https://lists.gnu.org/archive/html/nano-devel/2015-03/msg00055.html. + * src/winio.c (edit_redraw): Do not center the current line when + smooth scrolling is used. This fixes Savannah bug #42654. + +2015-03-21 Benno Schulenberg + * src/text.c (do_alt_speller): Remove some leftovers. + * src/search.c: Place some comments better and unwrap some lines. + +2015-03-21 Mark Majeres + * src/text.c (do_alt_speller): Restore the positions of the mark + and the cursor in a better way: to the columns where they were. + This fixes Savannah bug #44542, reported by Benno Schulenberg. + +2015-03-20 Benno Schulenberg + * src/nano.c (finish_stdin_pager, cancel_stdin_pager, stdin_pager): + Normalize the whitespace, remove an old comment, and place another + one better. + * src/text.c (do_undo): Make a message equal to another one. It + was mistakenly changed in r4950. (This is translation-neutral.) + * src/global.c (shortcut_init): Keep related items together in the + ^G help screen. + +2015-03-17 Benno Schulenberg + * src/text.c (do_alt_speller): Do not set the modified flag when + an external spell checker didn't make any changes. This fixes + Savannah bug #44320, reported by Cody A. Taylor. + +2015-03-14 Benno Schulenberg + * src/text.c (do_formatter): Fix a message plus a few comments. + +2015-03-14 Mark Majeres + * src/nano.c (renumber): Get out if there is nothing to renumber, + to prevent do_undo() from falling over trying to renumber emptiness. + This fixes Savannah bug #44488, reported by Dennis Decker Jensen. + +2015-03-08 Benno Schulenberg + * src/proto.h, src/nano.c: Fix compilation with --enable-tiny plus + --enable-nanorc. + * src/rcfile.c (parse_binding): Fix the rebinding of toggles. + * doc/man/{nano.1,rnano.1,nanorc.5}, doc/texinfo/nano.texi: Update + years and version numbers in the docs in anticipation of a release. + * src/nano.c (version): Drop compile time from version information + to enable a reproducible build. Proposed by Jérémy Bobbio and Jordi + Mallach (https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=774388). + +2015-03-07 Benno Schulenberg + * doc/man/nanorc.5, doc/texinfo/nano.texi: Add a note about the + inherent imperfection of using regular expressions for syntax + highlighting, as suggested by Mike Frysinger in bug #30962. + * doc/man/nanorc.5: Improve the indentation of some lists. + * doc/man/nanorc.5, doc/texinfo/nano.texi: Remove the mistaken + square brackets around the arguments of "header" and "magic" -- + those arguments are not optional. Also add "formatter" to the + texinfo document, and slightly improve its punctuation. + +GNU nano 2.3.99pre2 - 2015.02.27 +2015-02-25 Chris Allegretta + * src/rcfile.c (parse_binding): Add an exception for do_toggle() as + rebinding toggles broke with r5022. (Fixed in r5134.) + +2015-02-21 Benno Schulenberg + * README: Fix the explanation of how to subscribe to a mailing list. + * doc/syntax/{java,lua,python,ruby}.nanorc: Wrap some overlong lines. + +2015-02-18 Mike Frysinger + * doc/syntax/sh.nanorc: Recognize also dash, openrc and runscript. + +2015-02-16 Mike Frysinger + * .gitignore: Ignore the autotools 'compile' file. + +2015-02-15 Benno Schulenberg + * src/file.c (do_lockfile): Also show the name of the affected file + when finding a lock file, for when many files are opened at once. + * src/file.c (do_lockfile): The user does the editing, not the editor. + +2015-02-09 Chris Allegretta + * nano.spec.in: Add dependency on texinfo, docdir files for + RPM file creation. + +GNU nano 2.3.99pre2 - 2015.02.06 +2015-02-03 Alex Henrie + * src/cut.c (do_cut_text): Make sure to set modified even when + using --enable-tiny. + +2015-02-01 Kamil Dudka + * src/files.c (write_lockfile): Avoid writing uninitialized bytes to + the lock file -- a simple null_at() would not initialize the buffer. + * src/files.c (do_lockfile): Make sure that 'lockprog' and 'lockuser' + are terminated -- strncpy() does not guarantee that on its own. + * src/files.c (do_lockfile): Avoid printing a wrong PID on the status + bar due to treating serialized PID bytes as signed integers. This + addresses https://bugzilla.redhat.com/1186384 reported by Don Swaner. + * src/files.c (write_lockfile): Do not trim the nano version number + -- snprintf() counts the trailing zero into the size limit. + +2015-02-01 Benno Schulenberg + * src/winio.c (do_credits): Add a general entry for all translators. + * src/nano.c (version), src/winio.c (do_credits): Update the copyright + years to include 2015. + +2015-01-13 Chris Allegretta + * src/files.c (open_buffer): Check here for locking and properly + handle choosing to not open a file when locked instead of in + open_file(). Fixes Savannah bug 42373 reported by Benno Schulenberg. + +GNU nano 2.3.99pre1 - 2015.01.06 +2015-01-03 Chris Allegretta + * New formatter code to support syntaxes like + go which have tools to automatically lint and reformat the text for + you (gofmt), which is lovely. rcfile option formatter, function + text.c:do_formatter() and some other calls. + +2014-12-28 Benno Schulenberg + * src/files.c (do_lockfile): Gettextize the "File being edited" + prompt, and improve its wording. + * src/winio.c (do_credits): Remove the names of past translators + from the Easter-egg scroll. + * THANKS: Add a missing historical translator name. + * src/winio.c (do_credits): Add Mark to the scroll, for all his + undo work, colouring nano's interface, and other patches. + +2014-11-30 Benno Schulenberg + * doc/syntax/spec.nanorc: Colorize %pretrans and %posttrans fully. + Original patch from Savannah patch #8573 by Daniel Vrátil. + +2014-09-21 Benno Schulenberg + * doc/syntax/{perl,python,ruby,sh}.nanorc: Recognize also header + lines of the form "#!/usr/bin/env thing" besides "#!/bin/thing". + This fixes Savannah bug #43270 reported by Kitty. + +2014-08-29 Benno Schulenberg + * src/text.c (do_justify): Replace the old get_shortcut() wrapper + with the new func_from_key(). + +2014-08-10 Benno Schulenberg + * doc/texinfo/nano.texi: Improve some wordings and formatting. + +2014-08-07 Benno Schulenberg + * doc/syntax/nanorc.nanorc: Remove a mistaken OR which causes a + 'Bad regex, empty (sub)expression' error on some systems. This + fixes Savannah bug #42929 reported by Misty De Meo. + +2014-08-03 Benno Schulenberg + * doc/man/nano.1, doc/man/rnano.1: Tweak the formatting a bit so that + po4a will create a nicer POT file. + * doc/man/nanorc.5: Improve some of the wordings and formatting. + +2014-08-02 Benno Schulenberg + * doc/texinfo/nano.texi: Standardize the formatting of command-line + options -- each one separately. Also add some more markup. + +2014-08-01 Benno Schulenberg + * doc/man/nano.1, doc/man/rnano.1: Separate short and long option + by a comma instead of putting the long one between parentheses. + And showing the required quotes around the argument of -Q. + +2014-07-31 Benno Schulenberg + * src/files.c (do_insertfile): Adjust some indentation. + * src/prompt.c (do_statusbar_input), src/browser.c (do_browser): + Reorder a few things, and adjust some whitespace. + +2014-07-27 Benno Schulenberg + * src/global.c (add_to_sclist): Remove the now unused and unneeded + addition ability from this builder function of the shortcut list. + * src/global.c (strtokeytype): Move this to a better place. + * src/global.c (first_sc_for): Move this too to a better place. + * src/prompt.c (do_yesno_prompt): Use the new and more direct + func_from_key() wrapper instead of get_shortcut(). + * src/text.c (do_linter): Likewise. + * src/files.c (do_insertfile, do_writeout): Likewise. + +2014-07-24 Jordi Mallach + * doc/texinfo/nano.texi, doc/man/nanorc.5: Typo fix. + +2014-07-22 Benno Schulenberg + * doc/syntax/nanorc.nanorc: Remove 'undo' from the valid options. + +2014-07-21 Jordi Mallach + * doc/nanorc.sample.in: Remove ‘undo’ section which is now obsolete. + +GNU nano 2.3.6 - 2014.07.17 +2014-07-16 Jordi Mallach + * doc/man/rnano.1: Additional printing formatting improvement from + Bjarni Ingi Gislason. + +2014-07-16 Jordi Mallach + * doc/man/fr/nano.1, doc/man/fr/rnano.1: Apply similar escaping fixes + to French manpages. + * doc/man/fr/nano.1, doc/man/fr/rnano.1, doc/man/fr/nanorc.5: Recode + as UTF-8. + +2014-07-16 Jordi Mallach + * doc/syntax/debian.nanorc: Add https, tor and spacewalk to supported + APT methods. + * doc/syntax/debian.nanorc: Apply the syntax to apt/sources.list.d/ + entries as well, as reported by Rodolphe Pelloux-Prayer. + +2014-07-16 Jordi Mallach + * doc/man/nano.1, doc/man/rnano.1: Add some escaping and formatting + fixes as suggested Bjarni Ingi Gislason in + Debian bugs #662842 and #726956. + +2014-07-16 Benno Schulenberg + * src/text.c: Normalize the tabbing. + +2014-07-16 Mark Majeres + * src/text.c (do_undo): Make sure renumbering starts far enough back + after undoing a cut or paste. This fixes a segmentation fault when + undoing a repeated cutting and pasting of the first line of a file. + * src/nano.c (move_to_filestruct, copy_from_filestruct): Fix two leaks. + +2014-07-13 David Lawrence Ramsey + * ChangeLog: Typo fix. + +2014-07-12 Benno Schulenberg + * configure.ac: The warning about datarootdir being ignored is + not merely a warning, it also activates a workaround. + +2014-07-11 Mark Majeres + * src/text.c (do_undo, do_redo): Do not speak of "line wrap" + but instead of "text add" when undoing/redoing text additions + that caused automatic line breaks. + +2014-07-11 Benno Schulenberg + * src/files.c (write_lockfile): Refix typo in error message. + +GNU nano 2.3.5 - 2014.07.11 +2014-07-11 Chris Allegretta + * src/files.c (do_lockfile, open_file): If locking fails, + allow the lock failure message to be preserved AND + preserve the filename passed on the cmdline. Fixes + Savannah bug #42668. + +2014-07-02 Chris Allegretta + * src/files.c (do_lockfile): Check whether the directory + of the file we're trying to lock exists, and make the + resulting error message more intuitive. Fixes + Savannah bug #42639 reported by Benno Schulenberg. + +2014-07-02 Mark Majeres + * src/text.c (undo_cut, redo_cut, update_undo): Handle the + cases of cutting-from-cursor-to-end-of-line correctly. + * src/nano.c (do_input): Don't preserve the cutbuffer when + CUT_TO_END is toggled -- it would intermix two cut types. + * src/text.c (redo_cut, do_undo, do_redo): Don't forget to + free the cutbuffer after use. + +2014-07-02 Benno Schulenberg + * src/proto.h: Add a typedef for a pointer to a function. + * src/global.c (func_from_key): New wrapper. + * src/prompt.c (get_prompt_string, do_prompt): Use the new + wrapper to make the code a bit cleaner. + * src/help.c (do_help, parse_help_input): Use the wrapper. + * src/browser.c (do_browser, parse_browser_input): Likewise. + * src/search.c (search_init, do_gotolinecolumn): Likewise. + * src/search.c (findnextstr): Replace a call of old wrapper + 'getfuncfromkey()' with a call of new 'func_from_key()'. + * src/winio.c (getfuncfromkey): Delete now unneeded wrapper. + * src/nano.c (usage, main), doc/texinfo/nano.texi: Properly + exclude the --quiet option when --disable-nanorc was given. + +2014-07-01 Benno Schulenberg + * src/browser.c (do_browser), src/help.c (do_help): Make sure + to always set 'currmenu', so that we can rely on it. + * src/*.c (get_shortcut): Now that 'currmenu' is really global, + stop passing it around. + * src/help.c (help_init), src/winio.c (bottombars): There are + no tagless functions, so there is no need to check. + * src/prompt.c (do_prompt, get_prompt_string): Don't pass the + menu, just set it earlier. + * src/prompt.c (get_prompt_string): Group the arguments better. + * src/global.c (shortcut_init), src/browser.c (do_filesearch): + Show that it is possible to have backwards, regular-expressive + and case-sensitive searching in the file browser. + * src/browser.c (filesearch_init, do_filesearch): Now delete + these abilities again and all provisions for them. + * src/global.c (shortcut_init): Add two defines to make the + functions list clearer. + +2014-06-30 Mark Majeres + * src/cut.c, src/global.c, src/nano.c: Rename 'cut_till_end' to + 'cut_till_eof', and 'do_cut_till_end' to 'do_cut_till_eof', to + reduce confusion with CUT_TO_END, which is about end-of-line. + +2014-06-30 Benno Schulenberg + * src/color.c (color_update): When there are no syntaxes, for example + with --ignorercfiles, do not try to find one, because that would lead + to the magic database being searched, which slows down startup a lot. + * src/color.c (color_update): Move some variables to a better place. + * src/*: Make 'meta_key' and 'func_key' into global variables, instead + of having them declared everywhere and passing them around endlessly. + * src/global.c (sc_seq_or): Now fix a bug introduced somewhere after + 2.3.2 where binding a movement function to a Meta key would make the + corresponding Arrow key stop working (producing a character instead). + +2014-06-29 Benno Schulenberg + * src/rcfile.c: Fix compilation with --enable-tiny --enable-nanorc. + * src/winio.c (parse_kbinput, get_escape_seq_kbinput): Make Ctrl-Left + and Ctrl-Right produce special codes, and map these codes to Prevword + and Nextword instead of reducing them to a plain Left and Right. The + codes 539 and 554 were so chosen because some terminals produce these. + +2014-06-29 Mark Majeres + * src/text.c (do_undo): Update the pointer to the bottom of the file + when undoing line deletions at file's end. + +2014-06-28 Benno Schulenberg + * src/prompt.c (do_statusbar_input): Remove the useless parameters + 'have_shortcut and 'allow_funcs'; the latter is only ever TRUE. + * src/global.c (shortcut_init), src/prompt.c (do_statusbar_input): + Eradicate the execute flag -- it is only FALSE for functions that are + empty placeholders (so executing them will not do anything anyway) or + for functions ('total_refresh', 'do_suspend_void') that do not exist + in menus with a prompt. The only two exceptions are 'do_cancel' and + 'do_gotolinecolumn_void'. The first is handled specially, so do that + too for the second and then get to drop 140 parameters. + * src/global.c (strtosc): Move recognition of the toggles to the end, + use a single assignment of do_toggle_void, trim the unneeded braces. + +2014-06-27 Benno Schulenberg + * src/global.c (shortcut_init): Add default keybindings for Cut, + PrevWord and NextWord in the prompt input lines; the code for those + special operations already exists, just the shortcuts were missing. + * src/rcfile.c (parse_binding): When binding keys, only allow those + menus where the bound function is actually present. This reduces + the meaning of 'all' to "all menus where the function exists". + * src/rcfile.c (is_universal): New function, returning TRUE for the + functions that are present in most menus but only listed in MMAIN. + * doc/man/nanorc.5, doc/texinfo/nano.texi: Update the docs for this. + * prompt.c (find_statusbar_bracket_match, do_statusbar_find_bracket): + Remove these functions and thus the ability to search for a matching + bracket in a prompt input line. The find_bracket function never had + a default keybinding outside MMAIN, so is unlikely to have been used. + * src/prompt.c (do_statusbar_input): Normalize the indentation. + * src/winio.c: Normalize some whitespace. + * Makefile.am, nano.spec.in: Stop distributing the BUGS file. + * BUGS: Remove obsolete file, as all the bugs in it have been fixed + long ago. Nowadays bugs are tracked on Savannah. + * configure.ac: Silence a useless warning about ignoring datarootdir. + +2014-06-25 Benno Schulenberg + * src/browser.c (do_browser): Allow 'firstfile' and 'lastfile' to be + rebound to Ctrl keys -- checking meta_key is wrong, the function has + already been determined, that is all that matters. + * src/help.c (do_help): Same thing for 'firstline'/'lastline'. + +2014-06-23 Benno Schulenberg + * src/nano.h, src/move.c (do_up, do_down), src/winio.c (edit_scroll): + Rename UP_DIR and DOWN_DIR to UPWARD and DOWNWARD, for clarity. + * src/proto.h, src/global.c, src/search.c: Rename 'no_replace_void()' + to 'flip_replace_void()', to show what it actually does. + * doc/man/nanorc.5, doc/texinfo/nano.texi: Update the docs for that. + * src/global.c (strtosc): Add the bindable function 'gotodir'. + * doc/man/nanorc.5, doc/texinfo/nano.texi: Document the bindable + functions 'tofiles','gotodir' and 'flipnewbuffer', and correct + the description of 'gototext' (not being about the file browser). + * doc/syntax/nanorc.nanorc: Show Ins and Del as valid rebindable keys. + * src/help.c (do_help): Normalize the indentation. + * src/files.c (do_insertfile): Give audible feedback when flipping + the new buffer to off is not allowed in view mode. + +2014-06-22 Benno Schulenberg + * src/browser.c (parse_browser_input), src/help.c (parse_help_input): + Remove two pointless calls of get_shortcut(), and adjust the comments. + * src/nano.c (do_toggle): When toggling softwrap, only the edit window + needs to be refreshed, not the entire screen. + * src/browser.c (do_browser): Remove superfluous abortion variable, + and place two comments better. + * src/text.c (do_redo): Rename 'undidmsg' to 'redidmsg', to be apt. + +2014-06-22 Mark Majeres + * src/text.c (do_redo): When redoing a line join at the tail + of the file, make sure openfile->filebot is updated. + * src/text.c (undo_cut, redo_cut, do_undo, add_undo, update_undo): + Fix three leaks of the cutbuffer, shorten and regroup some stuff, + and remove an unneeded iteration of cutbottom. + +2014-06-21 Mark Majeres + * src/text.c (undo_cut, add_undo): When undoing a cut-till-eof, + put the cursor back where the cut started, and not at the end. + * src/text.c (do_undo): When undoing a line break at the tail + of the file, make sure openfile->filebot is updated. + +2014-06-21 David Lawrence Ramsey + * src/move.c, src/nano.c: Miscellaneous whitespace fixes, one + type fix, and one more #ifdef NANO_TINY. + +2014-06-20 Benno Schulenberg + * src/proto.h, src/global.c: Remove two obsolete variables and an + unneeded extern, and regroup some stuff. + * src/files.c (check_dotnano): Wrap long lines and actually report + the name that is not a directory. + * src/*: Miscellaneous whitespace adjustments and comment tweaks. + * src/files.c: Fix compilation with --enable-tiny --enable-browser. + * doc/man/nano.1, doc/texinfo/nano.texi: History logging no longer + depends upon nanorc support, plus many other tweaks. + * src/global.c (strtosc): Fix compilation with --enable-tiny + --enable-histories --enable-nanorc. + * src/text.c: Fix compilation with --enable-tiny --enable-wrapping. + * src/files.c (do_insertfile): Fix compilation with --enable-tiny + --enable-histories --enable-multibuffer. + * src/nano.c: Fix compilation with --enable-tiny --enable-mouse. + * doc/man/nanorc.5, doc/texinfo/nano.texi: Explain better what "all" + means when rebinding keys. This is a fix for Savannah bug #42552. + * src/nano.c (main): Make +1 and +,1 start on line one column one, + overriding a historical position. This fixes Savannah bug #42538. + +2014-06-19 Benno Schulenberg + * src/nano.c (window_init): Rename 'no_more_space()' to 'more_space()' + for consistency, and tweak the related comments. + * src/files.c: Update some comments to match the current status. + * src/nano (finish, main): Allow -H/--historylog and -P/--poslog to + function also when -I/--ignorercfiles is given. + * configure.ac: Add a --disable-histories flag, to disable the code + for the histories of search/replace strings and cursor positions. + * doc/texinfo/nano.texi: Document the new configure flag. + * src/*: Transform many DISABLE_NANORC to the new DISABLE_HISTORIES. + This completes the fix for Savannah bug #42539. + +2014-06-18 Benno Schulenberg + * src/text.c: Rename 'to_end' to 'to_eof', to lessen confusion + with CUT_TO_END (which is about cutting to end-of-line). + * src/text.c: Upon better thought, elide the unneeded 'to_eof'. + * src/text.c: And elide a totally unused 'strdata2'. + * src/text.c: Rename the undo type UNSPLIT to JOIN, for clarity. + * src/global.c, src/rcfile.c: Rename function_type to key_type. + * src/text.c (break_line): Remove a condition and a break that + cancel each other. + +2014-06-18 Mark Majeres + * src/text.c (add_undo): Don't start a new undo for CUT when the + cutbuffer is being preserved, because then the cuts are contiguous + and will form a single undo item. And make sure the cutbuffer will + be cleared when a new undo item for CUT is created. + * src/cut.c (keeping_cutbuffer): New function, to access the status + of 'keep_cutbuffer' from the undo/redo code in src/text.c. + * src/cut.c (do_copy_text): Blow away the contents of the cutbuffer + if the mark is set or the cursor has moved between two copy commands. + +2014-06-17 Mark Majeres + * src/text.c (do_undo, do_redo): After an undo or redo, update the + 'placewewant' (the desired horizontal position of the cursor). + +2014-06-17 Benno Schulenberg + * src/text.c (do_undo, do_redo): Remove obsolete boolean variable. + * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Replace + SYSCONFDIR with an absolute path or a circumlocution, as suggested + by Mike Frysinger, plus some other tweaks. + +2014-06-16 David Lawrence Ramsey + * src/nano.c (do_exit): Display the message "No file name" on the + statusbar for two seconds when --tempfile was given and the current + buffer has no name. This fixes Savannah bug #41750. + +2014-06-16 Benno Schulenberg + * configure.ac: For the sake of statically linked systems, make sure + the compiler also links against libz, which is used by libmagic. + This fixes Savannah bug #38378, reported by Alan Hourihane. + * src/nano.c (do_mouse, do_input): Don't bother returning zero when + the cursor moved, just reset the cutbuffer directly. This avoids an + "Unknown Command" message on every cursor-positioning mouse click. + * src/nano.c (do_mouse): Put a common statement outside of then/else. + * src/Makefile.am: Remove -I m4; it is needed only at the top level. + * Makefile.am: Trim the contents of EXTRA_DIST to what is required. + * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Update + the docs for the changed location of nano's search history. + * doc/man/nano.1, doc/man/nanorc.5, doc/texinfo/nano.texi: Change + some wordings, triggered by Savannah bug #52539. + +2014-06-14 Mark Majeres + * src/nano.h, src/text.c (undo_cut, update_undo): When undoing a + backwards cut, put the cursor back in front of it, where it was. + +2014-06-13 Benno Schulenberg + * src/nano.c (do_input): Repositioning the cursor with the mouse + (result == 0) should break a series of ^Ks. + * src/nano.c (do_mouse): Clicking on the titlebar or the statusbar + should not break a series of ^Ks, thus result must not be zero. + * src/nano.c (do_input): A toggle should not break a series of ^Ks. + * src/winio.c (get_shortcut): Do not treat holding both Control and + Meta the same as holding only Control. + * src/global.c, src/rcfile.c, src/nano.h, src/nano.c, src/text.c: + Remove the --undo option, having the undo functions always enabled. + If wished, the user can unbind them. This fixes Savannah bug #42456. + * doc/man/{nano.1,nanorc.5}, doc/texinfo/nano.texi: Update the docs. + * nano.spec.in: Remove useless info dir file from the build directory, + don't clean this directory first, it's unnecessary, add a suggestion + for a pico symlink, and update the license and the source URL. + +2014-06-11 Benno Schulenberg + * src/winio.c (get_mouseinput): Produce the correct return value for + when a mouse event reinserted something into the keyboard buffer. + * src/nano.c (do_input): Do not continue when there is a spurious + mouse event (a touch of the touchpad, for example) but get out. + Continuing would result in the cutbuffer being cleared upon the + next cut. These two changes together fix Savannah bug #42326. + * src/nano.c (do_input): Always accept mouse events, also when + just looking for Unjustify. This fixes Savannah bug #42322. + * src/nano.c (do_input): Remove a superfluous switch statement. + * src/winio.c (get_mouseinput): Set the type of a reinserted key, + also when it is a function key. This fixes Savannah bug #42092. + +2014-06-10 Benno Schulenberg + * src/browser.c, src/files.c, src/nano.c src/prompt.c, src/winio.c: + A few minimalistic whitespace adjustments. + * src/rcfile.c (check_bad_binding): Avoid a compiler warning. + +2014-06-10 David Lawrence Ramsey + * src/winio.c: One more type fix and two tiny message tweaks. + +2014-06-09 David Lawrence Ramsey + * src/*.c: Cosmetic tweaks of comments and whitespace. + * src/help.c, src/rcfile.c, src/winio.c: Elide a function call by + not comparing with an empty string but checking for the final \0. + * src/files.c, src/nano.c, src/text.c, src/winio.c: Type fixes in + debugging stuff -- line numbers are long, x positions unsigned long. + * src/files.c, src/move.c, src/nano.c, src/text.c, src/winio.c: + Make tiny nano a bit tinier by preening out some soft-wrap stuff. + * src/global.c, src/nano.c, src/winio.c: A few more cosmetic tweaks + (whitespace, order, braces, parentheses, and a typo) and type fixes. + +2014-06-09 Benno Schulenberg + * src/nano.c (do_input): Remove two superfluous false conditions. + * src/nano.h, src/text.c (add_undo): Avoid a compiler warning with + --disable-wrapping. + +2014-06-09 Mark Majeres + * src/text.c (do_undo, do_redo, add_undo, update_undo, do-wrap): + Rewrite the line-wrapping code to make use of the existing line-break + code. And undo line wraps together with their causal text additions, + and not as separate actions because the user did not make them. + +2014-06-08 Mark Majeres + * src/text.c (do_delete, do_deletion, do_undo, do_redo, update_undo): + Differentiate between undoing a Delete and undoing a Backspace -- the + cursor should be in a slightly but significantly different position. + +2014-06-04 Benno Schulenberg + * src/global.c (shortcut_init), src/files.c (do_insertfile): Rename + 'ext_cmd_void' to 'flip_execute_void' to better match what it does. + * src/global.c (strtosc), doc/man/nanorc.5, doc/texinfo/nano.texi: + Add function name 'flipexecute' to enable rebinding ^X in the menus + Read File and Execute Command. + +2014-06-04 David Lawrence Ramsey + * src/*.c: Adjustments of whitespace and comments. + * doc/nanorc.sample.in: Interpunction tweaks. + * src/global.c (add_to_funcs): Add cast to subnfunc* for nmalloc(). + * src/files.c (do_lockfile): Properly make the variable 'lockfilesize' + a size_t instead of a ssize_t, since it holds the result of strlen(). + And use charalloc() instead of (char *)nmalloc(). + * src/text.c (do_undo): Use charealloc() and not (char *)nrealloc(). + * src/text.c (add_undo): Make use of null_at() to both null-terminate + the multibyte character and align it to use only the amount of memory + necessary. + +GNU nano 2.3.4 - 2014.06.02 +2014-06-02 Chris Allegretta + * doc/syntax/default.nanorc: Can't do trailing spaces in the + default syntax or it will hilight the spaces as you type them + into a new file, which for non-programming is infuriating. + +2014-05-29 Mark Majeres + * src/text.c (do_delete): For the undo structure, differentiate + between deleting a newline and any other character. + +2014-05-29 Chris Allegretta + * src/chars.c (addstrings): This function needs to be available even + on non-utf-8 systems. + * nano-regress: Added --disable-utf8 to regression check. + +GNU nano 2.3.3 - 2014.05.29 +2014-05-28 Chris Allegretta + * doc/syntax/mutt.nanorc: Include Benno's awesome signature + matcher, modified slightly to also work for quoted sigs. + * doc/syntax/default.nanorc: Be far more gentle with something + which affects every file which doesn't match another syntax, and + the user may not be able to override if their distro turns on + highlighting by default. + +2014-05-28 Benno Schulenberg + * src/nano.c (do_input): Remove the three unused parameters 's_or_t', + 'ran_func', and 'finished'. They are only ever set and never used. + * src/text.c (do_justify): Adjust a call of do_input(). + * src/browser (do_browser): Actually translate the go-to-dir prompt. + * src/browser, src/search.c: There is no need to repeat translator + comments for the same string -- once is enough to get them included. + Add instead some translator comments for the prompts. + * src/global.c (shortcut_init): Make ^X in the Read-File menu toggle + between executing a command and inserting a file. The mechanism in + do_insertfile() in files.c is already present -- in the past just + the wrong function was used in the relevant function-list item: + 'do_insertfile_void' instead of the unintuitive 'ext_cmd_void'. + * src/browser (filesearch_init): Remove an unneeded format specifier. + * src/nano.c (usage): Add a translator comment for the --help output. + * src/global.c (shortcut_init): Elide four unneeded tags. + * src/global.c (shortcut_init): Make tiny nano just a bit tinier. + * src/global.c (shortcut_init): Standardize the add_to_funcs() calls, + breaking always between the menus and the tag. + +2014-05-27 Chris Allegretta + * src/winio.c (edit_refresh): wredrawln() is not supported under + slang. + +2014-05-27 Benno Schulenberg + * src/global.c (shortcut_init): Improve the arrangement of help items + under certain compilation conditions. + * src/global.c (strtosc): Make tiny nano a bit tinier. + * src/global.c (strtosc): Allow rebinding 'suspend' in tiny nano. + * src/winio.c (set_modified): Adjust translator comment to make it + show up in the POT file, and make it take the "[ ]" into account. + +2014-05-26 Benno Schulenberg + * src/cut.c (cut_line): Fix compilation with --enable-tiny. + * src/text.c (do_linter): Avoid a warning with --enable-tiny. + * src/global.c (shortcut_init): Unwrap some lines, and reorder two. + +2014-05-25 Benno Schulenberg + * src/global.c: Cut down on the size of tiny nano, by not compiling + the function strtosc() when --disable-nanorc is given or implied. + +2014-05-25 Mark Majeres + * src/chars.c (addstrings): New function, concatenates two allocated + strings, tacking the second onto the first and freeing the second. + * src/cut.c (do_uncut_text): Update the undo structure for a paste. + * src/text.c (undo_cut, redo_cut, add_undo, update_undo): Place the + cursor after an undo there where it was before the do, and handle + multibyte characters correctly. + +2014-05-23 Benno Schulenberg + * src/winio.c (edit_draw): Finally, the proper fix for bug #31743; + telling ncurses to really redraw the line, without optimization, so + it will not mistakenly assume that a wide character at the start of + a line takes up just one column. This deletes the workaround that + had the side effect of creating pastes full of trailing whitespace. + +2014-05-19 Mark Majeres + * src/winio.c (edit_draw): Paint the current line *after* tickling the + terminal, so that the character in the final column will be displayed + properly. Bug was introduced five days ago. + +2014-05-18 Benno Schulenberg + * src/nano (precalc_multicolorinfo): Do not match the ^ anchor when + looking further on in a line. This prevents an end="^$" from being + sometimes mistakenly matched. Fix inspired by Savannah bug #27708. + * doc/syntax/default.nanorc: New file, example for a default syntax. + +2014-05-17 Benno Schulenberg + * doc/syntax/json.nanorc: New file, originally from Aapo Rantalainen, + but edited, extended, and improved. See Savannah patch #7410. + * src/winio.c (edit_draw): Do not skip the colour-off commands at the + end of the loop. Based on Savannah patch #7550 by Ryan Lothian. + This fixes bug #26111 reported by Dave Geering . + +2014-05-16 Benno Schulenberg + * src/text.c, src/winio.c: Remove some more double spaces. + * doc/syntax/patch.nanorc: Show trailing whitespace on added lines. + * doc/syntax/debian.nanorc: Make the component colouring simpler, + and the URI colouring completer, and improve the comments. + * doc/syntax/*.nanorc: Harmonize (partially) the syntax files. + +2014-05-16 David Lawrence Ramsey + * src/color.c, src/cut.c, src/text.c: Tweak some whitespace. + * src/global.c, src/move.c: Use TRUE and FALSE instead of 1 and 0. + * src/winio.c (edit_draw): Mention the name of the tickling character. + * src/search.c (goto_line_posx): Remove unneeded call of edit_refresh. + * src/text.c (do_undo, do_redo): Use size_t for line lengths. + +2014-05-15 Mark Majeres + * src/*, but mainly src/text.c (undo_cut, redo_cut, do_undo, do_redo): + Go to the correct positions for undoing/redoing the cuts and pastes. + This fixes several undo problems and Savannah bug #25585. + +2014-05-15 Benno Schulenberg + * doc/syntax/c.nanorc: Improve the magic regex, plus tweaks. + * src/color.c (color_update): Adjust a comment, and be clearer. + * src/nano.h: Improve two comments, and elide one macro. + * doc/syntax/Makefile.am: Add texinfo.nanorc to the packing list. + +2014-05-14 Benno Schulenberg + * src/winio.c (edit_draw): Poke a non-breaking space into the last + column of every line, to startle the terminal into handling wide, + two-column characters properly. This fixes Savannah bug #31743. + * src/nano.c (precalc_multicolorinfo): Improve debugging messages, + and remove superfluous assignment (fileptr already equals endptr). + * src/color.c (color_update): Move magic check to after headerline. + * src/color.c (color_update): Open the magic database only when + actually going to use it, and close it afterward. + * doc/syntax/{perl.nanorc,xml.nanorc}: Improve two magic regexes. + * src/color.c (color_update): Stop seeking when a magic matched. + * doc/nanorc.sample.in: Add an example of colouring nano's interface + elements, and tweak some of the other descriptions. + +2014-05-13 Benno Schulenberg + * src/text.c (do_linter): Make an error message somewhat clearer. + * src/rcfile.c (parse_binding): Improve another error message. + * doc/syntax/nanorc.nanorc: Show key names like M-6 and M-/ as valid. + * src/global.c (thanks_for_all_the_fish): Upon exit also free the + lists with functions and shortcuts. + * src/*.c: Several random whitespace and comment tweaks. + * src/global.c (replace_scs_for): Condense the function a bit. + * src/help.c (help_init): No need to keep looping when two are found. + * src/global.c: Improve compilation with --disable-browser. + * src/nano.h, src/*.c: A few more comment tweaks. + +2014-05-12 Benno Schulenberg + * src/text.c (do_spell): Provide startup feedback, as for the linter. + * doc/syntax/nanorc.nanorc: Show bright foreground colours as valid. + * src/rcfile.c: Improve some comments, and remove some others that + are mispasted or superfluous. + * doc/texinfo/nano.texi: Add missing parenthesis, remove blank line. + * src/rcfile.c (parse_magictype, parse_headers): Handle the libmagic + and headerline regexes in the same manner, eliding a static variable + while renaming some others. + * src/*.h, src/rcfile.c (parse_magictype, parse_headers): Rename them + to parse_magic_exp() and parse_header_exp() to be more fitting, further + symmetrify them, and improve some comments. + * src/nano.h, src/color.c, src/global.c, src/rcfile.c: Rename struct + type 'exttype' to 'regexlisttype', to better match its functions, and + upon exit also free the regexes for libmagic results and headerlines. + * doc/syntax/python.nanorc: Improve the multiline regexes, make the + one with single quotes work again, and add some comments. + * doc/syntax/{man,python,fortran}.nanorc: Add regexes for comments, + trailing whitespace and reminders, and trim some trailing spaces. + * src/rcfile.c: Move parse_magic_exp() next to its sister. + * src/color.c (color_update): Rename a variable, and elide another. + +2014-05-10 Chris Allegretta + * src/rcfile.c (parse_color_names): Redefine false and true to + their appropriate macro names so --with-slang works (slangv2 anyway). + * src/text.c (do_linter): Care about whether user cancelled the file + save (cancel the operation) versus just said no (continue but don't + save the file). Also doupdate() after statusbar message that + linter is being invoked and blank the shortcuts to draw the eye. + Also allow user to cancel at the "open in a new buffer" prompt. + New function lint_cleanup(). Fixes Savannah bug #42203. + +2014-05-10 Benno Schulenberg + * doc/texinfo/nano.texi: Make syntax highlighting into a separate + section, and add the still missing section on rebinding keys. + +2014-05-10 Mark Majeres + * src/*.h, src/*.c: Make it possible for the foreground colour of + interface elements to be bright. + +2014-05-09 Benno Schulenberg + * src/winio.c (get_mouseinput): Count only shortcuts that are actually + shown, so that clicking on the ones after ^T (Speller/Linter) will work + again correctly. This fixes the second part of Savannah bug #42093. + * src/global.c (shortcut_init, strtosc): Do not define nor accept + shortcuts for functions that are disabled. + * src/global.c (shortcut_init, strtosc): Define shortcut for the linter + when speller is disabled, and fix compilation with --disable-speller. + * src/global.c (shortcut_init, strtosc), doc/man/nanorc.5: Put softwrap + back among the "Appearance" toggles. + * doc/man/nanorc.5: Describe bindable functions in the third person. + +2014-05-06 Benno Schulenberg + * doc/texinfo/nano.texi: Let makeinfo figure out the node pointers. + * doc/syntax/texinfo.nanorc: New file, colouring for Texinfo files. + * doc/texinfo/nano.texi: Add sections on the Cutbuffer and the Mark, + remove option '-?', and make some other tweaks. + * doc/man/{nano.1,nanorc.5}, doc/texinfo/nano.texi: Synchronize the + documentation, and tweak some wording here and there. + * doc/syntax/texinfo.nanorc: Stop the brace content from spilling. + +2014-05-05 Benno Schulenberg + * doc/man/nanorc.5: Give syntax highlighting its own section, + add the "header" command, tweak some wording and formatting, + and trim some duplicate introductory information. + * src/global.c (strtosc), doc/man/nanorc.5: Allow the function + do_cut_till_end (naming it "cutrestoffile") to be rebound. + * doc/syntax/nanorc.nanorc: Add the four new *color options. + * doc/syntax/nanorc.nanorc: Differentiate between options that + take an argument and those that don't. + +2014-05-04 Benno Schulenberg + * src/winio.c (statusbar): Elide a variable. + * src/*: Rename the variable 'reverse_attr' to 'hilite_attribute', + and remove an unneeded call of wattroff(). + * doc/man/nanorc.5, doc/texinfo/nano.tex: Document the settings + of titlecolor, statuscolor, keycolor and functioncolor. + * doc/man/nanorc.5, doc/texinfo/nano.tex: Show quotes where quotes + are needed, remove some unneeded spaces, and do other tweaks. + * src/global.c (strtosc), doc/man/nanorc.5: Allow the Backwards + toggle to be rebound, document it, and document Backspace too. + +2014-05-03 Benno Schulenberg + * src/*.h, src/*.c: Add the ability to colour four elements of + nano's interface differently: title bar, status bar, key combo, + and function tag. Idea and original patch #8421 by Mark Majeres. + * src/global.c (shortcut_init): Unfold long lines consistently. + * src/global.c (shortcut_init): Order the shortcuts in roughly + the same manner as in the help lines, and group them per menu. + * src/global.c (shortcut_init): Remove the search-mode toggles + from the inappropriate WHEREISFILE and REPLACEWITH menus. + * src/global.c (shortcut_init): Paragraph jumping only makes + sense in the main editing menu; remove it from all others. + +2014-04-30 Benno Schulenberg + * src/*, doc/*: Update the years in the copyright notices -- there + were releases in 2010, 2011, and 2013, and there will be in 2014. + +2014-04-27 Benno Schulenberg + * src/nano.c (usage, main): Don't blurt out the full help text + but just a hint when the command line contains some mistake, to + avoid drowning out the error message. + * src/nano.c (usage): Mention only those options that actually do + something. For the no-op compat flags the man page is the place. + * src/global.c (shortcut_init): In the help lines of Search/Replace + show the important toggles early on, and group them better. + * src/global.c (shortcut_init): Improve order and grouping in the + main help text and help lines. + * src/global.c (strtosc): Fix compilation with --enable-tiny. + * src/global.c (shortcut_init): Improve the order of the help items + still further, and make them also group nicely in the tiny version. + +2014-04-27 Mark Majeres + * src/rcfile.c (parse_include): Plug two tiny memory leaks. + +2014-04-26 Benno Schulenberg + * src/global.c (add_to_funcs): Add a pointer to the tail of the + functions list, to simplify and speed up adding new items. And + make use of it to remember the location of the Uncut item. + * src/global.c, src/files.c (make_new_buffer, close_buffer): Make + help lines show "Close" again when more than one buffer is open. + * src/global.c (strtosc), doc/man/nanorc.5: Allow the do_spell + (and thus do_lint) function to be bound to other key combos. + * src/global.c (strtosc), doc/man/nanorc.5: Group related functions + together, remove duplicate up/down, add missing prevpage/nextpage. + +2014-04-24 Benno Schulenberg + * doc/faq.html: Update a few URLs, delete some obsolete ones, update + the section on configuration flags and on translating nano, plus a + whole series of other small fixes and adjustments. + +2014-04-23 Benno Schulenberg + * src/winio.c, src/help.c, src/text.c, src/browser.c: Remove + several unneeded double semicolons, and two relic comments. + * src/help.c (parse_help_input), src/browser.c (parse_browser_input): + Make the Minus and Space keys work in the help viewer and file browser + also when the PrevPage and NextPage functions are bound to meta-key + sequences -- searching for these will not find them. So, instead put + in the standard key code. This fixes Savannah bug #42140. + * src/global.c (first_sc_for): Stop the whole charade of preferring + control keys over meta keys over function keys, but return the first + one in the list -- just like the function name implies. This will + make a user-defined shortcut appear in the two bottomlines without + having to unbind the existing one first -- better feedback. + * src/global.c (shortcut_init, flagtostr, strtosc): Put the two + wrapping toggles together and increase their contrast a bit. + * src/nano.c (usage), doc/man/nano{.1,rc.5}, doc/texinfo/nano.texi: + Increase the contrast between hard-wrapping and soft-wrapping. + +2014-04-22 Benno Schulenberg + * src/global.c (shortcut_init): Put the movement keys in the + help viewer in the order of increasing stride. + * src/global.c (shortcut_init): Rename many constants from + '*_msg' to '*_tag' to reduce confusion with 'nano_*_msg'. + * src/global.c (shortcut_init): Elide several pointless constants. + * src/global.c (shortcut_init): Elide more unneeded constants, and + update some translator comments and shorten a few tags. + * src/global.c (shortcut_init): Delete unneeded empty funcs; being + in the list of shortcuts is enough. + * src/global.c (shortcut_init): Put left/right in normal order. + * src/global.c (shortcut_init): List function key after meta key. + * src/help.c (help_init): Show just two shortcuts per function -- + only three functions showed three, but who has an F13, F14, F15? + This also fixes Savannah bug #41889: misalignment of help text. + * src/help.c (help_init): Split the toggles into three groups, + and do not show toggle keys that have been rebound. + +2014-04-21 Benno Schulenberg + * doc/syntax/nanorc.nanorc: There is no F0 key. + * src/global.c (first_sc_for): Adjust two comments -- the help + viewer no longer sorts keys to be control first, meta second. + * src/global.c (first_sc_for): Put meta first, for clarity. + * src/global.c (strtokeytype): No need to check for lowercase + 'm' or 'f', the source doesn't use them and rc-file processing + uppercases them. Also put control first, for clarity. + * src/global.c (strtosc, strtomenu): Sort functions slightly + better, and allow things to be rebound in the linter menu. + * src/nano.h: Delete a large bunch of unused defines. + * src/nano.h, src/proto.h: Delete some more unused stuff. + * src/rcfile.c (parse_binding), src/winio.c (get_mouseinput): + Avoid three compiler warnings with --enable-debug. + * src/global.c (assign_keyinfo): Decombine repetitive condition. + * src/global.c (assign_keyinfo, shortcut_init): Give nicer names + to the dedicated keys, for when they show up in the help lines. + * src/rcfile.c (parse_binding): K-keys no longer exist. + * src/global.c, src/rcfile.c, doc/nanorc.sample.in: Allow the + codes from the Ins and Del keys to be rebound. + * src/rcfile.c (parse_binding): Improve two error messages, and + complain about wrong menu names after wrong function names. + +2014-04-16 Benno Schulenberg + * src/winio.c (get_mouseinput): Properly find also the zeroeth + item from a certain menu in the list of functions. Until now + this accidentally worked, because "Get Help" was the very first + item in almost all menus. Partly fixes Savannah bug #42093. + * src/nano.h: MHELP should not be part of MALL, as ^B and ^F and + Enter and Backspace and so on don't make any sense there. + * src/nano.h, src/global.c (shortcut_init): Rename MALL to MMOST, + to be more accurate. + * src/nano.h, src/global.c, src/help.c, src/search.c: Rename + MREPLACE2 to MREPLACEWITH, for clarity. + * src/nano.h: Adjust some tabbing and spacing. + * src/global.c (shortcut_init): Make better use of MMOST. + +2014-04-15 Benno Schulenberg + * src/nano.c (precalc_multicolorinfo): Actually set the intended + non-blocking mode for keyboard input. + * src/winio.c: Relocate and correct a few comments. + * README.SVN: To build nano from svn, ssh is not required. + * src/*.c: Normalize whitespace around '==' comparison. + * configure.ac: Check for the availability of snprintf(), + fixes Savannah bug #42070 reported by David Lawrence Ramsey. + * src/global.c (shortcut_init), src/help.c (do_help): Add the + shortcuts M-\ and M-/ for First Line and Last Line to the help + viewer, instead of ^Y and ^V, which are already taken for Page + Up and Page Down. Also, stop them from aborting the viewer. + * src/help.c (do_help): Remove superfluous abortion variable. + * src/global.c (shortcut_init), src/help.c (do_help): Add the + shortcut ^L for Refresh to the help viewer and stop it aborting; + a changed version of patch #7013 from David Lawrence Ramsey. + +2014-04-14 Benno Schulenberg + * src/{proto.h,cut.c,nano.c,text.c}: Remove the unused parameter + 'file_bot' from copy_from_filestruct(), and rename the other. + * src/*: Remove the unused parameter 'func_key' from get_shortcut(), + and subsequently from parse_browser_input() and parse_help_input(). + * src/*: Adjust some whitespace and tweak a few comments. + * src/winio.c (getfuncfromkey): Elide variable and condense comment. + * src/text.c (break_line): Initialize a variable to avoid a compiler + warning, rename it to be more apt, add a comment, tweak some others, + and remove an unneeded 'if'. + * src/char.c (move_mbleft): Avoid a compiler warning (int → size_t), + rename the variable, and another, and straighten out the logic. + +2014-04-13 Benno Schulenberg + * proto.h, global.c, rcfile.c: Remove the unused parameter 'menu' + from strtosc(). + * global.c (shortcut_init): Remove mistaken browser item from the + Go-To-Line menu. + * global.c (shortcut_init): Delete a misplaced setting of 'currmenu'. + * global.c (shortcut_init, strtomenu): Cosmetic tweaks. + * doc/syntax/{changelog,c,po}.nanorc: Some small extra colourings. + * configure.ac, doc/texinfo/nano.texi: Make --enable-tiny disable + the use of libmagic, and document the --disable-libmagic flag. + * src/nano.c (version): Print the correct --enable/--disable option. + * configure.ac, src/*, doc/texinfo/nano.texi: Convert all occurrences + of #ifdef ENABLE_NANORC to #ifndef DISABLE_NANORC, and adapt for it. + * configure.ac: Complain about --enable-color without --enable-nanorc. + +2014-04-10 Benno Schulenberg + * doc/syntax/Makefile.am: Add four recent syntaxes to the packlist. + +2014-04-08 Benno Schulenberg + * doc: Add the documentation for the new --noread option. + * doc: Add missing --poslog option to the texinfo file, plus tweaks. + +2014-04-08 Hans Alves + * nano.h, files.c, nano.c: Adding the command-line option --noread + to treat any name on the command line as a new file. This allows + nano to write to named pipes -- it will start with a blank buffer, + and will write to the pipe when the user saves the file. This way + nano can be used as an editor in combination with for instance gpg + without having to write sensitive data to disk first. + +2014-04-08 David Lawrence Ramsey + * src/*.c: More editing of comment blocks and trimming of blank lines. + +2014-04-08 Benno Schulenberg + * src/rcfile.c: Correct two comments, and tweak two others. + * src/color.c (color_update): Correct one comment, tweak some others, + remove two superfluous ones, and remove an unneeded 'if'. + +2014-04-08 David Lawrence Ramsey + * src/nano.c (main): Convert the literal UTF-8 whitespace string into + its corresponding byte sequence, and add a comment for it. + * src/{files.c,global.c,help.c,winio.c}: Reformat some comment blocks, + fix a few typos, and remove a few unneeded blank lines. + +2014-04-08 Benno Schulenberg + * src/rcfile.c (parse_binding): Melt the binding and unbinding code, + which are very similar, into a single function. + * src/rcfile.c (parse_binding): Uppercase only the first two or three + characters of the key name, in order to preserve ^Space and M-Space, + so they can be unbound. Fixes Savannah bug #41940. + * doc/syntax/go.nanorc: Extend the syntax highlighting for Go lang, + from the submission by Robert Clausecker . + +2014-04-07 Benno Schulenberg + * src/{proto.h,global.c,text.c}: Keep a pointer to the Uncut item in + the functions list, to be able to change its description to Unjustify + at the appropriate moment. This avoids having to fully repopulate + the functions and shortcuts lists before and after every Justify. + Also, look for ^U only in the main menu, to which ^W M-J factually + returns and which shortcut_init() "sneakily" sets. + * src/{proto.h,files.c,global.c,nano.c,rcfile.c}: Drop the obsolete + argument of shortcut_init(), and remove two unneeded calls of it. + * src/global.c (shortcut_init): Allow M-J after an --enable-justify. + * src/rcfile.c (parse_rcfile): The user documentation only speaks + of options, not of flags. Make the error messages conform. + * src/rcfile.c (check_vitals_mapped): Improve layout of message. + +2014-04-06 Benno Schulenberg + * src/global.c (shortcut_init): Limit M-T (cut-till-end-of-file) to + the main menu, and M-J (full-justify) to the main and search menus. + * src/proto.h: There is no need for the helpline tags to be external, + they are only ever used in src/global.c. + * src/global.c: Do not set any helpline tags to empty strings; + compilation should fail if they are needed and not defined. + +2014-04-05 Benno Schulenberg + * src/nano.c (version): Print the correct configuration options. + * src/{chars.c,nano.c,text.c}: Cosmetic tweaks. + * doc/texinfo/nano.texi: Adjust for new disabling config options. + +2014-04-05 Mike Frysinger + * src/nano.c (do_input): Reload possibly freed function pointer. + +2014-04-04 Benno Schulenberg + * src/{files.c,nano.c}: Avoid two more compilation warnings. + * configure.ac: Allow --enable-extra and --enable-multibuffer + to override --enable-tiny. + * src/rcfile.c (check_vitals_mapped): Do not allow 'set quiet' + to suppress a fatal-error message, make sure the user sees it. + * src/color.c: Comment tweaks. + * src/{*.h,*.c}, configure.ac: Convert all occurrences of + #ifdef ENABLE_COLOR to #ifndef DISABLE_COLOR. + * src/nano.h: Comment tweaks. + * configure.ac: Move the enabling stuff to after the disablers. + * configure.ac: Add submissive colour disabling to --enable-tiny. + * configure.ac: Allow other enablers to override --enable-tiny too. + * src/{proto.h,search.c}: Fix compilation with --enable-browser. + * src/global.c (shortcut_init): Fix warnings with --enable-help. + * src/text.c (do_justify): Fix compilation with --enable-justify. + * src/nano.c (do_mouse): Fix warning with --enable-mouse. + * src/prompt.c (get_prompt_string): Fix compilation for the + combination of --enable-tiny with --enable-tabcomp. + * src/prompt.c (get_prompt_string): Normalize the indentation. + * src/text.c: Comment tweaks. + +2014-04-03 Benno Schulenberg + * configure.ac: Remove unused '*_support' variables. + * doc/syntax/po.nanorc: New file, syntax colouring for PO files. + * configure.ac: Stop --with-slang from duplicating --enable-tiny. + * configure.ac: Sort all the disabling options alphabetically. + * src/{proto.h,files.c,global.c,nano.c,rcfile.c}, configure.ac: + Convert #ifdef ENABLE_MULTIBUFFER to #ifndef DISABLE_MULTIBUFFER. + * src/{proto.h,files.c,,nano.c,winio.c}, configure.ac: + Convert #ifdef NANO_EXTRA to #ifndef DISABLE_EXTRA. + * src/{global.c,text.c}: Fix two compilation warnings for tiny. + +2014-04-02 Benno Schulenberg + * configure.ac, doc/Makefile.am: Try to build the info documentation + only when 'makeinfo' is available. Patch partly by Mike Frysinger. + * configure.ac: Upping the required version of Autoconf, to ensure the + ONCE macros are defined. Suggested by Kamil Dudka and Mike Frysinger. + +2014-04-02 Mike Frysinger + * doc/man/{,fr}/Makefile.am: Simplify the man rules still further. + * .gitignore: Add 'config.cache', created by './configure -C'. + * src/nano.c (die_save_file): Newer gcc warns about set-but-unused + variables, so add a dummy if() check to kill that off. + * src/search.c (search_init): Silence a compiler warning about a + variable possibly being used uninitialized. + +2014-03-31 Chris Allegretta + * doc/syntax/go.nanorc: New file, basic go syntax highlighting. + +2014-03-30 Benno Schulenberg + * doc/syntax/changelog.nanorc: New file, first attempt at colouring + Changelog files. + * ChangeLog: Consistently use a colon after names of changed files. + +2014-03-30 Mike Frysinger + * doc/Makefile.am, doc/man/Makefile.am, doc/man/fr/Makefile.am: + The build already provides a standard htmldir for installing html + files. Use that instead of creating our own. + * doc/man/Makefile.am, doc/man/fr/Makefile.am: Use dist_ prefixes + and += appending supported by automake to produce simpler files. + * doc/Makefile.am: Drop redundant localedir, as autoconf/automake + already creates this for us. + * src/rcfile.c, doc/nanorc.sample.in: Hard-listing all the wanted + syntax files is a PITA. Support globs in include paths, so people + can easily drop in new files and have it "just work". + +2014-03-27 Benno Schulenberg + * src/nano.c (main): Fix compilation with --disable-utf8. + * src/global.c (shortcut_init): Place a help string among + its kin, adjust some indentation, group function pairs more + tightly, bundle restricted stuff, and delete an unused item. + +2014-03-27 Mike Frysinger + * configure.ac: Make --disable-nanorc with --enable-color barf. + * configure.ac: Allow --disable-utf8 and --enable-utf8 to work. + +2014-03-26 Benno Schulenberg + * configure.ac: Word, tab, and comment tweaks. + * src/global.c: Some comment tweaks, and whitespace trimmings. + * src/global.c (print_sclist): Also print last shortcut in list. + * doc/texinfo/nano.texi: Explain how to select and paste with + the mouse when mouse support is enabled: by holding down Shift. + * nano.spec.in, doc/faq.html, doc/texinfo/nano.texi: Remove + vestiges of the obsolete '--enable-all' configure flag. + * src/rcfile.c: Fix compilation with --disable-color. + * src/rcfile.c: Allow (un)binding keys when colour is disabled. + * src/help.c: Fix compilation with --disable-browser. + * src/{proto.h,browser.c,help.c}: Remove a superfluous function. + +2014-03-26 Mike Frysinger + * configure.ac: Clean up most of the --with/--enable flags: + - use AS_HELP_STRING instead of writing the text ourselves; + - use the normal enable_xxx var AC_ARG_ENABLE creates for us; + - delete duplicate checks in a few places (due to previous cleanup); + - unwrap some macros/var assignments; + - delete trailing whitespace; + - delete old --enable-all flag; + - fix quoting on a lot of vars that come from the user; + - use AC_MSG_* helpers instead of raw `echo`. + +2014-03-24 Benno Schulenberg + * src/{nano,move,winio}.c: Fix a few compiler warnings. + * src/{global,rcfile,winio}.c: Print menu numbers for debugging + in hex, and tweak a few of those debugging messages. + * src/nano.c: Harmonize comments, and trim some blank lines. + +2014-03-24 Mike Frysinger + * doc/syntax/gentoo.nanorc: Match more files, add a trailing + whitespace check, and EAPI=5 updates. + * doc/syntax/javascript.nanorc: New file, based on C syntax. + * doc/syntax/{nanorc,python}.nanorc: Highlight trailing whitespace. + * configure.ac, m4/ax_check_compile_flag.m4: Start building with + warnings enabled, to help prevent issues from silently creeping in. + * configure.ac: Newer ncurses include pkg-config files which tell + us the right -I/-L paths we need, so default to that before trying + the legacy ways. + * configure.ac: Add a configure flag to disable the use of the + fattening libmagic. + +2014-03-23 Benno Schulenberg + * src/rcfile.c (parse_keybinding, parse_unbinding): Improve a + debugging message, fix a translator comment, and tweak others. + +2014-03-22 Benno Schulenberg + * THANKS: Add some missing translator names, and tweak others. + +2014-03-21 Benno Schulenberg + * src/chars.c (is_punct_mbchar, mbstrchr): Elide a variable, + thus making two ifs identical to six others. + * doc/syntax/nanorc.nanorc: Add the 'extendsyntax' directive, + and change two colours to be legible on a light background. + +2014-03-19 Benno Schulenberg + * doc/nanorc.sample.in: Document the changed whitespace defaults. + * src/global.c, doc/man/nanorc.5: Allow softwrap to be rebound. + * doc/nanorc.sample.in: Sort the includes alphabetically, and + add the ones for Lua, Magicpoint, and Spec files. + * doc/nanorc.sample.in: Add "poslog", plus tiny textual tweaks. + * src/global.c, doc/man/nanorc.5: Group softwrap with the toggles + that affect how things look -- it does not belong in the group of + general program functions, nor in the group of editing behaviour. + * doc/man/nanorc.5: Add the descriptions of six missing bindable + functions, and tweak those of a few others. + +2014-03-18 Benno Schulenberg + * src/global.c (shortcut_init): In the file browser one cannot + search for a regular expression, so do not mention it. + +2014-03-17 Benno Schulenberg + * src/global.c (shortcut_init): Show ^F and ^B instead of kright + and kleft in the help lines of the tiny version. + * src/global.c (shortcut_init): Remove some inconsistent spaces + and newlines, condense three statements into one, place an #endif + better, melt two #ifndefs into one, and add a comment. + * src/winio.c (edit_scroll): Remove the old softwrap scrolling code. + * src/{nano.h,proto.h,color.c,cut.c,files.c,global.c,help.c,nano.c, + search.c,text.c,utils.c}: Add, fix, and remove some #endif comments, + remove an obsolete comment, and remove some superfluous #ifndefs. + * src/global.c (shortcut_init): Put ^B and ^F in the same order as + all other command keys: first the backward then the forward motion. + * src/{nano.h,*.c}: Remove stray spaces before tabs. + +2014-03-16 Benno Schulenberg + * src/nano.h: Display more help items when the terminal is wider. + +2014-03-14 Benno Schulenberg + * src/nano.c (main): When in a UTF-8 locale, use prettier characters + (»·) for indicating whitespace, and for similarity use ">." instead of + ":." when not in a UTF-8 locale. Changes suggested by Mike Frysinger. + +2014-03-05 Benno Schulenberg + * src/move.c (do_down): Initialize the correct variable to zero. + Solves jumpy scrolling behaviour reported by Chris Allegretta. + +2014-03-04 Chris Allegretta + * global.c (first_sc_for): Return raw keystrokes last, so + they will not be displayed if there are F-keys or Meta keys + mapped for an item in the shortcut list. + +2014-03-04 Benno Schulenberg + * doc/syntax/nanorc.nanorc: Add keyword 'quiet', sort 'locking', + and concatenate the two separate strings into one. + * src/nano.c (main), doc/nanorc.sample.in: Make the M-P toggle + actually do something by default, by using visible characters. + * src/global.c (shortcut_init): Normalize the writing of three + help-line items: "Write Out", "Uncut Text", and "Unjustify", to + better stress the O and U -- the big C and J were distracting. + * doc/{syntax/nanorc.nanorc,man/nanorc.5,texinfo/nano.texi}: + Remove erroneous 'suspendenable' -- it is not a settable option + but a bindable function. + +2014-03-03 Chris Allegretta + * global.c (shortcut_init): Don't actually free the shortcut + list, since the next pass via justifying will then remove all + custom shortcuts. Fixes bug discovered by Benno Schulenberg. + * text.c (do_linter): Remove some unused variables to quiet + -pedantic -Wall. + +2014-03-03 Benno Schulenberg + * src/global.c (add_to_funcs): Add a newline, for clarity. + * src/global.c (shortcut_init): Mark, don't translate yet. + * src/move.c (do_down): Correctly compute the minimum amount + to scroll when softwrap is on and there are overlong lines. + * src/winio.c (edit_scroll): Disable amount computation here. + * src/move.c (do_down): Trim some redundant code, and correct + the scrolling behaviour when softwrap is off -- the construct + (amount ? amount : 1) wasn't doing what I intended. + * doc/man/nano{.1,rc.5}: Slightly improve formatting and wording. + * doc/{texinfo/nano.texi,man/nanorc.5}: Add some missing options + to the texinfo documentation, and improve alphabetization a bit. + * src/nano.c (usage): Don't mention --softwrap in tiny version. + +2014-03-01 Chris Allegretta + * global.c (shortcut_init): Fix an issue with the split + do_research() setup when using --enable-tiny. + * rcfile.c (parse_linter): Allow linter to be unset using "". + * rcfile.c: Allow syntaxes to be extended via "extendsyntax" + directive. Color, header, magic and linter should all be + able to be extended. Man page updates for nanorc(5). + * doc/nanorc.sample.in: Document 'set quiet'. + +2014-03-01 Mike Frysinger + * src/color.c (color_update): Do not write to stderr on magic + errors. If the magic db has errors such that magic_load() fails, + the current code dumps to stderr which messes up the terminal. + The error message is also vague to the point where it's confusing + -- I thought nano had problems writing to the file I was editing. + Instead, use statusbar() and clarify the messages. + (Patch tweaked by Benno.) + +2014-02-28 Benno Schulenberg + * src/text.c (execute_command): Equalize pipe error messages. + * src/global.c (thanks_for_all_the_fish): Remove a redundant + '#ifdef DEBUG', it is contained within a wider one. + * src/global.c (strtosc): Correct a misspelled keyword. + * src/rcfile.c (check_vitals_mapped): Actually translate a + helpful message, and reword it somewhat for clarity. + * src/global.c: Remove unused function 'free_shortcutage'. + * src/global.c (strtosc): Indent conditions consistently. + +2014-02-28 Eitan Adler + * src/nano.c (do_toggle): Constify a char pointer, to fix + a warning when compiling with clang (and -Wall). + +2014-02-27 Mike Frysinger + * doc/man/nanorc.5: Relocate the misplaced unbind section, + and improve formatting. (Patch tweaked by Benno.) + * doc/syntax/nanorc.nanorc: Add the bind/unbind commands, + so they will look supported when using syntax highlighting. + +2014-02-27 Benno Schulenberg + * src/help.c (parse_help_input): Make 'Space' again an alias + for PageDown and 'Minus' for PageUp -- they were mistakenly + swapped during code conversion in revision 4223. + +2014-02-26 Mike Frysinger + * doc/syntax/sh.nanorc: Highlight more shell builtins and + common commands, and rewrite the variable highlighting to be + more exact and handle cases where string operations are used. + * doc/syntax/gentoo.nanorc: Update to newer EAPIs, and fold + in updated shell changes too. Much of this is based on work + by Davide Pesavento . + * doc/syntax/makefile.nanorc: Highlight trailing whitespace. + +2014-02-26 Benno Schulenberg + * src/global.c (shortcut_init): Put PageUp and PageDown + and also WhereIs and WhereIsNext together in the help lines + of the file browser, and WriteOut and Readfile in the help + lines of the main window -- related stuff in one column. + * doc/syntax/man.nanorc: Better colouring of manpage files. + +2014-02-26 Konstantin Abakumov (tiny change) + * doc/syntax/python.nanorc: Slightly improve the regexes for + multiline strings in Python, reducing spillage. + +2014-02-26 Benno Schulenberg + * src/move.c (do_down), src/winio.c (edit_scroll): Scroll an + extra amount when softwrap is on and the current line would + otherwise run off the screen, and recalculate maxrows after + each scroll. Solves bug #27550 reported by Hannes Schueller. + +2014-02-25 Benno Schulenberg + * NEWS: Fix some typos and wordings, and rewrap a few lines. + * src/global.c: Correcting some translator comments, removal + of a few superfluous blank lines, and some pedantic comment + tweaks (mainly adding missing periods and stars). + * src/global.c: Ordering "Prev Word" and "Next Word" better. + * src/global.c: Make ^G not only call help but also exit from + it, and make ^C also exit from help and from the file browser. + Also remove two redundant shortcut definitions. + +2014-02-25 Mike Frysinger + * src/Makefile.am: Rename 'INCLUDES' to 'AM_CPPFLAGS', since + Automake changed the naming of these a while ago, and at least + version 1.13 now starts warning about it. + * .gitignore: Ignore generated files (and bak files). + +2014-02-25 Benno Schulenberg + * src/files.c (write_lockfile, do_lockfile): Fix a typo reported + by Jean-Philippe Guérard and inconsistent spelling of "lock file" + reported by myself on nano-devel in March 2013. + +2014-02-25 Benno Schulenberg + * src/help.c (do_help_void): Call the help browser with the correct + refresher for afterwards. This solves a bug reported by myself on + nano-devel in August 2010: after typing ^R ^T ^W ^G ^X, the file + being edited would get displayed instead of the list of files. + +2014-02-24 Chris Allegretta + * New linter functionality, rcfile option "linter". + * src/global.c (shortcut_init): Actually free the sclist + if it was allocated before. + * src/winio.c (do_credits): Add Benno, my children, + update copyright info. + +2014-02-23 Benno Schulenberg + * doc/syntax/*.nanorc: Comment and punctuation tweaks. + * doc/syntax/sh.nanorc: Colour $VAR within a "" string + but not within a '' string, and do not colour strings + within comments. Fixes bug #29943. + +2014-02-23 Benno Schulenberg + * src/text.c (do_undo, do_redo, add_undo): Make warning + sentences in the status bar consistently end in a period. + +2014-02-22 Benno Schulenberg + * src/files.c (write_file): Add a missing malloc. + Reported by an anonymous cross compiler, bug #30671. + +2014-02-22 Benno Schulenberg + * src/winio.c (get_mouseinput): Correct an oversight, + use the proper 'do_up_void' and 'do_down_void' names. + Reported by Zhou Z.J. , bug #38268. + +2014-02-22 Lauri Kasanen (tiny change) + * doc/syntax/html.nanorc: Also recognize htm as extension, + use cyan for tags (more visible on dark background), correct + the expression for ampersand codes, and colour strings too. + +2014-02-22 Dennis Jenkins (tiny change) + * doc/syntax/c.nanorc: Also recognize c++ as extension. + +2014-02-22 Benno Schulenberg + * src/nano.c (move_to_filestruct): Update the data in 'mark_begin' + when mark and cursor are on the same line. This avoids a segfault + after M-A, right, M-T, left, ^K, or a hang when the left is left out. + +2014-02-22 Benno Schulenberg + * src/nano.c (main): Add two conditions on ENABLE_NANORC. + * src/files.c (close_buffer, do_insertfile): Likewise. + This avoids compilation failure when nano is configured + with both --disable-color and --disable-nanorc. + +2014-02-22 Felipe Bugno (tiny change) + * doc/nanorc.sample.in: Add an include for CMake files. + +2014-02-22 David Lawrence Ramsey + * src/nano.c (allow_pending_sigwinch): A (char *) cast for pedantic purposes. + * src/cut.c (do_cut_text): Wrap a reference to 'copy_text' in NANO_TINY. + +2014-02-22 David Lawrence Ramsey + * ChangeLog, NEWS, doc/faq.html: Fix typos, wording, and spacing. + +2014-01-25 Chris Allegretta + * src/winio.c (set_modified): Check for a filename before trying to lock. + +2014-01-24 Benno Schulenberg + * src/nano.c (copy_from_filestruct): Check explicitly for mark being set when + trying to partition, as we shouldn't be messing with the x address, etc. + +2014-01-01 Chris Allegretta + * doc/texinfo/nano.texi: Change '@sp4' since makeinfo 5.1 hates the + lack of spacing. Fixes bug #40103 reported by flapane@Savannah. + Also change SVN status to non-binary so diffs work. + +2014-01-01 Chris Allegretta + * src/global.c (strtokeytype): Check for lower-case 'f' for defining F-key + sequences for consistency (previously was two checks for upper case 'F'). + Fixes bug #40815 reported by David Binderman . + +2013-06-13 Matthew Fischer + * doc/syntax/c.nanorc: Add the 'auto' keyword. + +2013-06-13 David Lawrence Ramsey + * src/global.c (first_sc_for): Try to more consistently display keystrokes, + useful when the user has re-binded a bunch of them. + +2013-06-13 Kamil Dudka + * doc/man/nano.1: Actually document the -P (--poslog) option. + +2013-04-12 Chris Allegretta + * src/files.c (do_insertfile): Check for saved cursor position when inserting a + file as well. Fixes Savannah bug #38600 reported by Craig Barnes. + * src/files.c (write_file): Don't re-stat() the file if we're writing out + a marked portion (especially because it would give the wrong stat info). + Part two of issue reported by Benno Schulenberg. + +2013-04-07 Michael Berg + * do_cut_text: Fix copying (not cutting) text setting Modified state. + Partly fixes an issue reported by Benno Schulenberg. + +GNU nano 2.3.2 - 2013.03.23 +2013-03-17 Chris Allegretta + * Revert r4547 as we should have a new release and the overlap code is not yet + ready for public consumption. + +2013-01-20 Chris Allegretta + * src/text.c (do_histify): Don't allow sigwinch to be received while justifying + as that puts us into a wacky state. Fixes crash on justify by Joshua Rogers. + * configure.ac: Added --with-wordbounds option to let cross compilers force + whether their target system support GNU-style word boundaries or not. + Originally reported by dave festing. + * doc/man/nanorc.5: Fix typo in softwrap description, reported by + cbart387@Savannah. + +2013-01-19 Chris Allegretta + * configure.ac: Make ncurses checking to set $LIBS and check the ncursesw lib + actually works before defaulting to it over ncurses! Shock! + +2013-01-13 Chris Allegretta + * src/utils.c (parse_num): Initialize errno before calling strtol(). Fixes issue + where trying to go to a line number too long will break legitimate goto-lines + for the remainder of the editing session, reported by Joshua Rogers. + +2013-01-09 Mike Frysinger + * configure.ac: Check for ncursesw5-config and base $CPPFLAGS on it. + +2013-01-09 Fabian Groffen + * configure.ac, src/nano.h: Make the search for ncursesw more generalized. + +2013-01-02 David Benjamin + * src/search.c (parse_syntax): Fix blatantly and dangerously incorrect code + for deleting old syntaxes. + +2013-01-02 Mike Frysinger + * src/files.c (cwd_tab_completion): Remove unnecessary variables. + * src/search.c (search_init): Fix gcc complaints on certain versions. + +2013-01-02 Eitan Adler + * configure.ac: Remove unnecessary checks. + * src/nano.h, NEWS: Fix redundant wording. + +2012-12-31 Chris Allegretta + * src/*: Introduce (basic) vim-style file locks. Does not allow vim to recover + our changes, and just lets a vim user know we're editing a file. Command-line + option "-G" or "--locking", nanorc option "locking". New functions in + src/files.c: do_lockfile(), write_lockfile(), and delete_lockfile(). + +2012-02-05 Chris Allegretta + * src/*: Fix overlapping strings highlighting each other. New variables in edit_draw + (slmatcharray, pbegin, paintok), new logic (with repeated setting of values in the + array but it's BFI after all). FIXME: Need to create a new 'overlap'. + * src/*: Fix a silly issue with the argument to nregcomp, as it's confusing to the caller. + * src/nano.h: Change the color types to a compiler macro (COLORWIDTH), may not actually + even be worth doing, but someday who knows how wide a color curses implementation might + be, and maybe we'll even start checking for it in autoconf! + +GNU nano 2.3.1 - 2011.05.10 +2011-05-10 Chris Allegretta + * text.c (do_enter): Only increment totsize by the auto-indented amount, since the previous + line's size was already counted. Fixes bug reported by Robert Spanjaard. + +2011-05-08 Chris Allegretta + * doc/syntax/Makefile.am: Finally get around to sorting the syntax file list. + +2011-05-08 Matthew Wild + * doc/syntax/spec.nanorc: New lua syntax highlighting config. + +2011-03-28 Asterios Dramis + * doc/syntax/spec.nanorc: New RPM spec file highlighting config. + +2011-03-12 Chris Allegretta + * po/*: Sync latest translation fixes, add an update_linguas.sh script. Rename + existing update.pl to update_sources.pl to make it more specific. + +2011-03-04 Chris Allegretta + * color.c (color_update): Add check for whether the file even exists + before we try to run the magic check on it. Fixes error messages to stderr + when reading in files that don't exist, reported by Mike Frysinger. + +2011-03-03 Chris Allegretta + * color.c (color_update): Remove unneeded debugging message from libmagic commit. + Fixed extra messages going to stderr, reported by Mike Frysinger. + +GNU nano 2.3.0 - 2011.02.26 +2011-02-26 Chris Allegretta + * Change RAW in function_type enum to RAWINPUT, to fix compilation on AIX, + reported by Richard G Daniel . + +2011-02-23 Chris Allegretta + * Fix some more severe warnings from 'g++ -pedantic', from patch originally + by Eitan Adler . + +2011-02-23 Kamil Dudka + * doc/man/nanorc.5: Fix small typo. + +2011-02-22 Chris Allegretta + * color.c (nfreeregex): Fix that we were trying to set the pointer passed by value + to NULL. Fixes crashes on file save reported by Ken Tyler and Matthieu Lejeune. + +2011-02-18 Chris Allegretta + * New saved cursor position history option. Command line option -P or --poslog, rc file + entry "poslog". Search history changes to ~/.nano/search_history, cursor position log + is ~/.nano/filepos_history. Added checks to move the legacy .nano_history file to the + new location. Several new functions to files.c: load_poshistory(), save_poshistory(), + check_poshistory(), update_poshistory(), and reworking of histfilename(). New FAQ entry + 4.15 discussing the change and offering an interoperability workaround. + * files.c (load_history): Set last_search to the last search value we loaded from history, + so do_research will succeed without needing to manually load the last search in. Fixes + bug reported by Matthieu Lejeune. + +2011-02-12 Chris Allegretta + * Initial libmagic implementation, adapted from Eitan Adler . + New nanorc entry "magic" to enable this functionality, nanorc file and man page updates. + +2011-02-06 Chris Allegretta + * src/*: Retire iso_me_harder_funcmap based on suggestion by + This does add 20KB to nano's executable size but it gets rid of a lot of indirection + that makes people stomach turn. There are several new stub functions and need of more + tidying as a result of this. + * files.c (write_file): Fix problems with writing the backup file (albeit interactively) + with new function prompt_failed_backupwrite(), allows more secure handling of problems + with failing to write the backup file compared to 'allow_insecure_backup'. + * winio.c (edit_redraw): Removed unused variable. + +GNU nano 2.2.6 - 2010.11.22 2010-11-15 Chris Allegretta * Add a section to the FAQ about using nanorc on Win32 systems. 2010-11-12 Chris Allegretta - * Add check for RESTRICTED mode back to speller, suspend and insert file - routines, since adding key bindings broke the fact that they should be - disabled in restricted mode. Fixes Savannah bug 31625 reported by - Charlie Somerville. - -2010-08-10 - nano 2.2 branch cut here + * Add check for RESTRICTED mode back to speller, suspend and insert file routines, + since adding key bindings broke the fact that they should be disabled in restricted\ + mode. Fixes Savannah bug #31625 reported by Charlie Somerville. GNU nano 2.2.5 - 2010.08.05 2010-08-04 Lauri Kasanen - * doc/syntax/mgp.nanorc: New Magicpoint syntax highlighting definition + * doc/syntax/mgp.nanorc: New Magicpoint syntax highlighting definition. 2010-08-04 Peter * doc/syntax/tex.nanorc: No longer highlight escaped comments @@ -19,82 +1573,81 @@ GNU nano 2.2.5 - 2010.08.05 2010-06-20 Chris Allegretta * New rc file option allow_insecure_backup, allows the previous security fixes for backup files to be overridden if you're really positive - you want to. Fixes Savannah bug 29732 by Brian Szymanski . + you want to. Fixes Savannah bug #29732 by Brian Szymanski . 2010-05-23 Chris Allegretta * files.c (write_file): Don't even try to chown() the backup file unless we're root, since it's probably going to fail if we're editing a file we don't own. Fixes Savannah bug - 29514: [nano 2.2.2] backup should ignore chown errors. + #29514: [nano 2.2.2] backup should ignore chown errors. GNU nano 2.2.4 - 2010.04.15 2010-04-07 Chris Allegretta * doc/man/nano.1,nanorc.5: Remove the backup file warnings now - that a sufficient security fix exists for the backup file code. + that a sufficient security fix exists for the backup file code. 2010-04-14 Chris Allegretta - * text.c (do_alt_speller): Skip invoking the alt speller if the file size - is 0 bytes. Fixes Savannah bug 29393 reported by Mike Frysinger. - * files.c (wirte_file): Don't set current_stat when tmp == TRUE, check + * text.c (do_alt_speller): Skip invoking the alt speller if the file size + is 0 bytes. Fixes Savannah bug #29393 reported by Mike Frysinger. + * files.c (write_file): Don't set current_stat when tmp == TRUE, check whether current_stat is set when trying to use it, and don't do the modification check if the filename changed, since we have no way - of knowing about it in that case. Fixes Savannah bug 29392, reported + of knowing about it in that case. Fixes Savannah bug #29392, reported by Mike Frysinger. [CVE-2010-1160] 2010-04-13 Felipe Bugno * doc/syntax/cmake.nanorc: Added cmake syntax highlighting file. 2010-04-09 Chris Allegretta - * files.c (do_writeout): Better security fixes for backup file writing, - mangled from submission by Dan Rosenberg - [CVE-2010-1161] + * files.c (do_writeout): Better security fixes for backup file writing, + mangled from submission by Dan Rosenberg . + [CVE-2010-1161] 2010-04-08 Chris Allegretta - * files.c (do_writeout): Previous fixes should not cause a crash + * files.c (do_writeout): Previous fixes should not cause a crash when saving a new file. Discovered by Mike Frysinger . 2010-04-07 Chris Allegretta * doc/man/nano.1,nanorc.5: Add warnings about using backup mode as root due to the Dan Rosenberg security analysis. - + 2010-04-02 Chris Allegretta * files.c (do_writeout): Expand modification check to include both the - original file's device ID and inode number as reasons to warn the - user that the file has been modified. Also abort on writing a backup - file when its owner doesn't match the edited file. Based on security - analysis on nano by Dan Rosenberg. [CVE-2010-1160] - + original file's device ID and inode number as reasons to warn the + user that the file has been modified. Also abort on writing a backup + file when its owner doesn't match the edited file. Based on security + analysis on nano by Dan Rosenberg. [CVE-2010-1160] 2010-03-21 Chris Allegretta * nano.c (page_stdin et al): Don't attempt to reset/reopen the terminal - settings when reading stdin if it was aborted with SIGINT. May fix Savannah - bug 29114 reported by Mike Frysinger. + settings when reading stdin if it was aborted with SIGINT. May fix + Savannah bug #29114 reported by Mike Frysinger. 2010-03-21 Mike Frysinger - * doc/syntax/c.nanorc: Add additional support for #include_next and #pragma + * doc/syntax/c.nanorc: Add additional support for #include_next and #pragma. 2010-03-21 Chris Allegretta - * move.c (do_page_up, do_page_down()): Explicitly set current_y to 0 when paging - up when not in smooth scroll mode, as previous fixes would otherwise cause - the cursor to not really be moved to the stop of the screen. + * move.c (do_page_up, do_page_down()): Explicitly set current_y to 0 when + paging up when not in smooth scroll mode, as previous fixes would otherwise + cause the cursor to not really be moved to the top of the screen. 2010-03-07 Chris Allegretta * configure.ac, nano.c (handle_sigwinch): Create check for whether LINES and - COLS can safely be redefined. Fixes compilation issues with cygwin, and likely - with newer versions of ncurses, fixes Savannah bug 28984 repoted by Andy Koppe - and Eric Oliver via mailing list. - * winio.c (get_mouseinput) - fix stray semicolon in code, also reported in - bug 28984. + COLS can safely be redefined. Fixes compilation issues with Cygwin, and likely + with newer versions of ncurses. Fixes Savannah bug #28984 reported by Andy Koppe + and by Eric Oliver via mailing list. + * winio.c (get_mouseinput): Fix stray semicolon in code, also reported in + bug #28984. GNU nano 2.2.3 - 2010.02.11 2010-01-28 Chris Allegretta - * move.c (do_page_up, do_page_down): Fix for smooth mode not preserving cusor - position. Part one of fix for Savannah bug 21178 by Mike Frysinger. + * move.c (do_page_up, do_page_down): Fix for smooth mode not preserving cursor + position. Part one of fix for Savannah bug #21178 by Mike Frysinger. GNU nano 2.2.2 - 2010.01.17 2010-01-17 Chris Allegretta - * nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped - function due to key rebinding, fixes crashes on FreeBSD repoted by Eitan + * nano.c (main), prompt.c (do_statusbar_input): Handle problems with an unmapped + function due to key rebinding, fixes crashes on FreeBSD reported by Eitan Adler . 2010-01-14 Chris Allegretta @@ -104,9 +1657,9 @@ GNU nano 2.2.2 - 2010.01.17 2010-01-12 Chris Allegretta * move.c (do_page_up, do_page_down): Fix issues with not enough scrolling down/up and cursor centering. - * winio.c (edit_scroll): Remove lots of needless checking of line length for + * winio.c (edit_scroll): Remove lots of needless checking of line length for soft wrapping code. - * winio.c (edit_update) - Remove extra code for when updating with old_current outside + * winio.c (edit_update): Remove extra code for when updating with old_current outside of the new buffer boundary and centering issues. 2010-01-05 Tito @@ -129,94 +1682,93 @@ GNU nano 2.2.2 - 2010.01.17 2009-12-20 Chris Allegretta * files.c (is_file_writable): remove assert check for f, since it's not - initialized at the time. Fixes Savannah bug 28309, reported by Zoltan Kovacs. + initialized at the time. Fixes Savannah bug #28309, reported by Zoltan Kovacs. 2009-12-20 Brian Szymanski - * src/files.c (write_file): Check stat struct exists, and if not use just obtained stat data. - Fixes Ubuntu bug 471568, "reproducible crash in nano on trying to save to a file - different than the one specified on the command line". + * src/files.c (write_file): Check whether stat struct exists, and if not, use the + just obtained stat data. Fixes Ubuntu bug 471568, "reproducible crash in nano on + trying to save to a file different than the one specified on the command line". 2009-12-15 Chris Allegretta - * doc/nanorc.sample.in - Remove erroneous 'set suspendenable' as it's actually a + * doc/nanorc.sample.in: Remove erroneous 'set suspendenable' as it's actually a key binding (e.g. 'bind M-Z suspendenable all') and not a settable flag. Fixes - Savannah bug 28299 reported by Mike Frysinger. + Savannah bug #28299 reported by Mike Frysinger. GNU nano 2.2.1 - 2009.12.12 2009-12-12 Chris Allegretta - * text.c (do_delete), nano.c (do_output): Add check for length of current line + * text.c (do_delete), nano.c (do_output): Add check for length of current line before and after adding/deleting text, and do full refresh if it is now a different multiple of COLS. Also get rid of superfluous do_refresh vars now that we have edit_refresh_needed. 2009-12-09 David Lawrence Ramsey - * global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to + * global.c (shortcut_init), browser.c (do_browser): Fix M-W not being bound to research in either main menu or browser. 2009-12-09 Chris Allegretta - * files.c (read_file) - Add parameter for whether we should even try to check - file writability, as the message is useless when we're inserting into an - existing buffer. Fixes Savannah bug 28219. + * files.c (read_file): Add parameter for whether we should even try to check + file writability, as the message is useless when we're inserting into an + existing buffer. Fixes Savannah bug #28219. 2009-12-07 David Lawrence Ramsey * global.c (shortcut_init): Many fixes for keybindings code oversights, including - restore page up/down and GotoDir to browser, - * browser.c (do_browser): Fix breaking out of a submenu (e.g. gotodir) breaks out - of browser altogether. + restore page up/down and GotoDir in browser. + * browser.c (do_browser): Fix breaking out of a submenu (e.g. gotodir), it broke + out of the browser altogether. * doc/nanorc.sample.in: Add missing entries for fortran/ObjC/OCaml entries. 2009-12-03 David Lawrence Ramsey - * global.c (shortcut_init) - Remove help shortcut from help shortcut list :-) Tweaked + * global.c (shortcut_init): Remove help shortcut from help shortcut list. :-) Tweaked to reorder exit shortcut to end of list to not mess up prev/next shortcut symmetry. 2009-12-03 Eitan Adler - * doc/syntax/makefile.nanorc - Fix poor regex for all alpha characters which sometimes leads to - error messages, reported by gibboris@gmail.com. + * doc/syntax/makefile.nanorc: Fix poor regex for all alpha characters which sometimes + leads to error messages, reported by gibboris@gmail.com. 2009-12-02 Chris Allegretta - * text.c (add_undo, do_undo, do_redo) - Do not execute cases for SPLIT when DISABLE_WRAPPING - is defined. Fixes Savannah bug 28151 (anon). + * text.c (add_undo, do_undo, do_redo): Do not execute cases for SPLIT when + DISABLE_WRAPPING is defined. Fixes Savannah bug #28151 (anon). 2009-12-02 Jordi Mallach * doc/man/nano.1: Fix escaping of hyphens for the -$ option. 2009-12-01 Kamil Dudka - * chars.c, file.c - Better handle unused results for things like mbtowc(), new + * chars.c, file.c: Better handle unused results for things like mbtowc(), new macro IGNORE_CALL_RESULT. 2009-12-01 Chris Allegretta - * global.c (shortcut_init) - Remove redundant entries for ^Y/^V reported by + * global.c (shortcut_init): Remove redundant entries for ^Y/^V reported by Christian Weisgerber. - * doc/man/nanorc.5 - Fix typo in Meta documentation, reported by gibboris@gmail.com. + * doc/man/nanorc.5: Fix typo in Meta documentation, reported by . 2009-12-01 David Lawrence Ramsey - * global.c (shortcut_init) - Add support for ^P and ^N in the help menu. + * global.c (shortcut_init): Add support for ^P and ^N in the help menu. * Update documentation for 2.2 features including sample nanorc file, texinfo - file, man pages, UPGRADE file, and update copyright noticed for the current year. + file, man pages, UPGRADE file, and update copyright notice for the current year. GNU nano 2.2.0 - 2009.11.30 2009-11-29 Chris Allegretta - * prompt.c (get_prompt_string) - Universally handle help key when is -disabled. Fixes Savannah - bug 28117 by David Lawrence Ramsey . + * prompt.c (get_prompt_string): Universally handle help key when it is disabled. + Fixes Savannah bug #28117 by David Lawrence Ramsey . * chars.c, files.c: Add junk vars to silence the compiler. Sigh. 2009-11-29 David Lawrence Ramsey * Change several *chars to const char, additional cleanups and casts to make compilers happier. * global.c: Fix replace and insert file initializations for proper compilation options. - * nano.c (do_suspend): Update comments to reflect actual code path, bad Chris and thanks for - noticing Jordi. - * configure.ac: Fix typos + * nano.c (do_suspend): Update comments to reflect actual code path, bad Chris, and thanks for + noticing, Jordi. + * configure.ac: Fix typos. 2009-11-27 Chris Allegretta * nano.c (do_suspend): Don't clear the screen but do move the cursor down to the last line first in an effort to not corrupt the screen, which contradicts Pico but is consistent - with almost all other text editors. Fixes Savannah bug 28110/Debian bug 460510 + with almost all other text editors. Fixes Savannah bug #28110 / Debian bug 460510 reported by Tim Connors . - * doc/dyntax/makefile.nanorc - Sample Makefile highlighting based on wiki.linuxhelp.net version. + * doc/syntax/makefile.nanorc: Sample Makefile highlighting based on wiki.linuxhelp.net version. 2009-11-26 Chris Allegretta * winio.c (edit_scroll): Adjust for long lines when scrolling. - * rcfile.c (parse_rcfile), initialize size argument to getline(), fixes crash on FreeBSD + * rcfile.c (parse_rcfile): initialize size argument to getline(), fixes crash on FreeBSD reported by Eitan Adler . 2009-11-26 Jordi Mallach @@ -229,91 +1781,90 @@ disabled. Fixes Savannah 2009-11-22 Chris Allegretta * nano.c (main): Allow edit_refresh_needed to take effect when using --enable-tiny - (fixes Savannah bug 28076 reported by David Lawrence Ramsey). + (fixes Savannah bug #28076 reported by David Lawrence Ramsey). 2009-11-22 David Lawrence Ramsey - * nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters) - * Fix compilation with --enable-tiny + * nano.c (move_to_filestruct): Fix bug 71 (cut at top of line recenters). + * Fix compilation with --enable-tiny. 2009-11-22 Mike Frysinger * doc/syntax/gentoo.nanorc: Tweak comment highlighting. GNU nano 2.1.99pre2 - 2009.11.21 2009-11-21 Chris Allegretta - * rcfile.c: Add unbinding keyword, fixes Savannah bug 22852 reported by frankd. + * rcfile.c: Add unbinding keyword, fixes Savannah bug #22852 reported by frankd. * prompt.c (update_statusbar_line): Set statusbar_pww when updating the line. - Fixes Savannah bug 24957 by Mike Frysinger. + Fixes Savannah bug #24957 reported by Mike Frysinger. 2009-11-19 Chris Allegretta - * nano.c (die_save_file) Try nd match the permissions of the file we were - editing but only make a minimal effort to do so. Fixes Savannah bug 27273 + * nano.c (die_save_file) Try and match the permissions of the file we were + editing but only make a minimal effort to do so. Fixes Savannah bug #27273 reported by Mike Frysinger. 2009-11-18 Adrian Bunk - * nano.c (main): Allow --fill and --nowrap to override nanorc entries and each other - on the command line. + * nano.c (main): Allow --fill and --nowrap to override nanorc entries + and each other on the command line. 2009-11-15 Chris Allegretta * winio.c (edit_refresh): Always computer maxsize regardless of whether smooth scrolling - is enabled. Fixes Savannah bug 28024 by Mike Frysinger. + is enabled. Fixes Savannah bug #28024 by Mike Frysinger. GNU nano 2.1.99pre1 - 2009.11.15 2009-11-14 Chris Allegretta - * move.c (do_first_line, do_last_line): Just set edit_refresh_needed rather than - get messy. - * files.c (do_writeout) - Only mention file modification if we're writing the same - file we originally opened. + * move.c (do_first_line, do_last_line): Just set edit_refresh_needed + rather than get messy. + * files.c (do_writeout): Only mention file modification if we're + writing the same file we originally opened. 2009-11-13 Chris Allegretta - * winio.c: Add new static maxsize to be able to easier calculation with - softwrap. - * nano.c (do_mouse): Fix mouse support not working with soft wrapping. Fixes - Savannah bug 27549 reported by Hannes Schueller. + * winio.c: Add new static maxsize for easier calculation with softwrap. + * nano.c (do_mouse): Fix mouse support not working with soft wrapping. + Fixes Savannah bug #27549 reported by Hannes Schueller. 2009-11-11 Chris Allegretta - * winio.c: Large tweaking of cursor and text display based on COLS not COLS - 1, + * winio.c: Large tweaking of cursor and text display based on COLS not COLS - 1, due to finally understanding that display_string wasn't being called properly - when softwrap was enabled. Fixes Savnnah bug 27603, Return key doesn't scroll - viewport reported by Hannes Schueller. - * - Fix size_t formatting issues with -pedantic + when softwrap was enabled. Fixes Savannah bug #27603, "Return key doesn't scroll + viewport" reported by Hannes Schueller. + * Fix size_t formatting issues with -pedantic 2009-11-09 Chris Allegretta - * files.c (read_file): - Remove debugging messages from file load. Fixes - Savannah bug 27838. + * files.c (read_file): Remove debugging messages from file load. + Fixes Savannah bug #27838. 2009-11-07 Chris Allegretta - * nano.h - Add bogus value at begin of flags enumeration because it - causes casesens rcfile option to misbehave, reported by Helmut - Jarausch + * nano.h: Add bogus value at begin of flags enumeration because it + caused the casesens rcfile option to misbehave, reported by Helmut + Jarausch . 2009-11-03 Chris Allegretta - * nano.h - Fix comma at end of enumerator list which angers -pedantic. - * rcfile.c - Add in specific check for UNDOABLE and fix declaration as + * nano.h: Fix comma at end of enumerator list which angers -pedantic. + * rcfile.c: Add in specific check for UNDOABLE and fix declaration as to what flag it toggles. Fixes undo mode being able to be called from - the rc file, reported by Helmut Jarausch + the rc file, reported by Helmut Jarausch . 2009-11-03 Mike Frysinger - * files.c - Move up is_file_writable() to stop implicit definition complaints. + * files.c: Move up is_file_writable() to stop implicit definition complaints. 2009-10-27 Chris Allegretta - * browser.c (browser_init): Set column width to something sane when + * browser.c (browser_init): Set column width to something sane when initializing in a directory with no file entries. Fixes Savannah - bug 24163 found (and initial patch) by Paul Wise. + bug #24163 found (and initial patch) by Paul Wise. 2009-09-15 Chris Allegretta * winio.c: Clean up some unused variables from the soft wrapping code. GNU nano 2.1.11 - 2009.09.14 2009-09-12 Chris Allegretta - * winio.c (edit_update) - properly update edittop when using soft wrapping. - Fixes lack of centering for searching for off-screen answers, found by - Hannes . + * winio.c (edit_update): properly update edittop when using soft wrapping. + Fixes lack of centering for searching for off-screen answers, found by + Hannes Schueller . 2009-09-03 Chris Allegretta * global.c (shortcut_init): Fix up/down keys not responding in the file browser, - discovered by Hannes . - * move.c (do_up) - Fix another scrolling issue with softwrap when the - cursor is beyond COLS, discovered by Hannes . + discovered by Hannes Schueller . + * move.c (do_up): Fix another scrolling issue with softwrap when the cursor + is beyond COLS, discovered by Hannes Schueller . 2009-09-02 Chris Allegretta * Attempt to check file writability and emit a warning on the status bar @@ -322,49 +1873,49 @@ GNU nano 2.1.11 - 2009.09.14 2009-08-29 Chris Allegretta * Fix more soft wrapping issues, particularly with scrolling, - discovered by Hannes . + discovered by Hannes Schueller . 2009-08-19 Chris Allegretta * Fix issue with soft wrapping not displaying the last character of each line, - fixed bug discovered by Hannes . + fixed bug discovered by Hannes Schueller . 2009-08-17 Mike Frysinger * doc/syntax/(gentoo|sh|tcl).nanorc: Fix problems with empty regexes on POSIX. - Fixes Savannah bug 27175. + Fixes Savannah bug #27175. 2009-08-17 Chris Allegretta - * Initial soft line wrapping implementation. Command line flags - -$ or --softwrap. + * Initial soft line wrapping implementation. Command-line flags -$ or --softwrap. * nano.c, text.c: Clean up some fprintf warnings in debug mode due to printing a size_t without using the zd specifier. + 2009-08-13 Chris Allegretta * New global flag implementation courtesy of Adam Wysocki , allows - previous undo flag to be implemented consistent with other flags. + previous undo flag to be implemented consistent with other flags. GNU nano 2.1.10 - 2009.07.28 2009-07-27 Chris Allegretta - * text.c (undo_cut, redo_cut): Don't actually try and undo/redo an empty cut, i.e. the magicline. + * text.c (undo_cut, redo_cut): Don't actually try and undo/redo an empty cut, i.e. the magicline. Fixes crash on cutting last line discovered by Eitan Adler . 2009-07-11 Chris Allegretta - * nano-regress: Small tweaks - * Change undo code to off unless unabled via a command line option (-u/--undo). Until this code - stabilizes this is the only responsible way to treat it. + * nano-regress: Small tweaks. + * Change undo code to off unless enabled via a command line option (-u/--undo). + Until this code stabilizes this is the only responsible way to treat it. 2009-03-08 Chris Allegretta - * TODO - Break out some targets for various features into 2.2 + * TODO: Break out some targets for various features into 2.2 and 2.4 series for things which are feasible. 2009-02-28 Chris Allegretta * configure.ac: Add check for whether _XOPEN_SOURCE_EXTENDED is needed for - curses to work w/color. Fixes compilation on HP-UX with older GCC, + curses to work w/color. Fixes compilation on HP-UX with older GCC, reported by jay.krell@cornell.edu. 2009-02-23 Eitan Adler - * doc/man/Makefile.am: Fix make variable substitution to be more portable + * doc/man/Makefile.am: Fix make variable substitution to be more portable. 2009-02-23 Chris Allegretta - * rcfile.c (parse_keybinding) - Define a var before tryung to use it. Whoops! + * rcfile.c (parse_keybinding): Define a var before tryung to use it. Whoops! * fix some redefinitions causing compiler warnings, from Eitan Adler. Other (hopefully) fixes for uncasted malloc()s, reported by the same. * doc/man/fr/Makefile.am: Add groff check fix to fr files. @@ -373,19 +1924,19 @@ GNU nano 2.1.9 - 2009.02.16 2009-02-16 Chris Allegretta * Add new argument to reset_multis for force redraws without attempting to guess whether we need to, for functions that we don't have good info about - the text state. New utility function color.c:reset_multis_for_id(). + the text state. New utility function color.c:reset_multis_for_id(). 2009-02-15 Chris Allegretta - * configure.ac, doc/man/Makefile.am - Add check for HTML output support in GNU + * configure.ac, doc/man/Makefile.am: Add check for HTML output support in GNU groff. Fixes Savannah bug #24461: build traps on groff. Also, add installation of html-ized man pages to $datadir/nano/man-html, since we should probably install files we went to all the trouble of generating. 2009-02-14 Chris Allegretta - * nano.c (precalc_multicolorinfo) - Add debugging so we have a better clue if further - issues arise. Also start at the beginning of later lines when trying to match the - end of a multi-line regex. Fixes more overly aggressive highlighting found by - Mike Frysinger. Finally, advance to the match end for performance. + * nano.c (precalc_multicolorinfo): Add debugging so we have a better clue if further + issues arise. Also start at the beginning of later lines when trying to match the + end of a multi-line regex. Fixes more overly aggressive highlighting found by + Mike Frysinger. Finally, advance to the match end for performance. 2009-02-11 Chris Allegretta * nanorc.c (parse_include): Do call real_dir_from_tilde() on included @@ -397,7 +1948,7 @@ GNU nano 2.1.9 - 2009.02.16 errors about the rcfile and asking user to press enter. Also, nano should now only ask for one enter press when there is an error when not using -q. Based on discussion between Eitan Adler and Mike Frysinger. - * rcfile.c (parse_keybinding) - Significant cleanups and fixes for + * rcfile.c (parse_keybinding): Significant cleanups and fixes for detecting and reporting errors in key bindings code. 2009-02-08 Chris Allegretta @@ -409,23 +1960,24 @@ GNU nano 2.1.9 - 2009.02.16 GNU nano 2.1.8 - 2009.02.07 2009-02-06 Chris Allegretta - * rcfile.c (parse_include): Abort on being unable to open an included rcfile. Fixes - Savannah bug 25490, nanorc: "include"ing a file which doesn't exist causes nano to segfault. + * rcfile.c (parse_include): Abort on being unable to open an included rcfile. + Fixes Savannah bug #25490, nanorc: "include"ing a file which doesn't exist + causes nano to segfault. 2009-02-05 Chris Allegretta - * More color syntax speedups: Determine in reset_multis() whether we really need to call + * More color syntax speedups: Determine in reset_multis() whether we really need to call edit_refresh(). Additional global var edit_refresh_needed() to hopefully reduce - repeated calls to the function. New helper funcs reset_multis_before() and + repeated calls to the function. New helper funcs reset_multis_before() and reset_multis_after(). 2009-02-02 Chris Allegretta * New color precalculation code for mult-line regexes. New function precalc_multicolorinfo(), - new structure multidata for keeping track of where regexes start/stop. More + new structure multidata for keeping track of where regexes start/stop. More performance improvements forthcoming. 2009-01-29 Chris Allegretta - * nano.c (move_to_filestruct) - properky initialize new fileage for multiswatching, sigh. - Fix cut sefaults discovered by Mike Frysinger. + * nano.c (move_to_filestruct): Properly initialize new fileage for multiswatching, sigh. + Fix cut segfaults discovered by Mike Frysinger. 2009-01-29 Chris Allegretta * nano.c (main): Add support for nano acting like a pager when invoked with - as first @@ -435,21 +1987,20 @@ GNU nano 2.1.8 - 2009.02.07 * doc/syntax/gentoo.nanorc: Updates from David and Mike Frysinger. 2009-01-25 Chris Allegretta - * files.c (open_file), nanorc.c (parse_include): Don't get_full_path on - included rc files, due to it potentially impacting the ability - to read files in nano's cwd(). Fixes Savnanah bug #25297 reported by Mike - Frysinger) + * files.c (open_file), nanorc.c (parse_include): Don't get_full_path on included + rc files, due to it potentially impacting the ability to read files in nano's + cwd(). Fixes Savnanah bug #25297 reported by Mike Frysinger. 2009-01-24 Chris Allegretta * First pass at some caching of caching color info. Right now it's only for multi-line regexes but this may not be enough to increase performance. * Add interruptability to search functions. New functions enable_nodelay and disable_nodelay and changes to the routines to handle checking for pending - searches. Fixes Savnnah bug 24946: Need interrrupt for search. + searches. Fixes Savnnah bug #24946: Need interrrupt for search. 2009-01-19 Chris Allegretta * Change function definitions to shorts instead of (void *)s. New mapping function - iso_me_harder_funcmap(). Fixes compilation complaints with -pedantic, + iso_me_harder_funcmap(). Fixes compilation complaints with -pedantic, reported by Eitan Adler . GNU nano 2.1.7 - 2008.11.10 @@ -459,139 +2010,141 @@ GNU nano 2.1.7 - 2008.11.10 2008-10-14 Chris Allegretta * nanorc.5: Fix redo man page entry and update explanation, reported by - Eitan Adler + Eitan Adler . * global.c (shortcut_init), search.c (search_init): Fix add_to_sclist for ^W^T so - invalid messages will display properly. Fixes Savannah bug 24507. + invalid messages will display properly. Fixes Savannah bug #24507. 2008-10-13 Chris Allegretta * Remove CUTTOEND as an undo type as it's unneeded, fix u->to_end logic in undo struct. - * undo.c (update_undo): Don't free cutbuffer if NULL, fix for Savannah bug #24499 + * undo.c (update_undo): Don't free cutbuffer if NULL, fixes Savannah bug #24499. 2008-10-04 Chris Allegretta - * cut.c (Add_undo): Save last cut undo information so it can be used for next uncut, fixes - Savannah bug 24183. + * cut.c (add_undo): Save last cut undo information so it can be used for + next uncut, fixes Savannah bug #24183. GNU nano 2.1.6 - 2008.10.03 2008-10-03 Pascal Gentil - * fortran.nanorc: Sample python syntax highlighting file + * fortran.nanorc: Sample Fortran syntax highlighting file. 2008-09-30 Dirkjan Ochtman - * python.nanorc: Small python syntax update + * python.nanorc: Small Python syntax update. 2008-09-30 - * ocaml.nanorc: Sample OCaml syntax highlighting file + * ocaml.nanorc: Sample OCaml syntax highlighting file. 2008-09-30 Dave Geering - * objc.nanorc: Sample Objective-C Syntax Hightlighting file + * objc.nanorc: Sample Objective-C syntax hightlighting file. 2008-09-30 Chris Allegretta - * configure.ac: Change extra, multibuffer, color and rcfile configure options to default to enabled - --enable-tiny will now disable these options as well - * python.nanorc, ruby.nanorc: Add header lines for python and ruby as well + * configure.ac: Change extra, multibuffer, color and rcfile configure options + to default to enabled --enable-tiny will now disable these options as well. + * python.nanorc, ruby.nanorc: Add header lines for Python and Ruby as well. 2008-09-21 Chris Allegretta - * rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by the "header" (1st line) - of a file being edited. Based on Savannah bug 24197 and inital proof of concept by Dave Geering - + * rcfile.c, color.c, nano.h: Add new capability for matching a syntax type by + the "header" (1st line) of a file being edited. Based on Savannah bug #24197 + and initial proof of concept by Dave Geering . 2008-09-16 Chris Allegretta - * text.c: Add support for undoing a text uncut. Split out the undo and redo of a text cut - in order to avoid code duplication. + * text.c: Add support for undoing a text uncut. Split out the undo and redo + of a text cut in order to avoid code duplication. 2008-09-06 Chris Allegretta - * nano.c: Do call disable_signals at startup regardless, since under cygwin we can't generate - ^C without it. + * nano.c: Do call disable_signals at startup regardless, since under Cygwin + we can't generate ^C without it. GNU nano 2.1.5 - 2008.08.30 2008-08-29 Chris Allegretta - * configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems which don't support - GNU-style word boundaries. New function fixbounds() to translate from GNU-style to - BSD-style, autoconf option GNU_WORDBOUNDS. - * nano-regress: New perl script to check for some of the more obvious issues with compilation - issues with certain configure options. - * global.c, help.c, browser.c, files.c, proto.h: Fix several compipation and programmatic - issues with --disable-help, especially that do-writeout was treating ^G the same as ^M. + * configure.ac, color.c, rcfile.c, utils.c: 1st attempt at supporting systems + which don't support GNU-style word boundaries. New function fixbounds() to + translate from GNU-style to BSD-style, autoconf option GNU_WORDBOUNDS. + * nano-regress: New perl script to check for some of the more obvious issues + with compilation issues with certain configure options. + * global.c, help.c, browser.c, files.c, proto.h: Fix several compilation and + programmatic issues with --disable-help, especially that do-writeout was + treating ^G the same as ^M. 2008-08-28 Chris Allegretta - * configure.ac, rcfile.c: Add support for an alternate rcfilename at configure time. Maybe this + * configure.ac, rcfile.c: Add support for an alternate rcfilename at configure time. Maybe this should become a command line option some day, but I don't see the need currently. Start of fix for Savannah bug #24128: Add nanorc support to win32 platform. 2008-08-21 Chris Allegretta - * text.c: Change error messages where we may possibly get into a bad state and urge - the user to save when this happens. Originally by Benno Schulenberg - * text.c (do_enter): Fix issue when compiled with --enable-debug, fixes Savannah bug 24092. + * text.c: Change error messages where we may possibly get into a bad state and urge the + user to save when this happens. Originally by Benno Schulenberg + * text.c (do_enter): Fix issue when compiled with --enable-debug, fixes Savannah bug #24092. 2008-08-08 Magnus Granberg / Adam Conrad - * files.c (write_file): Add needed flags to open() calls when writing out files. Fixes Savannah bug - #23827: Compilation fails with -D_FORTIFY_SOURCE=2 + * files.c (write_file): Add needed flags to open() calls when writing out files. + Fixes Savannah bug #23827: Compilation fails with -D_FORTIFY_SOURCE=2. 2008-08-08 Chris Allegretta - * files.c (write_file): Check exit code of fclose(), since in certain out of space conditions the OS will - happily report successful fwrite()s until you try and close the file. Fix for Savannah bug - #24000: no free space on partition - nano claims successful write - file empty + * files.c (write_file): Check the exit code of fclose(), since in certain + out-of-space conditions the OS will happily report successful fwrite()s + until you try and close the file. Fixes Savannah bug #24000: no free + space on partition - nano claims successful write - file is empty. GNU nano 2.1.4 - 2008.08.09 2008-08-08 Chris Allegretta - * files.c (write_file): Do not go on and attempt to write the main file if writing the backup file failed, - related to Savannah bug 24000. + * files.c (write_file): Do not go on and attempt to write the main file if writing + the backup file failed, related to Savannah bug #24000. * text.c (do_redo): Fix improperly restoring the text when redoing a line split. - * text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events. + * text.c (add_undo): Fix check for multi-line cut check skips adding other new legit events. 2008-07-23 Chris Allegretta - * text.c: Reset openfile-> to OTHER after an undo or redo so we don't mistakenly + * text.c: Reset openfile-> to OTHER after an undo or redo so we don't mistakenly think this is an update when it's really an add. Also - Fix an extra ; after an if statement which makes nano try to free a struct which - may be NULL + fix an extra ; after an if statement which makes nano try to free + a struct which may be NULL. GNU nano 2.1.3 - 2008.08.04 2008-07-23 Chris Allegretta - * configure.ac: Add ncursesw dir to include path if lib detected + * configure.ac: Add ncursesw dir to include path if lib is detected. 2008-07-11 Mike Frysinger * doc/nanorc.sample.in: Include the updates files in the default sample nanorc. 2008-07-11 Fabian Groffen * nano.c: Don't include langinfo.h if not using ENABLE_UTF8 - (Savannah patch 6565) + (Savannah patch #6565). 2008-07-11 Mitsuya Shibata * text.c: Fix crashing in help menu when using certain locales - (Savannah bug 23751) + (Savannah bug #23751). 2008-07-09 Chris Allegretta - * nano.c/nano.h/global.c/text.c: New generalized undo code, currently + * nano.c/nano.h/global.c/text.c: New generalized undo code, currently just works for adding and deleting text and splitting and unsplitting lines. 2008-06-29 Chris Allegretta - * global.c: Fix for not having search history when --disable-justify is used - (Savannah bug 23733) + * global.c: Fix for not having a search history when --disable-justify is used + (Savannah bug #23733). GNU nano 2.1.2 - 2008.06.24 2008-06-24 Chris Allegretta * rcfile.c: Added function check_bad_binding() to look for sequences which - shouldn't be bound, per Savannah bug 22674. + shouldn't be bound, per Savannah bug #22674. 2008-05-31 Chris Allegretta - * prompt.c,search.c,global.c: Tentative fix for bug #23144: using arrow - keys in search buffer affects main window (by Mike Frysinger) + * prompt.c,search.c,global.c: Tentative fix for bug #23144: using arrow + keys in search buffer affects main window (by Mike Frysinger). 2008-05-31 Chris Allegretta - * global.c: Fix for Savannah bug #23442: left/right arrow keys - do not work with --enable-tiny (by Mike Frysinger) + * global.c: Fix for Savannah bug #23442: left/right arrow keys + do not work with --enable-tiny (by Mike Frysinger). 2008-05-31 Chris Allegretta * files.c,proto.h,text.c: Fix for conflicts with AIX curses - variables, from William Jojo + variables, from William Jojo . 2008-05-31 Chris Allegretta - * global.c: Fix for compile error when --disable-speller is used - (Savannah bug 23227 by Mike Frysinger) + * global.c: Fix for compile error when --disable-speller is used + (Savannah bug #23227 by Mike Frysinger). 2008-05-31 Chris Allegretta - * Fix for seg fault when window size too small, by - Andreas Amann + * Fix for seg fault when window size is too small, + by Andreas Amann . GNU nano 2.1.1 - 2008.04.01 2008-05-31 Chris Allegretta @@ -614,41 +2167,41 @@ GNU nano 2.1.1 - 2008.04.01 issue. 2008-03-19 Chris Allegretta - * gloabl.c: Fix bracket matching sequence to be M-] not M-[, as reported + * global.c: Fix bracket matching sequence to be M-] not M-[, as reported Nick Warne . - * doc/syntax/Makefile.am - Actually include new syntaxes from Mike, etc - * debian.nanorc - New debian sources.list config since we're including - gentoo, adapted from Milian Wolff + * doc/syntax/Makefile.am: Actually include new syntaxes from Mike, etc. + * debian.nanorc: New debian sources.list config since we're including + gentoo, adapted from Milian Wolff . 2008-03-18 Mike Frysinger - * winio.c: Remove unneeded variable in parse_kbinput() - * rcfile.c: relocate check_vitals_mapped() function to just above - where it actually gets used and declare it "static void" in the process - * global.c: only declare nano_justify_msg when justify support is enabled - * php.nanorc: Php syntax highlighting config - * tcl.nanorc: Tcl syntax highlighting config - * gentoo.nanorc: Gentoo syntax highlighting config + * winio.c: Remove unneeded variable in parse_kbinput(). + * rcfile.c: Relocate check_vitals_mapped() function to just above where + it actually gets used and declare it "static void" in the process. + * global.c: Only declare nano_justify_msg when justify support is enabled. + * php.nanorc: Php syntax highlighting config. + * tcl.nanorc: Tcl syntax highlighting config. + * gentoo.nanorc: Gentoo syntax highlighting config. 2008-03-17 Benno Schulenberg * global.c: Fix incorrect first line jump messsage, fix - more comments to assist translators + more comments to assist translators. * winio.c: Fix shortcut labels not being translated. 2008-03-17 Mike Frysinger - * */.gitignore: Git ignore files for those running a local git - against SVN. + * */.gitignore: Git ignore files for those running a local git + against SVN. 2008-03-16 Benno Schulenberg - * src/help.c, src/global: Fix help strings no longer being + * src/help.c, src/global: Fix help strings no longer being translated properly. - * src/global.c, doc/man/nanorc.5: Fix typos and poorlly worded lines - in the source and man pages. + * src/global.c, doc/man/nanorc.5: Fix typos and poorly worded + lines in the source and man pages. 2008-03-04 Chris Allegretta diff --git a/INSTALL b/INSTALL index 7d1c323..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented @@ -226,6 +226,11 @@ order to use an ANSI C compiler: and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended @@ -304,9 +309,10 @@ causes the specified `gcc' to be used as the C compiler (unless it is overridden in the site shell script). Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: +an Autoconf limitation. Until the limitation is lifted, you can use +this workaround: - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash + CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== @@ -362,4 +368,3 @@ operates. `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. - diff --git a/Makefile.am b/Makefile.am index 9f696c7..af890cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,8 @@ -## $Id: Makefile.am 4227 2008-03-15 23:14:34Z astyanax $ +## $Id: Makefile.am 5026 2014-06-27 20:20:14Z bens $ AUTOMAKE_OPTIONS = gnu no-dependencies SUBDIRS = doc m4 po src -EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING COPYING.DOC ChangeLog \ - ChangeLog.pre-2.1 INSTALL NEWS README README.SVN \ - THANKS TODO UPGRADE config.rpath install-sh missing \ - mkinstalldirs nano.spec +EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec ACLOCAL_AMFLAGS = -I m4 diff --git a/Makefile.in b/Makefile.in index 275e550..e54697f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,16 +77,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ subdir = . -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(srcdir)/nano.spec.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING COPYING.DOC ChangeLog INSTALL NEWS THANKS TODO \ - config.guess config.rpath config.sub depcomp install-sh \ - missing mkinstalldirs +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in mkinstalldirs $(srcdir)/nano.spec.in \ + ABOUT-NLS COPYING COPYING.DOC THANKS TODO compile config.guess \ + config.rpath config.sub depcomp install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -56,32 +100,75 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = nano.spec CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = depcomp = am__depfiles_maybe = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -109,10 +196,14 @@ am__relativize = \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -158,6 +249,11 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_CONFIG = @NCURSESW_CONFIG@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -169,6 +265,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKGDATADIR = @PKGDATADIR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -198,6 +296,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +haveit = @haveit@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -222,27 +321,19 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = gnu no-dependencies SUBDIRS = doc m4 po src -EXTRA_DIST = ABOUT-NLS AUTHORS BUGS COPYING COPYING.DOC ChangeLog \ - ChangeLog.pre-2.1 INSTALL NEWS README README.SVN \ - THANKS TODO UPGRADE config.rpath install-sh missing \ - mkinstalldirs nano.spec - +EXTRA_DIST = ChangeLog.pre-2.1 README.SVN UPGRADE nano.spec ACLOCAL_AMFLAGS = -I m4 all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -278,10 +369,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -297,22 +386,25 @@ nano.spec: $(top_builddir)/config.status $(srcdir)/nano.spec.in cd $(top_builddir) && $(SHELL) ./config.status $@ # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -327,57 +419,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -393,12 +440,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -410,15 +452,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -427,9 +465,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -465,13 +525,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -500,36 +557,42 @@ distdir: $(DISTFILES) || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then # it guarantees that the distribution is self-contained by making another @@ -540,8 +603,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -551,17 +614,19 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -584,13 +649,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -621,10 +694,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -705,23 +783,23 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \ + distcheck distclean distclean-generic distclean-hdr \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/NEWS b/NEWS index bd73632..c3e21d0 100644 --- a/NEWS +++ b/NEWS @@ -1,55 +1,168 @@ -2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to - www.desertbus.org and donate a few bucks for the great - Child's Play Charity! This is just a small release to - update a bug where restricted mode was not particularly - restricted since key bindings were introduced. It also - signals the return of win32 builds which now feature +2015.03.22 - GNU nano 2.4.0 "lizf" is released. This is the first + stable release in many years, and brinds together many + new features from the 2.3 series: including: + a fully functional undo system (now enabled by default), + vim-compatible file locking, linter support, formatter + support, syntax highlighting flexibility, and many fixes + for issues reported since 2.2. Many sincere thanks + to all of the bug reports, patches, well wishes and + contributions from everyone who has continued to + support us. Thank you for using nano! + + +2015.02.27 - GNU nano 2.3.99pre3 "Ashley" is released. This is likely + to be the last release before the next major (2.4.0) + release. Please test it out and send us any feedback + via the Savannah bug page for nano + (https://savannah.gnu.org/bugs/?group=nano). This + release includes fixes for rebinding toggles via + nanorc, several memory alignment fixes, and documentation + and build updates. As always thank you for using + nano - Share and Enjoy! + +2015.02.06 - GNU nano 2.3.99pre2 "Snowblind" is released. This release + contains only fixes, including: a long-standing problem + with cutting in nano-tiny, several memory alignment + improvements, and issues with leftover file locks. Please + keep reporting bugs so we can get a happy and healthy + 2.4.0 soon. Thanks for using nano! + +2015.01.06 - GNU nano 2.3.99pre1 "Junior" is released. As the first + 2.4 release candidate there will be fewer new features + but many bugfixes going forward. This release contains + new support for language reformatters like go's gofmt + command which takes the place of the spelling checker. + Fixes in this release include many syntax highlighting + fixes and improvements, and documentation formatting updates. + As always please report bugs via the Savannah bug page for + nano (https://savannah.gnu.org/bugs/?group=nano), so we can + release a super awesome and bug-free 2.4.0 soon! + +2014.07.17 - GNU nano 2.3.6 "Columbo" is released. This release + contains a fix for installing internationalization + files. Also included are scattered documentation + (in particular man page) fixes, and a few touch ups + to syntax highlighting definitions. Oh, just one + more thing, thanks for using nano! + +2014.07.11 - GNU nano 2.3.5 "lucky day" is released. This release + contains many visible and under-the-hood fixes for + components such as file locking, more fixes to the + undo system, and you no longer have to explicitly ask + nano to have undo/redo support as it now defaults to + being enabled. Other notable fixes include a better + handling of --tempfile mode, and better handling of + command line arguments when also attempting to specify + +. As always, please file any bugs you + find at the Savannah page for nano, at + https://savannah.gnu.org/bugs/index.php?42639 and + thanks for using nano. + +2014.06.02 - GNU nano 2.3.4 won't leave you high, won't leave you dry. This + release contains only a small number of fixes, but in + particular allows nano to compile on non-UTF8 curses + implementations (i.e. libncursesw). Other small fixes to + the undo implementation and the default syntax config are + also included. As always, Share and Enjoy! + +2014.05.28 - GNU nano 2.3.3 is in its right place. This release contains + many many improvements to the core system, including + substantial improvements to the undo/redo code, UTF-8 + handling, the configure script, and display of shortcuts + on very wide terminals, New features include the + ability to read named pipes (--noread), as well as + linter support (see the nanorc man page for details). Also + included are much improved syntax highlighting code, and + configurations for JSON, texinfo, Go, and a default syntax + for catch all highlighting. Finally, nano now has the + ability to set the color of the title bar, status bar, and + shortcut keys (e.g. "^X") and their descriptions. Again + see the nanorc page for details. There's much more, too + much to include here, but please keep those reports and + general feedback coming! Thank you for helping us help + you help us all. + +2013.03.22 - GNU nano 2.3.2 "Annoy your coworkers for fun and profit" is + released. This release introduces vim-style file locking + (though not backup/restore), useful when using nano + in a multi-editor environment. Feedback is welcome if + you run into any issues with this new code. Other new + features include additional support for word boundary + checking when cross compiling, fixes for trying to go to + an invalid line number, and the usual documentation + tweaks. + +2011.05.10 - GNU nano 2.3.1 "I'm in space" is released. This + release includes some fixes for the new libmagic code, as + well as a fix for improper character counts when using + auto-indent. Also included are new syntax highlighting + definitions for RPM spec and lua files. Thanks for + using nano and keep circulating the tapes. + +2011.02.26 - GNU nano 2.3.0 "Septic surprise" is released. This first + release in the 2.3 unstable series brings several new + features. First, libmagic support for syntax highlighting + has been added on top of the existing file extension + and header support already available. Secondly, cursor + position can be saved between editing sessions with + the -P or --poslog command-line flag, or via "set poslog" + in your .nanorc. Also included are some fixes for + compilation with g++, and better handling of issues + writing the backup file, which should reduce the need + for the 'set allow_insecure_backup" nanorc option. + Don't stop, get it get it, don't stop, get it get it. + +2010.11.22 - GNU nano 2.2.6 "Pimp my BBS" wants you to go to + www.desertbus.org and donate a few bucks for the great + Child's Play Charity! This is just a small release to + update a bug where restricted mode was not particularly + restricted since key bindings were introduced. It also + signals the return of win32 builds which now feature nanorc support; please see the FAQ for details of how - to enable it, this feature is a bit of a kludge for now. + to enable it, this feature is a bit of a kludge for now. Remember that when all else fails, USE SPACE JUMP. 2010.08.05 - GNU nano 2.2.5 "Inactivity timeout" is now available. - This release includes slightly less restrictive checkng - when writing files in strange environments (e.g. - when being used out of crontab). For very strange situations + This release includes slightly less restrictive checking + when writing files in strange environments (e.g. when + being used out of crontab). For very strange situations (such as where you cannot change the permissions on the - file you're writing, there is a new rc file option + file you're writing), there is a new rc file option "allow_insecure_backup" to be even more permissive and - allowing the write to proceed. Also included are - some syntax highlighting updated, and that is about it. + allow the write to proceed. Also included are some + syntax highlighting updates, and that is about it. Keep fighting the good fight children. 2010.04.15 - GNU nano 2.2.4 is nobody's fool. First and foremost, - this relase includes some security fixes due to + this release includes some security fixes due to an assessment of nano's vulnerability to symlink attacks on open files. The CVEs fixed with this release are CVE-2010-1160 and CVE-2010-1161. Also included are fixes for various crash modes when using the spell checker on new files in multibuffer mode (surely you've used - that combination recently? No?) as well as a fixing - the 'file was modified' message when saving to a + that combination recently? no?) as well as a fixing + the 'file was modified' message when saving to a new filename (since how would nano know?). And - the list would not be complete without our + the list would not be complete without our third-times-the-charm fixes to page up/down due to - the soft wrapping code. The lone new feature - included is a new syntax higlighting definition for + the soft wrapping code. The lone new feature + included is a new syntax highlighting definition for cmake-related files. Please do consider upgrading to this release if still using the 2.0 series since fixes for that version are still forthcoming. - 2010.02.11 - GNU nano 2.2.3 "fumbling toward stability" is released. - This release contains a fix for only one bug, but a - rather irritating one: when paging up/down with smooth - scrolling, the cursor position was not being preserved - due to a bug in 2.2.2. With such a targeted fix + This release contains a fix for only one bug, but a + rather irritating one: when paging up/down with smooth + scrolling, the cursor position was not being preserved + due to a bug in 2.2.2. With such a targeted fix like this what could POSSIBLY go WRONG? Hahaha. Enjoy and if you find new bugs, as always please use Savannah's bug tracker. http://savannah.gnu.org/bugs/?func=additem&group=nano 2010.01.17 - GNU nano 2.2.2 is released for you, you, you. This - release includes fixes for: crashed when writing + release includes fixes for: crashes when writing backup files in certain conditions, improper screen centering when moving up/down in various combination of smooth scrolling and soft wrapping modes, @@ -62,19 +175,18 @@ 2009.12.12 - GNU nano 2.2.1 "DLR strikes back" is open for business. This release fixes many bugs, including: missing - keybindings for page up/down and GotoDir in the browser, - ^P/^N in the help menu, and restoration of M-W as the + keybindings for page up/down and GotoDir in the browser, + ^P/^N in the help menu, and restoration of M-W as the default re-search binding. Other fixes include several - issues with compiler warnings and configure options, and - documentation updates, including the nano texinfo manual, + issues with compiler warnings and configure options, and + documentation updates, including the nano texinfo manual, nano and nanorc man pages, and UPGRADE file, and some - missing syntax highliting entries for the saple nanorc. + missing syntax highliting entries for the sample nanorc. And no release would be complete without the latest round - of 'final' soft wrapping fixes! Finally, nano will no - longer print a warning when attempting to insert the - contents of a read-only file into an existing buffer. + of 'final' soft wrapping fixes! Finally, nano will no + longer print a warning when attempting to insert the + contents of a read-only file into an existing buffer. Enjoy and Happy Hanukkah. - 2009.11.30 - GNU nano 2.2.0 "Doc Brown" is released! The culmination of almost two years of development and hot on the heels @@ -83,54 +195,54 @@ include several fixes for tiny mode (involving both the help keys and replace menu text), more 'final' fixes for soft wrapping, and several typo and documentation - updates including nanorc tweaks and a new syntax + updates including nanorc tweaks and a new syntax highlighting file for makefiles. Also included is a long standing fix for random crashing when using nanorc on FreeBSD, and nano will no longer clear the screen on suspend to maintain compatibility with other *nix editors. For those who haven't been playing along at home, please see the official web page for the summary of new - features since 2.0. Special thanks to all who have - submitted bug reports recently in support of our new - stable release, and apologies for all those bugs we + features since 2.0. Special thanks to all who have + submitted bug reports recently in support of our new + stable release, and apologies for all those bugs we didn't yet find :-) Peace to all. 2009.11.21 - GNU nano 2.1.99pre2 is available for a special pre-Black Friday discount. Included are some (hopefully final) fixes for issues with last page display caused by the soft wrapping code, and a fix for - a long standing issue with hittig the home key when + a long standing issue with hittig the home key when going through the search history. On the features - front, nano will now attempt to retain the proper - ownership and permissions when trying to create a - .save file due to receiving a signal. Nano can also - now unbind keys from one or more menus via the 'unbind' - keyword. Finally, passing --fill or --nowrap on - the command line will now override any related - .nanorc entries. Speak now or forever hold your bugs! + front, nano will now attempt to retain the proper + ownership and permissions when trying to create a + .save file due to receiving a signal. Nano can also + now unbind keys from one or more menus via the 'unbind' + keyword. Finally, passing --fill or --nowrap on + the command line will now override any related + .nanorc entries. Speak now or forever hold your bugs! 2009.11.15 - GNU nano 2.1.99pre1 "take a bow" is out there, man, it's - out there all right. This release contains mainly - bugfixes, underscoring that we are preparing for the - next stable series release. Included are many fixes - for the new soft wrapping code, compiler warning tweaks, - and the modification time warning no longer triggers - when saving a file as a new name. Also include are - some fixes for various nanorc options, and there are - surely more bugs to find before we call the code base + out there all right. This release contains mainly + bugfixes, underscoring that we are preparing for the + next stable series release. Included are many fixes + for the new soft wrapping code, compiler warning tweaks, + and the modification time warning no longer triggers + when saving a file as a new name. Also include are + some fixes for various nanorc options, and there are + surely more bugs to find before we call the code base stable, so please keep those reports coming! 2009.09.14 - GNU nano 2.1.11 is on very thin ice, very thin ice, very thin ice. This release includes two new features: first, nano will check whether the current file is writable when it is opened, and warn if it is not on the status bar. Secondly, - a new soft-wrapping (AKA full line display) option is + a new soft-wrapping (AKA full line display) option is available, which will attempt to fully display the contents of lines longer than the width of the screen without the usual truncation and a '$' symbol at the end of the line. - It can be enabled via Meta-$ inside the editor, via the - -$ or --softwrap command line flags, or "set softwrap" - in your .nanorc). As always please report any bugs to the + It can be enabled via Meta-$ inside the editor, via the + -$ or --softwrap command line flags, or "set softwrap" + in your .nanorc). As always please report any bugs to the nano Savannah project page (http://savannah.gnu.org/bugs/?func=additem&group=nano) Remember: data loss happens, back up your files. @@ -140,76 +252,75 @@ compiler combos, various compiler warnings, and some crash fixes in the undo code. On the topic of the latter item, the undo code is now marked as experimental since it can - cause severe stability and memory issues, and thus now - requires a flag (-u, --undo) in order to enable it. - Please feel free to continue to test the undo code and + cause severe stability and memory issues, and thus now + requires a flag (-u, --undo) in order to enable it. + Please feel free to continue to test the undo code and thanks again for using nano for your text editing needs. Go team Nano! 2009.02.16 - GNU nano 2.1.9 wonders what all that glass is doing on the - floor! This release is primarily meant as a less buggy - version of 2.1.8, particularly for issues with the new - sped-up syntax highlighting code. Other fixes include - configure-time detection of groff HTML support before - attempting to generate the HTML version of man pages, - and using ~ or ~username syntax in .nanorc should now - work again. Also, nano will now only ask for one - acknowledgement of errors it encounters when parsing - nanorc files, and a new flag -q (--quiet) will silence - these messages altogether. Give it a go, and happy + floor! This release is primarily meant as a less buggy + version of 2.1.8, particularly for issues with the new + sped-up syntax highlighting code. Other fixes include + configure-time detection of groff HTML support before + attempting to generate the HTML version of man pages, + and using ~ or ~username syntax in .nanorc should now + work again. Also, nano will now only ask for one + acknowledgement of errors it encounters when parsing + nanorc files, and a new flag -q (--quiet) will silence + these messages altogether. Give it a go, and happy birthday lenny! 2009.02.07 - GNU nano 2.1.8 "unsafe at any speed" is released. This - release include some long overdue performance + release include some long overdue performance improvements in syntax color highlighting, the ability to abort running searches (useful mainly when editing very large files) and the ability to use nano like a pager for viewing standard input (i.e. "nano -"). - Additionally, there are gentoo syntax highlighting - updates and fixes for issues with reading files - in a directory with strange parent directory permissions. - The key bindings code was also substantially changed - in order to be more ISO-C compatible. Be sure to use - the Savannah page not only for bug reports but for any - features you would like to see before the next stable + Additionally, there are gentoo syntax highlighting + updates and fixes for issues with reading files + in a directory with strange parent directory permissions. + The key bindings code was also substantially changed + in order to be more ISO-C compatible. Be sure to use + the Savannah page not only for bug reports but for any + features you would like to see before the next stable series is released. Have fun with it! - 2008.11.10 - GNU nano 2.1.7 "Effingham" is ready to make good on those campaign promises of lower bug rates and 50% more pie. This release includes a new check for external - modifications when saving a file, some code and - documentation cleanups, and more bug fixes for + modifications when saving a file, some code and + documentation cleanups, and more bug fixes for the new undo code (but we continue to welcome your bug - reports via the Savananh bug page at + reports via the Savananh bug page at http://savannah.gnu.org/bugs/?func=additem&group=nano. Come get some. 2008.10.03 - GNU nano 2.1.6 was for new features before it was against - them. This release includes more undo capability, + them. This release includes more undo capability, several new syntax highlighting configurations including Objective C, OCaml, and Fortran, and a new capability to activate highlighting based on the 1st line of the - file being edited. Also, the new default configure + file being edited. Also, the new default configure options now include color syntax highlighting, .nanorc support, multibuffer and extras. These items can still be disabled and are not enabled with --enable-tiny. Bug - fixes include better signal handling under Cygwin, and + fixes include better signal handling under Cygwin, and that's about it. Again please remember to - submit bug reports via Savannah at + submit bug reports via Savannah at http://savannah.gnu.org/bugs/?func=additem&group=nano - as undo functions certainly need more testing. + as undo functions certainly need more testing. Bon appetit. 2008.08.30 - GNU nano 2.1.5 is ready to lead on day one. This release contains a better fix for incorrectly reported successful writes on full filesystems, more helpful messages when - an internal error occurs in the undo code, and fixes for - various combinations of configure-time options and - compiler flags. Also included is new support for + an internal error occurs in the undo code, and fixes for + various combinations of configure-time options and + compiler flags. Also included is new support for changing the rc file name at configure time, and - using GNU-style regexes for word-boundaries on systems - which do not support them natively, as well as the ever + using GNU-style regexes for word-boundaries on systems + which do not support them natively, as well as the ever popular translation updates. Rock the tarball. 2008.08.09 - GNU nano 2.1.4 "I told you so!" is released. This release @@ -222,42 +333,42 @@ are likely to run out of space; see Savannah bug 24000. Have fun with it! -2008.08.04 - GNY nano 2.1.3 "least stable version ever" is released. This +2008.08.04 - GNU nano 2.1.3 "least stable version ever" is released. This release includes new (and experimental) undo and redo - functionality for most text operations. The default + functionality for most text operations. The default key bindings are Meta-U for undo and Meta-E for redo, but these can be remapped using the new 2.1 keybinding code. - Also included are some fixes for configuring using wide - curses, crashing when invoking the help menu with + Also included are some fixes for configuring using wide + curses, crashing when invoking the help menu with certain locales, and not saving the search history when compiled with configure options. 2008.04.24 - GNU nano 2.1.2 "New York City" is released. This release - contains fixes for binding bad keys, some - configure-specific compilation failures, and more issues - with the new input back end and in particular the status - bar. Also fixed are some long standing issues with + contains fixes for binding bad keys, some + configure-specific compilation failures, and more issues + with the new input back end and in particular the status + bar. Also fixed are some long standing issues with compiling on AIX, and a segfault when making the terminal window too small. Rest in Peace Tim and George! 2008.04.01 - GNU nano 2.1.1 wont get fooled again. This release contains fixes for the new user-rebindable keys (in particular bracket match which was mis-bound), and various - problems with translations and configure-related + problems with translations and configure-related compilation problems are now fixed as well. - It also contains new syntax highlighting - definitions for TCL, PHP, Gentoo and Debian-related - files, and some documentation updates as well. - Please continue to send reports with the key + It also contains new syntax highlighting + definitions for TCL, PHP, Gentoo and Debian-related + files, and some documentation updates as well. + Please continue to send reports with the key binding code to the Savannah page (https://savannah.gnu.org/bugs/?group=nano). - + 2008.03.18 - GNU nano 2.1.0 "under old mismanagement" is released. This first release in the 2.1 development series introduces rebinadble keys for most actions inside - the editor. Please see the nanorc(5) page for - more information on configuring key bindings. Please - also report all keybinding bugs (crashes, missing + the editor. Please see the nanorc(5) page for + more information on configuring key bindings. Please + also report all keybinding bugs (crashes, missing menu functions) using the Savannah bug tracker URL, https://savannah.gnu.org/bugs/?group=nano and thanks for sticking with us! @@ -735,10 +846,10 @@ new option to ignore rc files (-I,--ignorercfiles), compatibility with -pedantic, handling null characters before EOF, a slightly sportier nanorc.sample and more. - Fixes are included included for justification, + Fixes are included for justification, the reading and writing file routines, resizing and fill length, millions of memory leaks, the usage screen was - updated, and the the --quotestr and --regexp really work + updated, and the --quotestr and --regexp really work now ;-) Enjoy :) 05/12/2002 - GNU nano 1.1.9 is released, happy Mother's Day! This @@ -896,7 +1007,7 @@ also features mutt's case insensitive string compare function for more speed and less memory usage. Two new translations are included, Ukrainian and Russian. - + 05/12/2001 - GNU nano 1.0.2 is the "just the bugfixes ma'am" release. The most noticeable fixes are for display errors using page up/down with the marker code, and view mode (-v) @@ -1063,7 +1174,7 @@ 08/03/2000 - Nano 0.9.15 is the "I can't think of a release description" release. There are the usual gala of display bugfixes, - a fix for the the nasty bug in -k mode that could create + a fix for the nasty bug in -k mode that could create a loop in the file being edited, and some other code cleanup. Also, the -T option should now work regardless of the curses library used. Yay. @@ -1315,4 +1426,4 @@ update your bookmarks, tell your friends, and all that jazz. -$Id: NEWS 4516 2010-08-11 02:42:32Z astyanax $ +$Id: NEWS 5128 2015-03-07 20:46:11Z bens $ diff --git a/README b/README index abbb892..da80787 100644 --- a/README +++ b/README @@ -24,6 +24,7 @@ Overview How to compile and install nano Download the nano source code, then: + tar zxvf nano-x.y.z.tar.gz cd nano-x.y.z ./configure @@ -32,31 +33,30 @@ How to compile and install nano It's that simple. Use --prefix with configure to override the default installation directory of /usr/local. - - If you configured with the "--enable-nanorc" option, after - installation you might copy the doc/nanorc.sample to your home - directory, rename it to ".nanorc", and then edit it according to - your taste. + + If you haven't configured with the "--disable-nanorc" option, after + installation you may want to copy the doc/nanorc.sample to your + home directory, rename it to ".nanorc", and then edit it according + to your taste. Web Page http://www.nano-editor.org/ -Mailing List and Bug Reports +Mailing Lists and Bug Reports Savannah hosts all the nano-related mailing-lists. - + info-nano@gnu.org is a very low traffic list - used to announce new nano versions or other important - information about the project. + + info-nano@gnu.org is a very low traffic list used to announce + new nano versions or other important information about the + project. + help-nano@gnu.org is for those seeking to get help without - wanting to hear about the technical details of its - development. - + nano-devel@gnu.org is the list used by the people - that make nano and a general development discussion list, with - moderate traffic. + wanting to hear about the technical details of its development. + + nano-devel@gnu.org is the list used by the people that make + nano and a general development discussion list, with moderate + traffic. - To subscribe, send email to nano--request@gnu.org with a + To subscribe, send email to -request@gnu.org with a subject of "subscribe", where is the list you want to subscribe to. @@ -65,8 +65,6 @@ Mailing List and Bug Reports Current Status - GNU nano has reached its third stable milestone, 2.0.x. - Development of new features continues in the 2.1.x branch, while - 2.0.x versions are dedicated to bug-fixing and polishing. - -$Id: README 4057 2007-01-29 12:40:48Z dolorous $ + GNU nano has reached its fourth stable milestone, 2.2.x. + Development of new features continues in the 2.3.x branch, while + 2.2.x versions are dedicated to bug-fixing and polishing. diff --git a/README.SVN b/README.SVN index f5476f2..5dfa84d 100644 --- a/README.SVN +++ b/README.SVN @@ -17,7 +17,6 @@ packages: - groff (version >= 1.12) - texinfo (version >= 4.0) - subversion (aka svn) -- ssh (with support for the SSH version 2 protocol) - glib 2.x (if your system doesn't have vsnprintf(), which the configure script will check for) - make, gcc and the normal development libraries (curses or slang, etc.) @@ -30,15 +29,15 @@ to use UTF-8. Download the source ------------------- -To obtain the current nano development code (called 'trunk'), use the -following command. It will create a copy of the files in a subdirectory +To obtain the current nano development code (called 'trunk'), use the +following command. It will create a copy of the files in a subdirectory of your current working directory called 'nano': $ svn co svn://svn.savannah.gnu.org/nano/trunk/nano If you want to download the stable SVN branch instead, use: - $ svn co svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano + $ svn co svn://svn.savannah.gnu.org/nano/branches/nano_2_2_branch/nano Generate the configure script @@ -83,5 +82,5 @@ you'll need to run that "make install" command with root privileges. Problems? --------- -Please submit any bugs in the SVN branch using the Savannah project's -bug tracker (https://savannah.gnu.org/bugs/?group=nano) +Please submit any bugs in the SVN branch using the Savannah project's +bug tracker (https://savannah.gnu.org/bugs/?group=nano). diff --git a/THANKS b/THANKS index 4efd9ec..4c0c3e2 100644 --- a/THANKS +++ b/THANKS @@ -5,7 +5,7 @@ If we missed you here, let us know! Sharuzzaman Ahmat Raslan Malay translator Laurentiu Buzdugan Romanian translator -CHAO Wei-Lun Traditional Chinese translator +CHAO Wei-Lun Chinese (traditional) translator Ricardo Cárdenes Medina Spanish translator Marco Colombo Italian translator Yavor Doganov Bulgarian translator @@ -13,37 +13,63 @@ Karl Eichwalder German translator Doruk Fisek Turkish translator Jean-Philippe Guérard French translator -Geir Helland Norwegian bokmål translator +Geir Helland Norwegian Bokmål translator Tedi Heriyanto Indonesian translator Václav Haisman Czech translator Szabolcs Horvath Hungarian translator -Kalle Kivimaa Finnish Translator -Eivind Kjørstad Norwegian nynorsk translator +Kalle Kivimaa Finnish translator +Eivind Kjørstad Norwegian Nynorsk translator Florian König German translator Wojciech Kotwica Polish translator Clement Laforet French translator +Daniele Medri Italian translator Gergely Nagy Hungarian translator -Kalle Olavi Niemitalo Finnish Translator +Kalle Olavi Niemitalo Finnish translator +A. Murat EREN Turkish translator Claudio Neves Brazilian Portuguese translator -Daniel Nylander Swedish Translator +Daniel Nylander Swedish translator Michael Piefel German translator -Sergey A. Ribalchenko Russian, Ukrainian translator +Sergey A. Ribalchenko Ukrainian and Russian translator Michel Robitaille French translator Christian Rose Swedish translator -Stig E Sandoe Norwegian bokmål translator -Benno Schulenberg Dutch translator +Stig E Sandø Norwegian Bokmål translator +Benno Schulenberg Dutch and Esperanto translator Danilo Segan Serbian translator Keld Simonsen Danish translator Guus Sliepen Dutch translator Cezary Sliwa Polish translator Pierre Tane French translator Jacobo Tarrío Galician translator -Kjetil Torgrim Homme Norwegian nynorsk translator +Kjetil Torgrim Homme Norwegian Nynorsk translator Miquel Vidal Catalan translator Phan Vinh Thinh Vietnamese translator Pauli Virtanen Finnish translator Peio Ziarsolo Basque translator +Anton Zinoviev Bulgarian translator +João Victor Duarte Martins + Brazilian Portuguese translator +Kevin Patrick Scannell Irish translator +Gabor Kelemen Hungarian translator +Francisco Javier Tsao Santín + Galician translator +Dimitriy Ryazantcev Russian translator +Clytie Siddall Vietnamese translator +LI Daobing Chinese (simplified) translator +Jorma Karvonen Finnish translator +Aron Xu Chinese (simplified) translator +Pavel Fric Czech translator +Pavel Maryanov Russian translator +Sergey Poznyakoff Polish translator +Ask Hjorth Larsen Danish translator +Trần Ngọc Quân Vietnamese translator +Klemen Košir Slovenian translator +Yasuaki Taniguchi Japanese translator +Jorge González Spanish translator +Johnny A. Solbu Norwegian Bokmål translator +Мирослав Николић + Serbian translator + Ben Armstrong Negative -r value idea, code Thomas Dickey Curses help and advice @@ -59,4 +85,4 @@ Jeremy Robichaud Beta tester Bill Soudan Regex code, etc Ken Tyler Search fixes and more -$Id: THANKS 3303 2006-03-15 22:44:43Z jordi $ +$Id: THANKS 5098 2014-12-28 22:23:31Z bens $ diff --git a/TODO b/TODO index 5756119..ed3e833 100644 --- a/TODO +++ b/TODO @@ -96,4 +96,4 @@ For version 1.0: - Unjustify command (^U after ^J) [DONE =-]. - Username completion (~user) [DONE =-]. -$Id: TODO 4516 2010-08-11 02:42:32Z astyanax $ +$Id: TODO 4513 2010-08-06 01:20:51Z astyanax $ diff --git a/aclocal.m4 b/aclocal.m4 index f55b305..c807458 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,176 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +192,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,22 +211,22 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -84,7 +245,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -110,22 +271,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -144,16 +302,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -163,7 +319,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -176,12 +332,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -189,8 +346,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -229,16 +387,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -247,16 +405,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -304,7 +462,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -314,34 +472,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -354,7 +517,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -366,21 +529,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -398,7 +559,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -408,18 +569,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -432,7 +596,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -461,31 +625,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -496,34 +669,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -545,7 +762,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -564,16 +781,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -589,14 +804,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -614,7 +827,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -641,15 +854,12 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -657,11 +867,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -674,63 +883,35 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) - # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -741,24 +922,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -769,32 +1008,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -804,9 +1051,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -814,34 +1137,32 @@ AC_MSG_RESULT(yes)]) # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -849,24 +1170,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -876,80 +1195,120 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/ac_define_dir.m4]) +m4_include([m4/ax_check_compile_flag.m4]) m4_include([m4/gettext.m4]) m4_include([m4/glib-2.0.m4]) m4_include([m4/iconv.m4]) diff --git a/compile b/compile new file mode 100755 index 0000000..531136b --- /dev/null +++ b/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: diff --git a/config.guess b/config.guess index dc84c68..b79252d 100755 --- a/config.guess +++ b/config.guess @@ -1,14 +1,12 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-06-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -17,26 +15,22 @@ timestamp='2009-11-20' # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner. Please send patches (context -# diff format) to and include a ChangeLog -# entry. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). # -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. +# Originally written by Per Bothner. # # You can get the latest version of this script from: # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# +# Please send patches with a ChangeLog entry to config-patches@gnu.org. + me=`echo "$0" | sed -e 's,.*/,,'` @@ -56,8 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -139,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown +case "${UNAME_SYSTEM}" in +Linux|GNU|GNU/*) + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + LIBC=gnu + + eval $set_cc_for_build + cat <<-EOF > $dummy.c + #include + #if defined(__UCLIBC__) + LIBC=uclibc + #elif defined(__dietlibc__) + LIBC=dietlibc + #else + LIBC=gnu + #endif + EOF + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + ;; +esac + # Note: order is significant - the case branches are not exclusive. case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -180,7 +194,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in fi ;; *) - os=netbsd + os=netbsd ;; esac # The OS release @@ -201,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit ;; + *:Bitrig:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} + exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} @@ -223,7 +241,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` + UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on @@ -269,7 +287,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -295,12 +316,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo s390-ibm-zvmoe exit ;; *:OS400:*:*) - echo powerpc-ibm-os400 + echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) + arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) @@ -394,23 +415,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} + echo m68k-atari-mint${UNAME_RELEASE} exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + echo m68k-milan-mint${UNAME_RELEASE} + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + echo m68k-hades-mint${UNAME_RELEASE} + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; + echo m68k-unknown-mint${UNAME_RELEASE} + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} exit ;; @@ -480,8 +501,8 @@ EOF echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` + # DG/UX returns AViiON for all architectures + UNAME_PROCESSOR=`/usr/bin/uname -p` if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] then if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ @@ -494,7 +515,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -551,7 +572,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -594,52 +615,52 @@ EOF 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; + sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` + case "${sc_cpu_version}" in + 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 + 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 + 532) # CPU_PA_RISC2_0 + case "${sc_kernel_bits}" in + 32) HP_ARCH="hppa2.0n" ;; + 64) HP_ARCH="hppa2.0w" ;; '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac + esac ;; + esac fi if [ "${HP_ARCH}" = "" ]; then eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + sed 's/^ //' << EOF >$dummy.c - #define _HPUX_SOURCE - #include - #include + #define _HPUX_SOURCE + #include + #include - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); + int main () + { + #if defined(_SC_KERNEL_BITS) + long bits = sysconf(_SC_KERNEL_BITS); + #endif + long cpu = sysconf (_SC_CPU_VERSION); - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } + switch (cpu) + { + case CPU_PA_RISC1_0: puts ("hppa1.0"); break; + case CPU_PA_RISC1_1: puts ("hppa1.1"); break; + case CPU_PA_RISC2_0: + #if defined(_SC_KERNEL_BITS) + switch (bits) + { + case 64: puts ("hppa2.0w"); break; + case 32: puts ("hppa2.0n"); break; + default: puts ("hppa2.0"); break; + } break; + #else /* !defined(_SC_KERNEL_BITS) */ + puts ("hppa2.0"); break; + #endif + default: puts ("hppa1.0"); break; + } + exit (0); + } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` test -z "$HP_ARCH" && HP_ARCH=hppa @@ -730,22 +751,22 @@ EOF exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit ;; @@ -769,14 +790,14 @@ EOF exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` + echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit ;; 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} @@ -788,30 +809,35 @@ EOF echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit ;; *:Interix*:*) - case ${UNAME_MACHINE} in + case ${UNAME_MACHINE} in x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; @@ -848,15 +874,22 @@ EOF exit ;; *:GNU:*:*) # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` + echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -866,52 +899,56 @@ EOF EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; - esac + esac objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} + if test "$?" = 0 ; then LIBC="gnulibc1" ; fi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + arc:Linux:*:* | arceb:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; arm*:Linux:*:*) eval $set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi + else + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf + fi fi exit ;; avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:Linux:*:*) - LIBC=gnu - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval $set_cc_for_build @@ -930,51 +967,63 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; + or1k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) - echo sparc-unknown-linux-gnu + echo sparc-unknown-linux-${LIBC} exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu + echo hppa64-unknown-linux-${LIBC} exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; + PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; + PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; + *) echo hppa-unknown-linux-${LIBC} ;; esac exit ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu + echo powerpc64-unknown-linux-${LIBC} exit ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu + echo powerpc-unknown-linux-${LIBC} + exit ;; + ppc64le:Linux:*:*) + echo powerpc64le-unknown-linux-${LIBC} + exit ;; + ppcle:Linux:*:*) + echo powerpcle-unknown-linux-${LIBC} exit ;; s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux + echo ${UNAME_MACHINE}-ibm-linux-${LIBC} exit ;; sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu + echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. @@ -983,11 +1032,11 @@ EOF echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, + # Unixware is an offshoot of SVR4, but it has its own version + # number series starting with 2... + # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. + # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit ;; i*86:OS/2:*:*) @@ -1019,7 +1068,7 @@ EOF fi exit ;; i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; @@ -1047,13 +1096,13 @@ EOF exit ;; pc:*:*:*) # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. + # uname -m prints for DJGPP always 'pc', but it prints nothing about + # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configury will decide that # this is a cross-build. echo i586-pc-msdosdjgpp - exit ;; + exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; @@ -1088,8 +1137,8 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ + && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ @@ -1132,10 +1181,10 @@ EOF echo ns32k-sni-sysv fi exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit ;; + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says + echo i586-unisys-sysv4 + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm @@ -1161,11 +1210,11 @@ EOF exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} + echo mips-nec-sysv${UNAME_RELEASE} else - echo mips-unknown-sysv${UNAME_RELEASE} + echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; @@ -1178,6 +1227,9 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; + x86_64:Haiku:*:*) + echo x86_64-unknown-haiku + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} exit ;; @@ -1204,19 +1256,21 @@ EOF exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - i386) - eval $set_cc_for_build - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - UNAME_PROCESSOR="x86_64" - fi - fi ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac + eval $set_cc_for_build + if test "$UNAME_PROCESSOR" = unknown ; then + UNAME_PROCESSOR=powerpc + fi + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1230,7 +1284,10 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1275,13 +1332,13 @@ EOF echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} + echo mips-sei-seiux${UNAME_RELEASE} exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit ;; *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` + UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; @@ -1299,11 +1356,11 @@ EOF i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - eval $set_cc_for_build cat >$dummy.c < printf ("m68k-sony-newsos%s\n", #ifdef NEWSOS4 - "4" + "4" #else - "" + "" #endif - ); exit (0); + ); exit (0); #endif #endif diff --git a/config.h.in b/config.h.in index 8fbe824..68b19bc 100644 --- a/config.h.in +++ b/config.h.in @@ -6,15 +6,30 @@ /* Define this to disable the built-in file browser. */ #undef DISABLE_BROWSER +/* Define this to disable syntax highlighting. */ +#undef DISABLE_COLOR + +/* Define this to disable extra stuff. */ +#undef DISABLE_EXTRA + /* Define this to disable the help text display. */ #undef DISABLE_HELP +/* Define this to disable search and position histories. */ +#undef DISABLE_HISTORIES + /* Define this to disable the justify routines. */ #undef DISABLE_JUSTIFY /* Define this to disable the mouse support. */ #undef DISABLE_MOUSE +/* Define this to disable multiple file buffers. */ +#undef DISABLE_MULTIBUFFER + +/* Define this to disable the use of .nanorc files. */ +#undef DISABLE_NANORC + /* Define this to disable the setting of the operating directory (chroot of sorts). */ #undef DISABLE_OPERATINGDIR @@ -25,23 +40,13 @@ /* Define this to disable the spell checker functions. */ #undef DISABLE_SPELLER -/* Define to disable the tab completion functions for files and search +/* Define this to disable the tab completion functions for files and search strings. */ #undef DISABLE_TABCOMP /* Define this to disable all text wrapping. */ #undef DISABLE_WRAPPING -/* Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC - too! */ -#undef ENABLE_COLOR - -/* Define this to enable multiple file buffers. */ -#undef ENABLE_MULTIBUFFER - -/* Define this to use .nanorc files. */ -#undef ENABLE_NANORC - /* Define to 1 if translation of program messages to the user's native language is requested. */ #undef ENABLE_NLS @@ -51,7 +56,7 @@ mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()). */ #undef ENABLE_UTF8 -/* Define if the system supports GNU-style word boundaries in regexes. */ +/* Define this if the system supports GNU-style word boundaries in regexes. */ #undef GNU_WORDBOUNDS /* Define to 1 if you have the header file. */ @@ -103,9 +108,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H +/* Define to 1 if you have the `magic' library (-lmagic). */ +#undef HAVE_LIBMAGIC + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H +/* Define to 1 if you have the header file. */ +#undef HAVE_MAGIC_H + /* Define to 1 if you have the `mblen' function. */ #undef HAVE_MBLEN @@ -127,6 +141,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_REGEX_H +/* Define to 1 if you have the `snprintf' function. */ +#undef HAVE_SNPRINTF + /* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H @@ -187,8 +204,8 @@ /* Define to 1 if you have the `wcwidth' function. */ #undef HAVE_WCWIDTH -/* Define this to enable extra stuff. */ -#undef NANO_EXTRA +/* Define to 1 if you have the header file. */ +#undef HAVE_ZLIB_H /* Define this to make the nano executable as small as possible. */ #undef NANO_TINY @@ -224,12 +241,12 @@ /* Where data are placed to. */ #undef PKGDATADIR -/* Specify alternate rcfile name (default: .nanorc) */ +/* Specify an alternate rcfile name (default: .nanorc). */ #undef RCFILE_NAME /* Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug */ -#undef REDEFINIG_MACROS_OK +#undef REDEFINING_MACROS_OK /* Define as the return type of signal handlers (`int' or `void'). */ #undef RETSIGTYPE @@ -237,7 +254,8 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to use the slang wrappers for curses instead of native curses. */ +/* Define this to use the slang wrappers for curses instead of native curses. + */ #undef USE_SLANG /* Enable extensions on AIX 3, Interix. */ @@ -265,6 +283,11 @@ /* Version number of package */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/config.sub b/config.sub index 2a55a50..9633db7 100755 --- a/config.sub +++ b/config.sub @@ -1,38 +1,31 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 -# Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2009-11-20' +timestamp='2013-08-10' -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see . # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). -# Please send patches to . Submit a context -# diff and a properly formatted GNU ChangeLog entry. +# Please send patches with a ChangeLog entry to config-patches@gnu.org. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. @@ -75,8 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright 1992-2013 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -123,13 +115,18 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | \ kopensolaris*-gnu* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -152,12 +149,12 @@ case $os in -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray | -microblaze) + -apple | -axis | -knuth | -cray | -microblaze*) os= basic_machine=$1 ;; - -bluegene*) - os=-cnk + -bluegene*) + os=-cnk ;; -sim | -cisco | -oki | -wec | -winbond) os= @@ -173,10 +170,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -221,6 +218,12 @@ case $os in -isc*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; -lynx*) os=-lynxos ;; @@ -245,20 +248,27 @@ case $basic_machine in # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -276,34 +286,45 @@ case $basic_machine in | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ | moxie \ | mt \ | msp430 \ - | nios | nios2 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | or32 \ + | open8 \ + | or1k | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -313,6 +334,21 @@ case $basic_machine in basic_machine=mt-unknown ;; + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -327,25 +363,30 @@ case $basic_machine in # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -363,29 +404,34 @@ case $basic_machine in | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ | mt-* \ | msp430-* \ - | nios-* | nios2-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -410,7 +456,7 @@ case $basic_machine in basic_machine=a29k-amd os=-udi ;; - abacus) + abacus) basic_machine=abacus-unknown ;; adobe68k) @@ -480,11 +526,20 @@ case $basic_machine in basic_machine=powerpc-ibm os=-cnk ;; + c54x-*) + basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; c90) basic_machine=c90-cray os=-unicos ;; - cegcc) + cegcc) basic_machine=arm-unknown os=-cegcc ;; @@ -516,7 +571,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -674,7 +729,6 @@ case $basic_machine in i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -732,11 +786,15 @@ case $basic_machine in basic_machine=ns32k-utek os=-sysv ;; - microblaze) + microblaze*) basic_machine=microblaze-xilinx ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -771,10 +829,18 @@ case $basic_machine in ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i686-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -839,6 +905,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -921,9 +993,10 @@ case $basic_machine in ;; power) basic_machine=power-ibm ;; - ppc) basic_machine=powerpc-unknown + ppc | ppcbe) basic_machine=powerpc-unknown ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown @@ -948,7 +1021,11 @@ case $basic_machine in basic_machine=i586-unknown os=-pw32 ;; - rdos) + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) basic_machine=i386-pc os=-rdos ;; @@ -1017,6 +1094,9 @@ case $basic_machine in basic_machine=i860-stratus os=-sysv4 ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; sun2) basic_machine=m68000-sun ;; @@ -1073,20 +1153,8 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1156,6 +1224,9 @@ case $basic_machine in xps | xps100) basic_machine=xps100-honeywell ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` + ;; ymp) basic_machine=ymp-cray os=-unicos @@ -1253,11 +1324,11 @@ esac if [ x"$os" != x"" ] then case $os in - # First match some system type aliases - # that might get confused with valid system types. + # First match some system type aliases + # that might get confused with valid system types. # -solaris* is a basic system type, with this one exception. - -auroraux) - os=-auroraux + -auroraux) + os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` @@ -1281,20 +1352,21 @@ case $os in -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ - | -sym* | -kopensolaris* \ + | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ + | -bitrig* | -openbsd* | -solidbsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ @@ -1341,7 +1413,7 @@ case $os in -opened*) os=-openedition ;; - -os400*) + -os400*) os=-os400 ;; -wince*) @@ -1390,7 +1462,7 @@ case $os in -sinix*) os=-sysv4 ;; - -tpf*) + -tpf*) os=-tpf ;; -triton*) @@ -1426,15 +1498,14 @@ case $os in -aros*) os=-aros ;; - -kaos*) - os=-kaos - ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; + -nacl*) + ;; -none) ;; *) @@ -1457,10 +1528,10 @@ else # system, and we'll never get to this point. case $basic_machine in - score-*) + score-*) os=-elf ;; - spu-*) + spu-*) os=-elf ;; *-acorn) @@ -1472,8 +1543,23 @@ case $basic_machine in arm*-semi) os=-aout ;; - c4x-* | tic4x-*) - os=-coff + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff ;; # This must come before the *-dec entry. pdp10-*) @@ -1493,14 +1579,11 @@ case $basic_machine in ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout ;; - mep-*) + mep-*) os=-elf ;; mips*-cisco) @@ -1509,6 +1592,9 @@ case $basic_machine in mips*-*) os=-elf ;; + or1k-*) + os=-elf + ;; or32-*) os=-coff ;; @@ -1527,7 +1613,7 @@ case $basic_machine in *-ibm) os=-aix ;; - *-knuth) + *-knuth) os=-mmixware ;; *-wec) diff --git a/configure b/configure index 238dbf9..091dad0 100755 --- a/configure +++ b/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for GNU nano 2.2.6. +# Generated by GNU Autoconf 2.69 for GNU nano 2.4.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -91,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -135,6 +134,31 @@ 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. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +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 + 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 : emulate sh @@ -168,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || 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'\" && @@ -213,14 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + 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 +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +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 +exit 255 fi if test x$as_have_required = xno; then : @@ -319,10 +355,18 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -359,19 +403,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + 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 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -444,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits 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; } + # 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 + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -478,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -499,28 +547,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -533,7 +561,7 @@ test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -552,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU nano' PACKAGE_TARNAME='nano' -PACKAGE_VERSION='2.2.6' -PACKAGE_STRING='GNU nano 2.2.6' +PACKAGE_VERSION='2.4.0' +PACKAGE_STRING='GNU nano 2.4.0' PACKAGE_BUGREPORT='nano-devel@gnu.org' PACKAGE_URL='http://www.gnu.org/software/nano/' @@ -594,19 +622,27 @@ ac_includes_default="\ # include #endif" +ac_header_list= ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS +HAVE_MAKEINFO_FALSE +HAVE_MAKEINFO_TRUE +haveit GROFF_HTML_FALSE GROFF_HTML_TRUE CURSES_LIB +NCURSESW_CONFIG +NCURSES_LIBS +NCURSES_CFLAGS +NCURSESW_LIBS +NCURSESW_CFLAGS GLIB_MKENUMS GOBJECT_QUERY GLIB_GENMARSHAL GLIB_LIBS GLIB_CFLAGS -PKG_CONFIG USE_NANORC_FALSE USE_NANORC_TRUE USE_COLOR_FALSE @@ -626,6 +662,9 @@ XGETTEXT GMSGFMT MSGFMT MKINSTALLDIRS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH +PKG_CONFIG LN_S EGREP GREP @@ -633,6 +672,7 @@ CPP am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -646,6 +686,10 @@ CPPFLAGS LDFLAGS CFLAGS CC +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -669,10 +713,6 @@ am__isrc INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM -target_os -target_vendor -target_cpu -target host_os host_vendor host_cpu @@ -722,6 +762,7 @@ SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_dependency_tracking enable_largefile with_gnu_ld @@ -729,26 +770,28 @@ enable_rpath with_libiconv_prefix enable_nls with_libintl_prefix -enable_debug -enable_tiny -enable_extra enable_browser +enable_color +enable_extra enable_help +enable_histories enable_justify +enable_libmagic enable_mouse +enable_multibuffer +enable_nanorc enable_operatingdir enable_speller enable_tabcomp enable_wrapping enable_wrapping_as_root -enable_color -enable_multibuffer -enable_nanorc -enable_all +enable_debug +enable_tiny enable_utf8 -with_slang enable_altrcname +with_slang enable_glibtest +with_wordbounds ' ac_precious_vars='build_alias host_alias @@ -758,7 +801,14 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR +NCURSESW_CFLAGS +NCURSESW_LIBS +NCURSES_CFLAGS +NCURSES_LIBS' # Initialize some variables set by options. @@ -821,8 +871,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -867,7 +918,7 @@ 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'` case $ac_user_opts in @@ -893,7 +944,7 @@ 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'` case $ac_user_opts in @@ -1097,7 +1148,7 @@ 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'` case $ac_user_opts in @@ -1113,7 +1164,7 @@ 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'` case $ac_user_opts in @@ -1143,8 +1194,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1152,7 +1203,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1162,7 +1213,7 @@ Try \`$0 --help' for more information." $as_echo "$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 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1170,13 +1221,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1199,7 +1250,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1213,8 +1264,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1229,9 +1278,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1270,11 +1319,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1300,7 +1349,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GNU nano 2.2.6 to adapt to many kinds of systems. +\`configure' configures GNU nano 2.4.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1314,7 +1363,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1365,13 +1414,12 @@ Program names: System types: --build=BUILD configure for building on BUILD [guessed] --host=HOST cross-compile to build programs to run on HOST [BUILD] - --target=TARGET configure for building compilers for TARGET [HOST] _ACEOF fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU nano 2.2.6:";; + short | recursive ) echo "Configuration of GNU nano 2.4.0:";; esac cat <<\_ACEOF @@ -1379,29 +1427,36 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --disable-largefile omit support for large files --disable-rpath do not hardcode runtime library paths --disable-nls do not use Native Language Support - --enable-debug Enable debugging (disabled by default) - --enable-tiny Disable features for the sake of size - --disable-extra Disable extra features, currently only easter eggs --disable-browser Disable built-in file browser + --disable-color Disable color and syntax highlighting + --disable-extra Disable extra features, currently only easter eggs --disable-help Disable help functions + --disable-histories Disable search and position histories --disable-justify Disable justify/unjustify functions + --disable-libmagic Disable detection of file types via libmagic --disable-mouse Disable mouse support (and -m flag) - --disable-operatingdir Disable setting of operating directory (chroot of sorts) + --disable-multibuffer Disable multiple file buffers + --disable-nanorc Disable use of .nanorc files + --disable-operatingdir Disable setting of operating directory (chroot of + sorts) --disable-speller Disable spell checker functions --disable-tabcomp Disable tab completion functions --disable-wrapping Disable all wrapping of text (and -w flag) - --disable-wrapping-as-root Disable wrapping of text as root by default - --disable-color Disable color and syntax highlighting - --disable-multibuffer Disable multiple file buffers - --disable-nanorc Disable use of .nanorc files - --enable-all Enable ALL extra nano functionality (ignored for compatibility as all options default to on) + --disable-wrapping-as-root + Disable wrapping of text as root by default + --enable-debug Enable debugging (disabled by default) + --enable-tiny Disable features for the sake of size --enable-utf8 Enable UTF-8 support - --enable-altrcname Specify alternate rcfile name (default: .nanorc) + --enable-altrcname Specify an alternate rcfile name (default: .nanorc) --disable-glibtest do not try to compile and run a test GLIB program Optional Packages: @@ -1412,7 +1467,8 @@ Optional Packages: --without-libiconv-prefix don't search for libiconv in includedir and libdir --with-libintl-prefix=DIR search for libintl in DIR/include and DIR/lib --without-libintl-prefix don't search for libintl in includedir and libdir - --with-slang=DIR Use the slang library instead of curses + --with-slang=DIR Use the slang library instead of curses + --with-wordbounds Use GNU-style word boundary delimiters Some influential environment variables: CC C compiler command @@ -1423,6 +1479,19 @@ Some influential environment variables: CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor + PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path + NCURSESW_CFLAGS + C compiler flags for NCURSESW, overriding pkg-config + NCURSESW_LIBS + linker flags for NCURSESW, overriding pkg-config + NCURSES_CFLAGS + C compiler flags for NCURSES, overriding pkg-config + NCURSES_LIBS + linker flags for NCURSES, overriding pkg-config Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@ -1492,10 +1561,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU nano configure 2.2.6 -generated by GNU Autoconf 2.65 +GNU nano configure 2.4.0 +generated by GNU Autoconf 2.69 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1539,7 +1608,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1565,7 +1634,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1576,7 +1645,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1589,10 +1658,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1628,7 +1697,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +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; } @@ -1651,17 +1720,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} $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;} -( cat <<\_ASBOX -## --------------------------------- ## +( $as_echo "## --------------------------------- ## ## Report this to nano-devel@gnu.org ## -## --------------------------------- ## -_ASBOX +## --------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1670,7 +1737,7 @@ 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1711,7 +1778,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1725,7 +1792,7 @@ 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1743,7 +1810,7 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1774,7 +1841,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1788,7 +1855,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1801,7 +1868,7 @@ 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 { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1856,15 +1923,15 @@ fi eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >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 GNU nano $as_me 2.2.6, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by GNU nano $as_me 2.4.0, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -1974,11 +2041,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2012,11 +2077,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2029,11 +2092,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2047,11 +2108,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2106,7 +2165,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # 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 elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2121,7 +2185,11 @@ do { $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;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$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 done @@ -2142,6 +2210,8 @@ $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi +as_fn_append ac_header_list " magic.h" +as_fn_append ac_header_list " zlib.h" # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false @@ -2197,7 +2267,7 @@ if $ac_cache_corrupted; then $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 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2213,16 +2283,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2236,27 +2312,27 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2274,14 +2350,14 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -2289,7 +2365,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2305,46 +2381,7 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host -else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; -esac -target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - -# The aliases save the names the user supplied, while $host etc. -# will get canonicalized. -test -n "$target_alias" && - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- -am__api_version='1.11' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -2363,7 +2400,7 @@ am__api_version='1.11' { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2383,7 +2420,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -2441,56 +2478,71 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -2513,12 +2565,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -2530,17 +2582,17 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}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 test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2552,7 +2604,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2580,7 +2632,7 @@ if test -z "$ac_cv_prog_STRIP"; then 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 test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2592,7 +2644,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2633,7 +2685,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2643,7 +2695,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -2672,19 +2724,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - 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 test "${ac_cv_prog_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2696,7 +2742,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$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 break 2 @@ -2724,7 +2770,7 @@ done $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 { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2732,7 +2778,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# 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;; @@ -2760,13 +2806,52 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2782,7 +2867,7 @@ fi # Define the identity of the package. PACKAGE='nano' - VERSION='2.2.6' + VERSION='2.4.0' cat >>confdefs.h <<_ACEOF @@ -2810,24 +2895,77 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + + + -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi ac_config_headers="$ac_config_headers config.h" + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -2847,7 +2985,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -2880,6 +3018,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -2900,7 +3039,7 @@ if test -n "$ac_tool_prefix"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2912,7 +3051,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -2940,7 +3079,7 @@ if test -z "$ac_cv_prog_CC"; then 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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2952,7 +3091,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -2993,7 +3132,7 @@ if test -z "$CC"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3005,7 +3144,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -3033,7 +3172,7 @@ if test -z "$CC"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3046,7 +3185,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -3092,7 +3231,7 @@ if test -z "$CC"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3104,7 +3243,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -3136,7 +3275,7 @@ do 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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3148,7 +3287,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -3190,8 +3329,8 @@ 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; } +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 @@ -3305,9 +3444,8 @@ 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_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +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; } @@ -3349,8 +3487,8 @@ 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; } +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 @@ -3407,9 +3545,9 @@ $as_echo "$ac_try_echo"; } >&5 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. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3420,7 +3558,7 @@ 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 test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3460,8 +3598,8 @@ 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; } +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 @@ -3471,7 +3609,7 @@ 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 test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3508,7 +3646,7 @@ 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 test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3586,7 +3724,7 @@ else 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 test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3595,8 +3733,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3681,19 +3818,79 @@ 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 whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +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 + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -3727,16 +3924,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -3745,16 +3942,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -3821,7 +4018,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -3851,7 +4048,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3867,11 +4064,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -3910,7 +4107,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -3926,18 +4123,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext 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;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -3949,7 +4146,7 @@ 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 test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -3963,7 +4160,7 @@ do 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" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + 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 case `"$ac_path_GREP" --version 2>&1` in @@ -3998,7 +4195,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4012,7 +4209,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -4029,7 +4226,7 @@ do 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" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + 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 case `"$ac_path_EGREP" --version 2>&1` in @@ -4064,7 +4261,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -4079,7 +4276,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } { $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 test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4196,8 +4393,7 @@ 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 " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +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 @@ -4209,7 +4405,7 @@ done ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default" -if test "x$ac_cv_header_minix_config_h" = x""yes; then : +if test "x$ac_cv_header_minix_config_h" = xyes; then : MINIX=yes else MINIX= @@ -4231,14 +4427,14 @@ $as_echo "#define _MINIX 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; } -if test "${ac_cv_safe_to_define___extensions__+set}" = set; then : +if ${ac_cv_safe_to_define___extensions__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -4279,7 +4475,7 @@ if test -n "$ac_tool_prefix"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4291,7 +4487,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -4319,7 +4515,7 @@ if test -z "$ac_cv_prog_CC"; then 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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4331,7 +4527,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -4372,7 +4568,7 @@ if test -z "$CC"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4384,7 +4580,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -4412,7 +4608,7 @@ if test -z "$CC"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4425,7 +4621,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -4471,7 +4667,7 @@ if test -z "$CC"; then 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 test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4483,7 +4679,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -4515,7 +4711,7 @@ do 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 test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4527,7 +4723,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 @@ -4569,8 +4765,8 @@ 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; } +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 @@ -4599,7 +4795,7 @@ done { $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 test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4636,7 +4832,7 @@ 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 test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4714,7 +4910,7 @@ else 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 test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4723,8 +4919,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -4809,19 +5004,79 @@ 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 whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +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 + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : +if ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4855,16 +5110,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -4873,16 +5128,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -4950,7 +5205,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strerror in -lcposix" >&5 $as_echo_n "checking for strerror in -lcposix... " >&6; } -if test "${ac_cv_lib_cposix_strerror+set}" = set; then : +if ${ac_cv_lib_cposix_strerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -4984,7 +5239,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cposix_strerror" >&5 $as_echo "$ac_cv_lib_cposix_strerror" >&6; } -if test "x$ac_cv_lib_cposix_strerror" = x""yes; then : +if test "x$ac_cv_lib_cposix_strerror" = xyes; then : LIBS="$LIBS -lcposix" fi @@ -4999,7 +5254,7 @@ 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 test "${ac_cv_sys_largefile_CC+set}" = set; then : +if ${ac_cv_sys_largefile_CC+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_sys_largefile_CC=no @@ -5015,7 +5270,7 @@ 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]; @@ -5050,7 +5305,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; } { $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 test "${ac_cv_sys_file_offset_bits+set}" = set; then : +if ${ac_cv_sys_file_offset_bits+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -5061,7 +5316,7 @@ 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]; @@ -5085,7 +5340,7 @@ 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]; @@ -5119,7 +5374,7 @@ 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 test "${ac_cv_sys_large_files+set}" = set; then : +if ${ac_cv_sys_large_files+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -5130,7 +5385,7 @@ 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]; @@ -5154,7 +5409,7 @@ 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]; @@ -5186,71 +5441,72 @@ _ACEOF esac rm -rf conftest* fi -fi +fi - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; 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 test "${ac_cv_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi + 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_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 + break 2 + fi +done done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" +IFS=$as_save_IFS + ;; esac fi -MSGFMT="$ac_cv_path_MSGFMT" -if test "$MSGFMT" != ":"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 -$as_echo "$MSGFMT" >&6; } +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; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - # Extract the first word of "gmsgfmt", so it can be a program name with args. -set dummy gmsgfmt; ac_word=$2 + +fi +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 test "${ac_cv_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else - case $GMSGFMT in + case $ac_pt_PKG_CONFIG in [\\/]* | ?:[\\/]*) - ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -5259,8 +5515,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + 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 break 2 fi @@ -5268,31 +5524,152 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" ;; esac fi -GMSGFMT=$ac_cv_path_GMSGFMT -if test -n "$GMSGFMT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 -$as_echo "$GMSGFMT" >&6; } +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; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi + if test "x$ac_pt_PKG_CONFIG" = x; then + PKG_CONFIG="" + 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 + PKG_CONFIG=$ac_pt_PKG_CONFIG + fi +else + PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +fi +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=0.9.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 +$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; 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; } + PKG_CONFIG="" + fi +fi - # Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - case "$XGETTEXT" in - /*) - ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + + + + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + + + + + + # 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_path_MSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test "$MSGFMT" != ":"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 +$as_echo "$MSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of "gmsgfmt", so it can be a program name with args. +set dummy gmsgfmt; 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_GMSGFMT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $GMSGFMT in + [\\/]* | ?:[\\/]*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. + ;; + *) + 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_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" + $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 + + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" + ;; +esac +fi +GMSGFMT=$ac_cv_path_GMSGFMT +if test -n "$GMSGFMT"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 +$as_echo "$GMSGFMT" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + # Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; 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_XGETTEXT+:} false; then : + $as_echo_n "(cached) " >&6 +else + case "$XGETTEXT" in + /*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" @@ -5326,7 +5703,7 @@ fi set dummy msgmerge; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGMERGE" in @@ -5449,7 +5826,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5 $as_echo_n "checking for non-GNU ld... " >&6; } fi -if test "${acl_cv_path_LD+set}" = set; then : +if ${acl_cv_path_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$LD"; then @@ -5482,10 +5859,10 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } -if test "${acl_cv_prog_gnu_ld+set}" = set; then : +if ${acl_cv_prog_gnu_ld+:} false; then : $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU ld's only accept -v. @@ -5503,7 +5880,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5 $as_echo_n "checking for shared library run path origin... " >&6; } -if test "${acl_cv_rpath+set}" = set; then : +if ${acl_cv_rpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -5959,7 +6336,7 @@ $as_echo "$USE_NLS" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5 $as_echo_n "checking for GNU gettext in libc... " >&6; } -if test "${gt_cv_func_gnugettext2_libc+set}" = set; then : +if ${gt_cv_func_gnugettext2_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -6020,7 +6397,7 @@ $as_echo "$gt_cv_func_gnugettext2_libc" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6473,7 +6850,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } -if test "${gt_cv_func_gnugettext2_libintl+set}" = set; then : +if ${gt_cv_func_gnugettext2_libintl+:} false; then : $as_echo_n "(cached) " >&6 else gt_save_CPPFLAGS="$CPPFLAGS" @@ -6646,367 +7023,314 @@ _ACEOF -{ $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 test "${ac_cv_header_stdc+set}" = set; 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; -} +for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.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 -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 +done -_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* +# Check whether --enable-browser was given. +if test "${enable_browser+set}" = set; then : + enableval=$enable_browser; 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 +if test "x$enable_browser" = xno; then -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : +$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h -else - ac_cv_header_stdc=no fi -rm -f conftest* +# Check whether --enable-color was given. +if test "${enable_color+set}" = set; then : + enableval=$enable_color; 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 +if test "x$enable_nanorc" = xno; then + if test "x$enable_color" = xyes; then + as_fn_error $? "--enable-color cannot work with --disable-nanorc" "$LINENO" 5 + else + # Disabling nanorc silently disables color support. + enable_color=no + fi +fi +if test "x$enable_color" = xno; then -#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 : +$as_echo "#define DISABLE_COLOR 1" >>confdefs.h 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 + if test x$ac_cv_header_regex_h != xyes; then + as_fn_error $? " +*** The header file regex.h was not found. If you wish to have +*** color support, this header file is required. Please either +*** install C libraries that include the regex.h file, or call +*** the configure script with --disable-color." "$LINENO" 5 + else + color_support=yes + fi fi +# Check whether --enable-extra was given. +if test "${enable_extra+set}" = set; then : + enableval=$enable_extra; 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 +if test "x$enable_extra" = xno; then -for ac_header in getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.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" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF +$as_echo "#define DISABLE_EXTRA 1" >>confdefs.h fi -done - +# Check whether --enable-help was given. +if test "${enable_help+set}" = set; then : + enableval=$enable_help; +fi +if test "x$enable_help" = xno; then -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; if test x$enableval = xyes; then +$as_echo "#define DISABLE_HELP 1" >>confdefs.h -$as_echo "#define DEBUG 1" >>confdefs.h - debug_support=yes -fi fi +# Check whether --enable-histories was given. +if test "${enable_histories+set}" = set; then : + enableval=$enable_histories; +fi -if test x$debug_support != xyes; then +if test "x$enable_histories" = xno; then -$as_echo "#define NDEBUG 1" >>confdefs.h +$as_echo "#define DISABLE_HISTORIES 1" >>confdefs.h fi -# Check whether --enable-tiny was given. -if test "${enable_tiny+set}" = set; then : - enableval=$enable_tiny; if test x$enableval = xyes; then +# Check whether --enable-justify was given. +if test "${enable_justify+set}" = set; then : + enableval=$enable_justify; +fi -$as_echo "#define NANO_TINY 1" >>confdefs.h - tiny_support=yes +if test "x$enable_justify" = xno; then -$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h +$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h +fi -$as_echo "#define DISABLE_HELP 1" >>confdefs.h +# Check whether --enable-libmagic was given. +if test "${enable_libmagic+set}" = set; then : + enableval=$enable_libmagic; +fi -$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h +# Check whether --enable-mouse was given. +if test "${enable_mouse+set}" = set; then : + enableval=$enable_mouse; +fi +if test "x$enable_mouse" = xno; then $as_echo "#define DISABLE_MOUSE 1" >>confdefs.h +fi -$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h +# Check whether --enable-multibuffer was given. +if test "${enable_multibuffer+set}" = set; then : + enableval=$enable_multibuffer; +fi +if test "x$enable_multibuffer" = xno; then -$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h +$as_echo "#define DISABLE_MULTIBUFFER 1" >>confdefs.h +fi -$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h +# Check whether --enable-nanorc was given. +if test "${enable_nanorc+set}" = set; then : + enableval=$enable_nanorc; +fi +if test "x$enable_nanorc" = xno; then -$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h +$as_echo "#define DISABLE_NANORC 1" >>confdefs.h -fi +else + nanorc_support=yes fi +# Check whether --enable-operatingdir was given. +if test "${enable_operatingdir+set}" = set; then : + enableval=$enable_operatingdir; +fi +if test "x$enable_operatingdir" = xno; then -# Check whether --enable-extra was given. -if test "${enable_extra+set}" = set; then : - enableval=$enable_extra; if test x$enableval != xno; then +$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h -$as_echo "#define NANO_EXTRA 1" >>confdefs.h - extra_support=yes fi -else - if test x$enable_tiny != xyes; then -$as_echo "#define NANO_EXTRA 1" >>confdefs.h - extra_support=yes - fi +# Check whether --enable-speller was given. +if test "${enable_speller+set}" = set; then : + enableval=$enable_speller; fi +if test "x$enable_speller" = xno; then -# Check whether --enable-browser was given. -if test "${enable_browser+set}" = set; then : - enableval=$enable_browser; if test x$enableval != xyes; then - -$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h +$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h fi -fi +# Check whether --enable-tabcomp was given. +if test "${enable_tabcomp+set}" = set; then : + enableval=$enable_tabcomp; +fi -# Check whether --enable-help was given. -if test "${enable_help+set}" = set; then : - enableval=$enable_help; if test x$enableval != xyes; then +if test "x$enable_tabcomp" = xno; then -$as_echo "#define DISABLE_HELP 1" >>confdefs.h +$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h fi -fi +# Check whether --enable-wrapping was given. +if test "${enable_wrapping+set}" = set; then : + enableval=$enable_wrapping; +fi -# Check whether --enable-justify was given. -if test "${enable_justify+set}" = set; then : - enableval=$enable_justify; if test x$enableval != xyes; then +if test "x$enable_wrapping" = xno; then -$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h +$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h fi -fi +# Check whether --enable-wrapping-as-root was given. +if test "${enable_wrapping_as_root+set}" = set; then : + enableval=$enable_wrapping_as_root; +fi -# Check whether --enable-mouse was given. -if test "${enable_mouse+set}" = set; then : - enableval=$enable_mouse; if test x$enableval != xyes; then +if test "x$enable_wrapping_as_root" = xno; then -$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h +$as_echo "#define DISABLE_ROOTWRAPPING 1" >>confdefs.h fi + +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; fi +if test "x$enable_debug" = xyes; then -# Check whether --enable-operatingdir was given. -if test "${enable_operatingdir+set}" = set; then : - enableval=$enable_operatingdir; if test x$enableval != xyes; then +$as_echo "#define DEBUG 1" >>confdefs.h -$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h +else + +$as_echo "#define NDEBUG 1" >>confdefs.h -fi fi +# Check whether --enable-tiny was given. +if test "${enable_tiny+set}" = set; then : + enableval=$enable_tiny; +fi -# Check whether --enable-speller was given. -if test "${enable_speller+set}" = set; then : - enableval=$enable_speller; if test x$enableval != xyes; then +if test "x$enable_tiny" = xyes; then -$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h +$as_echo "#define NANO_TINY 1" >>confdefs.h -fi -fi + if test "x$enable_browser" != xyes; then +$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h -# Check whether --enable-tabcomp was given. -if test "${enable_tabcomp+set}" = set; then : - enableval=$enable_tabcomp; if test x$enableval != xyes; then + fi + if test "x$enable_color" != xyes; then -$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h +$as_echo "#define DISABLE_COLOR 1" >>confdefs.h -fi -fi + color_support=no + else + if test "x$enable_nanorc" != xyes; then + as_fn_error $? "--enable-color with --enable-tiny cannot work without --enable-nanorc" "$LINENO" 5 + fi + fi + if test "x$enable_extra" != xyes; then +$as_echo "#define DISABLE_EXTRA 1" >>confdefs.h -# Check whether --enable-wrapping was given. -if test "${enable_wrapping+set}" = set; then : - enableval=$enable_wrapping; if test x$enableval != xyes; then + fi + if test "x$enable_help" != xyes; then -$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h +$as_echo "#define DISABLE_HELP 1" >>confdefs.h -fi -fi + fi + if test "x$enable_histories" != xyes; then +$as_echo "#define DISABLE_HISTORIES 1" >>confdefs.h -# Check whether --enable-wrapping-as-root was given. -if test "${enable_wrapping_as_root+set}" = set; then : - enableval=$enable_wrapping_as_root; if test x$enableval != xyes; then + fi + if test "x$enable_justify" != xyes; then -$as_echo "#define DISABLE_ROOTWRAPPING 1" >>confdefs.h +$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h -fi -fi + fi + if test "x$enable_libmagic" != xyes; then + enable_libmagic=no + fi + if test "x$enable_mouse" != xyes; then +$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h -# Check whether --enable-color was given. -if test "${enable_color+set}" = set; then : - enableval=$enable_color; if test x$enableval != xno; then - if test x$ac_cv_header_regex_h = xyes; then + fi + if test "x$enable_multibuffer" != xyes; then -$as_echo "#define ENABLE_NANORC 1" >>confdefs.h - nanorc_support=yes +$as_echo "#define DISABLE_MULTIBUFFER 1" >>confdefs.h -$as_echo "#define ENABLE_COLOR 1" >>confdefs.h - color_support=yes - else - as_fn_error " -*** The header file regex.h was not found. If you wish to use color -*** support this header file is required. Please either install C -*** libraries that include the regex.h file or call the configure -*** script with --disable-color." "$LINENO" 5 fi -fi -else - if test x$enable_tiny != xyes; then - if test x$ac_cv_header_regex_h = xyes; then + if test "x$enable_nanorc" != xyes; then -$as_echo "#define ENABLE_NANORC 1" >>confdefs.h - nanorc_support=yes +$as_echo "#define DISABLE_NANORC 1" >>confdefs.h -$as_echo "#define ENABLE_COLOR 1" >>confdefs.h - color_support=yes - else - as_fn_error " -*** The header file regex.h was not found. If you wish to use color -*** support this header file is required. Please either install C -*** libraries that include the regex.h file or call the configure -*** script with --disable-color." "$LINENO" 5 - fi fi + if test "x$enable_operatingdir" != xyes; then -fi - +$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h -# Check whether --enable-multibuffer was given. -if test "${enable_multibuffer+set}" = set; then : - enableval=$enable_multibuffer; if test x$enableval != xno; then + fi + if test "x$enable_speller" != xyes; then -$as_echo "#define ENABLE_MULTIBUFFER 1" >>confdefs.h - multibuffer_support=yes -fi -else - if test x$enable_tiny != xyes; then +$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h -$as_echo "#define ENABLE_MULTIBUFFER 1" >>confdefs.h - multibuffer_support=yes fi -fi + if test "x$enable_tabcomp" != xyes; then +$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h -# Check whether --enable-nanorc was given. -if test "${enable_nanorc+set}" = set; then : - enableval=$enable_nanorc; if test x$enableval != xno; then + fi + if test "x$enable_wrapping" != xyes; then -$as_echo "#define ENABLE_NANORC 1" >>confdefs.h - nanorc_support=yes -fi -else - if test x$enable_tiny != xyes; then +$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h -$as_echo "#define ENABLE_NANORC 1" >>confdefs.h - nanorc_support=yes fi fi - -# Check whether --enable-all was given. -if test "${enable_all+set}" = set; then : - enableval=$enable_all; if test x$enableval = xyes; then - echo "--enable-all option no longer needed, ignoring for compatibility" + if test x$color_support = xyes; then + USE_COLOR_TRUE= + USE_COLOR_FALSE='#' +else + USE_COLOR_TRUE='#' + USE_COLOR_FALSE= fi + + if test x$nanorc_support = xyes; then + USE_NANORC_TRUE= + USE_NANORC_FALSE='#' +else + USE_NANORC_TRUE='#' + USE_NANORC_FALSE= fi @@ -7014,17 +7338,24 @@ fi $as_echo_n "checking whether to enable UTF-8 support... " >&6; } # Check whether --enable-utf8 was given. if test "${enable_utf8+set}" = set; then : - enableval=$enable_utf8; if test x$enableval = xyes; then - enable_utf8=yes -else - enable_utf8=no + enableval=$enable_utf8; +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${enable_utf8:-auto}" >&5 +$as_echo "${enable_utf8:-auto}" >&6; } + +# Check whether --enable-altrcname was given. +if test "${enable_altrcname+set}" = set; then : + enableval=$enable_altrcname; if test x$enableval != no; then + +cat >>confdefs.h <<_ACEOF +#define RCFILE_NAME "$enableval" +_ACEOF + rcfilename=$enableval fi -else - enable_utf8=auto fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_utf8" >&5 -$as_echo "$enable_utf8" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use slang" >&5 $as_echo_n "checking whether to use slang... " >&6; } @@ -7042,14 +7373,14 @@ $as_echo "no" >&6; } $as_echo "yes" >&6; } if test x$with_slang != xyes; then - # Add additional search path + # Add additional search path. LDFLAGS="-L$with_slang/lib $LDFLAGS" CPPFLAGS="-I$with_slang/include $CPPFLAGS" fi - if test x$enable_utf8 != xno; then + if test "x$enable_utf8" != xno; then ac_fn_c_check_header_mongrel "$LINENO" "slcurses.h" "ac_cv_header_slcurses_h" "$ac_includes_default" -if test "x$ac_cv_header_slcurses_h" = x""yes; then : +if test "x$ac_cv_header_slcurses_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLutf8_enable in -lslang" >&5 $as_echo_n "checking for SLutf8_enable in -lslang... " >&6; } _libs=$LIBS @@ -7073,7 +7404,7 @@ if ac_fn_c_try_run "$LINENO"; then : $as_echo "yes" >&6; } $as_echo "#define USE_SLANG 1" >>confdefs.h - slang_support=yes + CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang" @@ -7085,12 +7416,12 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - # We might need the term library + # We might need the term library. for termlib in ncurses curses termcap terminfo termlib; do as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5 $as_echo_n "checking for tputs in -l${termlib}... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7125,8 +7456,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : tcap="-l$termlib" fi @@ -7155,7 +7485,7 @@ if ac_fn_c_try_run "$LINENO"; then : $as_echo "yes" >&6; } $as_echo "#define USE_SLANG 1" >>confdefs.h - slang_support=yes + CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap" @@ -7167,7 +7497,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - # We might need the math library + # We might need the math library. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLutf8_enable in -lslang $tcap -lm" >&5 $as_echo_n "checking for SLutf8_enable in -lslang $tcap -lm... " >&6; } LIBS="$LIBS -lm" @@ -7190,7 +7520,7 @@ if ac_fn_c_try_run "$LINENO"; then : $as_echo "yes" >&6; } $as_echo "#define USE_SLANG 1" >>confdefs.h - slang_support=yes + CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" @@ -7217,7 +7547,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi else - as_fn_error " + as_fn_error $? " *** The header file slcurses.h was not found. If you wish to use *** slang support this header file is required. Please either *** install a version of slang that includes the slcurses.h file or @@ -7228,13 +7558,13 @@ fi fi if eval "test x$CURSES_LIB_NAME = x"; then - # Reset libs if the above slang tests failed - if test x$enable_utf8 != xno; then + # Reset libs if the above slang tests failed. + if test "x$enable_utf8" != xno; then LIBS=$_libs fi ac_fn_c_check_header_mongrel "$LINENO" "slcurses.h" "ac_cv_header_slcurses_h" "$ac_includes_default" -if test "x$ac_cv_header_slcurses_h" = x""yes; then : +if test "x$ac_cv_header_slcurses_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLtt_initialize in -lslang" >&5 $as_echo_n "checking for SLtt_initialize in -lslang... " >&6; } _libs=$LIBS @@ -7258,7 +7588,7 @@ if ac_fn_c_try_run "$LINENO"; then : $as_echo "yes" >&6; } $as_echo "#define USE_SLANG 1" >>confdefs.h - slang_support=yes + if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang" else @@ -7269,12 +7599,12 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - # We might need the term library + # We might need the term library. for termlib in ncurses curses termcap terminfo termlib; do as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tputs" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tputs in -l${termlib}" >&5 $as_echo_n "checking for tputs in -l${termlib}... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7309,8 +7639,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : tcap="-l$termlib" fi @@ -7339,7 +7668,7 @@ if ac_fn_c_try_run "$LINENO"; then : $as_echo "yes" >&6; } $as_echo "#define USE_SLANG 1" >>confdefs.h - slang_support=yes + if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap" else @@ -7350,7 +7679,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - # We might need the math library + # We might need the math library. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SLtt_initialize in -lslang $tcap -lm" >&5 $as_echo_n "checking for SLtt_initialize in -lslang $tcap -lm... " >&6; } LIBS="$LIBS -lm" @@ -7373,7 +7702,7 @@ if ac_fn_c_try_run "$LINENO"; then : $as_echo "yes" >&6; } $as_echo "#define USE_SLANG 1" >>confdefs.h - slang_support=yes + if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" else @@ -7399,7 +7728,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ fi else - as_fn_error " + as_fn_error $? " *** The header file slcurses.h was not found. If you wish to use *** slang support this header file is required. Please either *** install a version of slang that includes the slcurses.h file or @@ -7424,72 +7753,13 @@ $as_echo "no" >&6; } fi -if test x$CURSES_LIB_NAME = xslang; then - -$as_echo "#define NANO_TINY 1" >>confdefs.h - tiny_support=yes - -$as_echo "#define DISABLE_BROWSER 1" >>confdefs.h - - -$as_echo "#define DISABLE_HELP 1" >>confdefs.h - - -$as_echo "#define DISABLE_JUSTIFY 1" >>confdefs.h - - -$as_echo "#define DISABLE_MOUSE 1" >>confdefs.h - - -$as_echo "#define DISABLE_OPERATINGDIR 1" >>confdefs.h - - -$as_echo "#define DISABLE_SPELLER 1" >>confdefs.h - - -$as_echo "#define DISABLE_TABCOMP 1" >>confdefs.h - - -$as_echo "#define DISABLE_WRAPPING 1" >>confdefs.h - -fi - - if test x$color_support = xyes; then - USE_COLOR_TRUE= - USE_COLOR_FALSE='#' -else - USE_COLOR_TRUE='#' - USE_COLOR_FALSE= -fi - - if test x$nanorc_support = xyes; then - USE_NANORC_TRUE= - USE_NANORC_FALSE='#' -else - USE_NANORC_TRUE='#' - USE_NANORC_FALSE= -fi - - -# Check whether --enable-altrcname was given. -if test "${enable_altrcname+set}" = set; then : - enableval=$enable_altrcname; if test x$enableval != no; then - -cat >>confdefs.h <<_ACEOF -#define RCFILE_NAME "$enableval" -_ACEOF - rcfilename=$enableval -fi -fi - -for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf +for ac_func in getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen snprintf vsnprintf 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +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 @@ -7498,13 +7768,12 @@ fi done -if test x$enable_utf8 != xno; then +if test "x$enable_utf8" != xno; then for ac_func in iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth 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" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +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 @@ -7514,7 +7783,7 @@ done fi -if test x$ac_cv_func_vsnprintf = xno; then +if test x$ac_cv_func_snprintf = xno; then # Check whether --enable-glibtest was given. if test "${enable_glibtest+set}" = set; then : enableval=$enable_glibtest; @@ -7546,7 +7815,7 @@ fi 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 test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -7560,7 +7829,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + 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 break 2 @@ -7784,103 +8053,721 @@ rm -f core conftest.err conftest.$ac_objext \ GLIB_GENMARSHAL="" GOBJECT_QUERY="" GLIB_MKENUMS="" - as_fn_error " -*** vsnprintf() not found. GLIB 2.x not found either. You should -*** install the GLIB 2.x library which can be found at -*** ftp://ftp.gtk.org/." "$LINENO" 5 + as_fn_error $? " +*** snprintf() not found. GLIB 2.x not found either. +*** You should install the GLIB 2.x library which can +*** be found at http://ftp.gtk.org/." "$LINENO" 5 + fi + + + + + + rm -f conf.glibtest + +fi + +if test x$ac_cv_func_vsnprintf = xno; then + # Check whether --enable-glibtest was given. +if test "${enable_glibtest+set}" = set; then : + enableval=$enable_glibtest; +else + enable_glibtest=yes +fi + + + pkg_config_args=glib-2.0 + for module in . glib + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + esac + done + + # 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_PKG_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + 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_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 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +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; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + + no_glib="" + + if test x$PKG_CONFIG != xno ; then + if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then + : + else + echo *** pkg-config too old; version 0.7 or better required. + no_glib=yes + PKG_CONFIG=no + fi + else + no_glib=yes + fi + + min_glib_version=2.0.0 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5 +$as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" + rm -f conf.glibtest + if test "$cross_compiling" = yes; then : + echo $ac_n "cross compiling; assumed OK... $ac_c" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + +else + no_glib=yes +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5 +$as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; } + : + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include + +int +main () +{ + return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" +else + echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed." +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + as_fn_error $? " +*** vsnprintf() not found. GLIB 2.x not found either. +*** You should install the GLIB 2.x library which can +*** be found at http://ftp.gtk.org/." "$LINENO" 5 + fi + + + + + + rm -f conf.glibtest + +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wall" >&5 +$as_echo_n "checking whether C compiler accepts -Wall... " >&6; } +if ${ax_cv_check_cflags___Wall+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ax_check_save_flags=$CFLAGS + CFLAGS="$CFLAGS -Wall" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ax_cv_check_cflags___Wall=yes +else + ax_cv_check_cflags___Wall=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS=$ax_check_save_flags +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Wall" >&5 +$as_echo "$ax_cv_check_cflags___Wall" >&6; } +if test x"$ax_cv_check_cflags___Wall" = xyes; then : + CFLAGS="$CFLAGS -Wall" +else + : +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 +$as_echo_n "checking return type of signal handlers... " >&6; } +if ${ac_cv_type_signal+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include + +int +main () +{ +return *(signal (0, 0)) (0) == 1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_type_signal=int +else + ac_cv_type_signal=void +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 +$as_echo "$ac_cv_type_signal" >&6; } + +cat >>confdefs.h <<_ACEOF +#define RETSIGTYPE $ac_cv_type_signal +_ACEOF + + +for ac_func in vprintf +do : + ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" +if test "x$ac_cv_func_vprintf" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_VPRINTF 1 +_ACEOF + +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" +if test "x$ac_cv_func__doprnt" = xyes; then : + +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h + +fi + +fi +done + + +for ac_func in getopt_long +do : + ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long" +if test "x$ac_cv_func_getopt_long" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETOPT_LONG 1 +_ACEOF + +fi +done + + + +if eval "test x$CURSES_LIB_NAME = x"; then + if test "x$enable_utf8" != xno; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSESW" >&5 +$as_echo_n "checking for NCURSESW... " >&6; } + +if test -n "$NCURSESW_CFLAGS"; then + pkg_cv_NCURSESW_CFLAGS="$NCURSESW_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSESW_CFLAGS=`$PKG_CONFIG --cflags "ncursesw" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$NCURSESW_LIBS"; then + pkg_cv_NCURSESW_LIBS="$NCURSESW_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncursesw\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncursesw") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSESW_LIBS=`$PKG_CONFIG --libs "ncursesw" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + NCURSESW_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncursesw" 2>&1` + else + NCURSESW_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncursesw" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NCURSESW_PKG_ERRORS" >&5 + + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + NCURSESW_CFLAGS=$pkg_cv_NCURSESW_CFLAGS + NCURSESW_LIBS=$pkg_cv_NCURSESW_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CURSES_LIB=$NCURSESW_LIBS + CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS" + CURSES_LIB_NAME=ncursesw + CURSES_LIB_WIDE=yes + +fi + else + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NCURSES" >&5 +$as_echo_n "checking for NCURSES... " >&6; } + +if test -n "$NCURSES_CFLAGS"; then + pkg_cv_NCURSES_CFLAGS="$NCURSES_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSES_CFLAGS=`$PKG_CONFIG --cflags "ncurses" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$NCURSES_LIBS"; then + pkg_cv_NCURSES_LIBS="$NCURSES_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ncurses\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ncurses") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_NCURSES_LIBS=`$PKG_CONFIG --libs "ncurses" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + NCURSES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ncurses" 2>&1` + else + NCURSES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ncurses" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$NCURSES_PKG_ERRORS" >&5 + + : +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + : +else + NCURSES_CFLAGS=$pkg_cv_NCURSES_CFLAGS + NCURSES_LIBS=$pkg_cv_NCURSES_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + CURSES_LIB=$NCURSES_LIBS + CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS" + CURSES_LIB_NAME=ncurses + +fi + fi +fi + +if eval "test x$CURSES_LIB_NAME = x"; then + for ac_header in ncurses.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" +if test "x$ac_cv_header_ncurses_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NCURSES_H 1 +_ACEOF + +fi + +done + + + if test "x$enable_utf8" != xno; then + OLDLIBS="$LIBS" + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ncursesw5-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}ncursesw5-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_prog_NCURSESW_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$NCURSESW_CONFIG"; then + ac_cv_prog_NCURSESW_CONFIG="$NCURSESW_CONFIG" # 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_NCURSESW_CONFIG="${ac_tool_prefix}ncursesw5-config" + $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 +NCURSESW_CONFIG=$ac_cv_prog_NCURSESW_CONFIG +if test -n "$NCURSESW_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NCURSESW_CONFIG" >&5 +$as_echo "$NCURSESW_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_NCURSESW_CONFIG"; then + ac_ct_NCURSESW_CONFIG=$NCURSESW_CONFIG + # Extract the first word of "ncursesw5-config", so it can be a program name with args. +set dummy ncursesw5-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_prog_ac_ct_NCURSESW_CONFIG+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_NCURSESW_CONFIG"; then + ac_cv_prog_ac_ct_NCURSESW_CONFIG="$ac_ct_NCURSESW_CONFIG" # 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_NCURSESW_CONFIG="ncursesw5-config" + $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 - - - - - rm -f conf.glibtest - +fi +fi +ac_ct_NCURSESW_CONFIG=$ac_cv_prog_ac_ct_NCURSESW_CONFIG +if test -n "$ac_ct_NCURSESW_CONFIG"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NCURSESW_CONFIG" >&5 +$as_echo "$ac_ct_NCURSESW_CONFIG" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi + if test "x$ac_ct_NCURSESW_CONFIG" = x; then + NCURSESW_CONFIG="no" + 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 + NCURSESW_CONFIG=$ac_ct_NCURSESW_CONFIG + fi +else + NCURSESW_CONFIG="$ac_cv_prog_NCURSESW_CONFIG" +fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if test "${ac_cv_type_signal+set}" = set; then : + if test "x$NCURSESW_CONFIG" != xno; then + CURSES_LIB=`$NCURSESW_CONFIG --libs` + LIBS="$CURSES_LIB $LIBS" + CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lncursesw" >&5 +$as_echo_n "checking for get_wch in -lncursesw... " >&6; } +if ${ac_cv_lib_ncursesw_get_wch+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncursesw $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include -#include +/* 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 get_wch (); int main () { -return *(signal (0, 0)) (0) == 1; +return get_wch (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncursesw_get_wch=yes else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - -for ac_func in vprintf -do : - ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf" -if test "x$ac_cv_func_vprintf" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_VPRINTF 1 -_ACEOF - -ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt" -if test "x$ac_cv_func__doprnt" = x""yes; then : - -$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h - -fi - + ac_cv_lib_ncursesw_get_wch=no fi -done - - -for ac_func in getopt_long -do : - ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long" -if test "x$ac_cv_func_getopt_long" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GETOPT_LONG 1 -_ACEOF - +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS fi -done - - -if eval "test x$CURSES_LIB_NAME = x"; then - for ac_header in ncurses.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default" -if test "x$ac_cv_header_ncurses_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_NCURSES_H 1 -_ACEOF - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_get_wch" >&5 +$as_echo "$ac_cv_lib_ncursesw_get_wch" >&6; } +if test "x$ac_cv_lib_ncursesw_get_wch" = xyes; then : + CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes fi -done - - - if test x$enable_utf8 != xno; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lncursesw" >&5 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lncursesw" >&5 $as_echo_n "checking for get_wch in -lncursesw... " >&6; } -if test "${ac_cv_lib_ncursesw_get_wch+set}" = set; then : +if ${ac_cv_lib_ncursesw_get_wch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7914,16 +8801,18 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_get_wch" >&5 $as_echo "$ac_cv_lib_ncursesw_get_wch" >&6; } -if test "x$ac_cv_lib_ncursesw_get_wch" = x""yes; then : - CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes +if test "x$ac_cv_lib_ncursesw_get_wch" = xyes; then : + CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes fi + fi + LIBS="$OLDLIBS" fi if eval "test x$CURSES_LIB_NAME = x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lncurses" >&5 $as_echo_n "checking for initscr in -lncurses... " >&6; } -if test "${ac_cv_lib_ncurses_initscr+set}" = set; then : +if ${ac_cv_lib_ncurses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7957,7 +8846,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_initscr" >&5 $as_echo "$ac_cv_lib_ncurses_initscr" >&6; } -if test "x$ac_cv_lib_ncurses_initscr" = x""yes; then : +if test "x$ac_cv_lib_ncurses_initscr" = xyes; then : CURSES_LIB="-lncurses" CURSES_LIB_NAME=ncurses fi @@ -7968,7 +8857,7 @@ if eval "test x$CURSES_LIB_NAME = x"; then for ac_header in curses.h do : ac_fn_c_check_header_mongrel "$LINENO" "curses.h" "ac_cv_header_curses_h" "$ac_includes_default" -if test "x$ac_cv_header_curses_h" = x""yes; then : +if test "x$ac_cv_header_curses_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CURSES_H 1 _ACEOF @@ -7978,10 +8867,10 @@ fi done - if test x$enable_utf8 != xno; then + if test "x$enable_utf8" != xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for get_wch in -lcurses" >&5 $as_echo_n "checking for get_wch in -lcurses... " >&6; } -if test "${ac_cv_lib_curses_get_wch+set}" = set; then : +if ${ac_cv_lib_curses_get_wch+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8015,16 +8904,16 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_get_wch" >&5 $as_echo "$ac_cv_lib_curses_get_wch" >&6; } -if test "x$ac_cv_lib_curses_get_wch" = x""yes; then : +if test "x$ac_cv_lib_curses_get_wch" = xyes; then : CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes fi fi if eval "test x$CURSES_LIB_NAME = x"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 $as_echo_n "checking for initscr in -lcurses... " >&6; } -if test "${ac_cv_lib_curses_initscr+set}" = set; then : +if ${ac_cv_lib_curses_initscr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8058,7 +8947,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_initscr" >&5 $as_echo "$ac_cv_lib_curses_initscr" >&6; } -if test "x$ac_cv_lib_curses_initscr" = x""yes; then : +if test "x$ac_cv_lib_curses_initscr" = xyes; then : CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses fi @@ -8082,7 +8971,7 @@ fi as_ac_Lib=`$as_echo "ac_cv_lib_$CURSES_LIB_NAME''_use_default_colors" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for use_default_colors in -l$CURSES_LIB_NAME" >&5 $as_echo_n "checking for use_default_colors in -l$CURSES_LIB_NAME... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -8117,8 +9006,7 @@ fi eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : $as_echo "#define HAVE_USE_DEFAULT_COLORS 1" >>confdefs.h @@ -8137,7 +9025,7 @@ if test "x$GLIB_LIBS" != "x"; then LDFLAGS="$LDFLAGS $GLIB_LIBS" fi -if test x$enable_utf8 != xno && \ +if test "x$enable_utf8" != xno && \ test x$CURSES_LIB_WIDE = xyes && \ test x$ac_cv_func_iswalnum = xyes && \ test x$ac_cv_func_iswpunct = xyes && \ @@ -8152,14 +9040,14 @@ if test x$enable_utf8 != xno && \ $as_echo "#define ENABLE_UTF8 1" >>confdefs.h else - if test x$enable_utf8 = xyes; then - as_fn_error " + if test "x$enable_utf8" = xyes; then + as_fn_error $? " *** UTF-8 support was requested, but insufficient UTF-8 support was *** detected in your curses and/or C libraries. Please verify that your *** slang was built with UTF-8 support or your curses was built with *** wide character support, and that your C library was built with wide *** character support." "$LINENO" 5 - elif test x$enable_utf8 != xno; then + elif test "x$enable_utf8" != xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Insufficient UTF-8 support was detected in your curses and/or C *** libraries. If you want UTF-8 support, please verify that your slang @@ -8176,10 +9064,32 @@ $as_echo "$as_me: WARNING: fi if test x$color_support = xyes; then - # now check for the end of word boundary support (/< and />) + # Now check for the end-of-word boundary support (/< and />). { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU-style word boundary regex support" >&5 $as_echo_n "checking for GNU-style word boundary regex support... " >&6; } - if test "$cross_compiling" = yes; then : + + +# Check whether --with-wordbounds was given. +if test "${with_wordbounds+set}" = set; then : + withval=$with_wordbounds; case "$with_wordbounds" in + no) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + # We explicitly don't check if the user forced the option, because + # this is needed for cross compilers and we can't test the target. + +$as_echo "#define GNU_WORDBOUNDS 1" >>confdefs.h + gnu_wordbounds=yes, + ;; + esac + +else + + if test "$cross_compiling" = yes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Can't check for GNU-style word boundary support when cross-compiling" >&5 $as_echo "$as_me: WARNING: *** Can't check for GNU-style word boundary support when cross-compiling" >&2;} @@ -8198,9 +9108,9 @@ int main(void) regmatch_t pmatch; if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB)) - return 1; + return 1; if (regexec(&r, "word boundary", nmatch, &pmatch, 0)) - return 1; + return 1; return 0; } _ACEOF @@ -8218,6 +9128,10 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi + +fi + + # if test x$CURSES_LIB_NAME = xcurses; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE_EXTENDED is needed" >&5 $as_echo_n "checking whether _XOPEN_SOURCE_EXTENDED is needed... " >&6; } @@ -8242,8 +9156,8 @@ else 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;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8303,7 +9217,7 @@ int main(void) _ACEOF if ac_fn_c_try_run "$LINENO"; then : -$as_echo "#define REDEFINIG_MACROS_OK 1" >>confdefs.h +$as_echo "#define REDEFINING_MACROS_OK 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -8317,17 +9231,138 @@ fi -# Check for groff html support + + + for ac_header in $ac_header_list +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 + +done + + + + + +if test "x$enable_libmagic" != "xno"; then : + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_open in -lmagic" >&5 +$as_echo_n "checking for magic_open in -lmagic... " >&6; } +if ${ac_cv_lib_magic_magic_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmagic $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 magic_open (); +int +main () +{ +return magic_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_magic_magic_open=yes +else + ac_cv_lib_magic_magic_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_open" >&5 +$as_echo "$ac_cv_lib_magic_magic_open" >&6; } +if test "x$ac_cv_lib_magic_magic_open" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBMAGIC 1 +_ACEOF + + LIBS="-lmagic $LIBS" + +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inflate in -lz" >&5 +$as_echo_n "checking for inflate in -lz... " >&6; } +if ${ac_cv_lib_z_inflate+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lz $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 inflate (); +int +main () +{ +return inflate (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_z_inflate=yes +else + ac_cv_lib_z_inflate=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_inflate" >&5 +$as_echo "$ac_cv_lib_z_inflate" >&6; } +if test "x$ac_cv_lib_z_inflate" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF + + LIBS="-lz $LIBS" + +fi + + +fi + +# Check for groff html support. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HTML support in groff" >&5 $as_echo_n "checking for HTML support in groff... " >&6; } groff -t -mandoc -Thtml /dev/null if test $? -ne 0 ; then - echo "no" - echo "*** Will not generate HTML version of man pages ***" - echo "*** Consider installing a newer version of groff with HTML support ***" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Will not generate HTML version of man pages *** +*** Consider installing a newer version of groff with HTML support ***" >&5 +$as_echo "$as_me: WARNING: *** Will not generate HTML version of man pages *** +*** Consider installing a newer version of groff with HTML support ***" >&2;} groff_html_support=no else - echo "yes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } groff_html_support=yes fi if test x$groff_html_support = xyes; then @@ -8339,6 +9374,54 @@ else fi +# Check for the availability of makeinfo. +# Extract the first word of "makeinfo", so it can be a program name with args. +set dummy makeinfo; 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_haveit+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$haveit"; then + ac_cv_prog_haveit="$haveit" # 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_haveit="yes" + $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 + + test -z "$ac_cv_prog_haveit" && ac_cv_prog_haveit="no" +fi +fi +haveit=$ac_cv_prog_haveit +if test -n "$haveit"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $haveit" >&5 +$as_echo "$haveit" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test x$haveit = xyes; then + HAVE_MAKEINFO_TRUE= + HAVE_MAKEINFO_FALSE='#' +else + HAVE_MAKEINFO_TRUE='#' + HAVE_MAKEINFO_FALSE= +fi + + ac_config_files="$ac_config_files Makefile doc/Makefile doc/nanorc.sample doc/man/Makefile doc/man/fr/Makefile doc/syntax/Makefile doc/texinfo/Makefile m4/Makefile po/Makefile.in src/Makefile nano.spec" @@ -8407,10 +9490,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + 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;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + 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;} @@ -8426,6 +9520,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +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$//' @@ -8440,6 +9535,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -8449,35 +9552,39 @@ else fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_NLS_TRUE}" && test -z "${USE_NLS_FALSE}"; then - as_fn_error "conditional \"USE_NLS\" was never defined. + as_fn_error $? "conditional \"USE_NLS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_COLOR_TRUE}" && test -z "${USE_COLOR_FALSE}"; then - as_fn_error "conditional \"USE_COLOR\" was never defined. + as_fn_error $? "conditional \"USE_COLOR\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${USE_NANORC_TRUE}" && test -z "${USE_NANORC_FALSE}"; then - as_fn_error "conditional \"USE_NANORC\" was never defined. + as_fn_error $? "conditional \"USE_NANORC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GROFF_HTML_TRUE}" && test -z "${GROFF_HTML_FALSE}"; then - as_fn_error "conditional \"GROFF_HTML\" was never defined. + as_fn_error $? "conditional \"GROFF_HTML\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_MAKEINFO_TRUE}" && test -z "${HAVE_MAKEINFO_FALSE}"; then + as_fn_error $? "conditional \"HAVE_MAKEINFO\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -8578,6 +9685,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -8623,19 +9731,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + 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 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -8773,16 +9881,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -8831,7 +9939,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -8842,28 +9950,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -8884,8 +9980,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU nano $as_me 2.2.6, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by GNU nano $as_me 2.4.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8952,11 +10048,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU nano config.status 2.2.6 -configured by $0, generated by GNU Autoconf 2.65, +GNU nano config.status 2.4.0 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8974,11 +10070,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -9000,6 +10101,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -9012,7 +10114,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -9021,7 +10123,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -9041,7 +10143,7 @@ fi _ACEOF 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 + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -9097,7 +10199,7 @@ do "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "nano.spec") CONFIG_FILES="$CONFIG_FILES nano.spec" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -9120,9 +10222,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -9130,12 +10233,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -9152,12 +10256,12 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -9166,18 +10270,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -9185,7 +10289,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -9233,7 +10337,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -9265,21 +10369,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -9291,7 +10403,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -9303,11 +10415,11 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -9392,7 +10504,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -9405,7 +10517,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9424,7 +10536,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -9433,7 +10545,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + 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 as_fn_append ac_file_inputs " '$ac_f'" @@ -9459,8 +10571,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -9596,23 +10708,24 @@ s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { 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' -which seems to be undefined. Please make sure it is defined." >&5 +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' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -9621,21 +10734,21 @@ which seems to be undefined. Please make sure it is defined." >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && 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;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -9681,7 +10794,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -9694,7 +10807,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -9728,21 +10841,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -9881,7 +10992,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -9902,7 +11013,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $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 diff --git a/configure.ac b/configure.ac index 6388c03..424cf55 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # Configuration for GNU nano - a small and user-friendly text editor # -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +# 2008, 2009, 2010, 2011, 2013, 2014 Free Software Foundation, Inc. # # GNU nano is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the @@ -18,15 +18,17 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, # USA. # -# $Id: configure.ac 4516 2010-08-11 02:42:32Z astyanax $ +# $Id: configure.ac 5127 2015-02-27 17:00:11Z astyanax $ -AC_INIT([GNU nano], [2.2.6], [nano-devel@gnu.org], [nano]) +AC_INIT([GNU nano], [2.4.0], [nano-devel@gnu.org], [nano]) AC_CONFIG_SRCDIR([src/nano.c]) -AC_CANONICAL_TARGET([]) +AC_CANONICAL_HOST AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) -AC_PREREQ(2.54) +dnl Make sure the ONCE macros are available. + +AC_PREREQ(2.61) dnl Checks for programs. @@ -35,6 +37,7 @@ AC_PROG_CC AC_PROG_LN_S AC_ISC_POSIX AC_SYS_LARGEFILE +PKG_PROG_PKG_CONFIG dnl Internationalization macros. @@ -49,166 +52,196 @@ AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.]) dnl Checks for header files. -AC_HEADER_STDC AC_CHECK_HEADERS(getopt.h libintl.h limits.h regex.h sys/param.h wchar.h wctype.h stdarg.h) dnl Checks for options. -AC_ARG_ENABLE(debug, -[ --enable-debug Enable debugging (disabled by default)], -[if test x$enableval = xyes; then - AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) debug_support=yes -fi]) - -if test x$debug_support != xyes; then - AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)]) -fi - -AC_ARG_ENABLE(tiny, -[ --enable-tiny Disable features for the sake of size], -[if test x$enableval = xyes; then - AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes +AC_ARG_ENABLE(browser, +AS_HELP_STRING([--disable-browser], [Disable built-in file browser])) +if test "x$enable_browser" = xno; then AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) - AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) - AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) - AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.]) - AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).]) - AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.]) - AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.]) - AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.]) -fi]) +fi +AC_ARG_ENABLE(color, +AS_HELP_STRING([--disable-color], [Disable color and syntax highlighting])) +if test "x$enable_nanorc" = xno; then + if test "x$enable_color" = xyes; then + AC_MSG_ERROR([--enable-color cannot work with --disable-nanorc]) + else + # Disabling nanorc silently disables color support. + enable_color=no + fi +fi +if test "x$enable_color" = xno; then + AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.]) +else + if test x$ac_cv_header_regex_h != xyes; then + AC_MSG_ERROR([ +*** The header file regex.h was not found. If you wish to have +*** color support, this header file is required. Please either +*** install C libraries that include the regex.h file, or call +*** the configure script with --disable-color.]) + else + color_support=yes + fi +fi AC_ARG_ENABLE(extra, -[ --disable-extra Disable extra features, currently only easter eggs], -[if test x$enableval != xno; then - AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes -fi], - [if test x$enable_tiny != xyes; then - AC_DEFINE(NANO_EXTRA, 1, [Define this to enable extra stuff.]) extra_support=yes - fi]) - -AC_ARG_ENABLE(browser, -[ --disable-browser Disable built-in file browser], -[if test x$enableval != xyes; then - AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) -fi]) +AS_HELP_STRING([--disable-extra], [Disable extra features, currently only easter eggs])) +if test "x$enable_extra" = xno; then + AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.]) +fi AC_ARG_ENABLE(help, -[ --disable-help Disable help functions], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-help], [Disable help functions])) +if test "x$enable_help" = xno; then AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) -fi]) +fi + +AC_ARG_ENABLE(histories, +AS_HELP_STRING([--disable-histories], [Disable search and position histories])) +if test "x$enable_histories" = xno; then + AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.]) +fi AC_ARG_ENABLE(justify, -[ --disable-justify Disable justify/unjustify functions], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-justify], [Disable justify/unjustify functions])) +if test "x$enable_justify" = xno; then AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) -fi]) +fi + +AC_ARG_ENABLE(libmagic, +AS_HELP_STRING([--disable-libmagic], [Disable detection of file types via libmagic])) AC_ARG_ENABLE(mouse, -[ --disable-mouse Disable mouse support (and -m flag)], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-mouse], [Disable mouse support (and -m flag)])) +if test "x$enable_mouse" = xno; then AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.]) -fi]) +fi + +AC_ARG_ENABLE(multibuffer, +AS_HELP_STRING([--disable-multibuffer], [Disable multiple file buffers])) +if test "x$enable_multibuffer" = xno; then + AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.]) +fi + +AC_ARG_ENABLE(nanorc, +AS_HELP_STRING([--disable-nanorc], [Disable use of .nanorc files])) +if test "x$enable_nanorc" = xno; then + AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.]) +else + nanorc_support=yes +fi AC_ARG_ENABLE(operatingdir, -[ --disable-operatingdir Disable setting of operating directory (chroot of sorts)], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-operatingdir], [Disable setting of operating directory (chroot of sorts)])) +if test "x$enable_operatingdir" = xno; then AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).]) -fi]) +fi AC_ARG_ENABLE(speller, -[ --disable-speller Disable spell checker functions], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-speller], [Disable spell checker functions])) +if test "x$enable_speller" = xno; then AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.]) -fi]) +fi AC_ARG_ENABLE(tabcomp, -[ --disable-tabcomp Disable tab completion functions], -[if test x$enableval != xyes; then - AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.]) -fi]) +AS_HELP_STRING([--disable-tabcomp], [Disable tab completion functions])) +if test "x$enable_tabcomp" = xno; then + AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.]) +fi AC_ARG_ENABLE(wrapping, -[ --disable-wrapping Disable all wrapping of text (and -w flag)], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-wrapping], [Disable all wrapping of text (and -w flag)])) +if test "x$enable_wrapping" = xno; then AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.]) -fi]) +fi AC_ARG_ENABLE(wrapping-as-root, -[ --disable-wrapping-as-root Disable wrapping of text as root by default], -[if test x$enableval != xyes; then +AS_HELP_STRING([--disable-wrapping-as-root], [Disable wrapping of text as root by default])) +if test "x$enable_wrapping_as_root" = xno; then AC_DEFINE(DISABLE_ROOTWRAPPING, 1, [Define this to disable text wrapping as root by default.]) -fi]) +fi -AC_ARG_ENABLE(color, -[ --disable-color Disable color and syntax highlighting], -if test x$enableval != xno; then - if test x$ac_cv_header_regex_h = xyes; then - AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes - AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes - else - AC_MSG_ERROR([ -*** The header file regex.h was not found. If you wish to use color -*** support this header file is required. Please either install C -*** libraries that include the regex.h file or call the configure -*** script with --disable-color.]) +AC_ARG_ENABLE(debug, +AS_HELP_STRING([--enable-debug], [Enable debugging (disabled by default)])) +if test "x$enable_debug" = xyes; then + AC_DEFINE(DEBUG, 1, [Define this to enable debug messages and assert warnings.]) +else + AC_DEFINE(NDEBUG, 1, [Shut up assert warnings :-)]) +fi + +AC_ARG_ENABLE(tiny, +AS_HELP_STRING([--enable-tiny], [Disable features for the sake of size])) +if test "x$enable_tiny" = xyes; then + AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) + if test "x$enable_browser" != xyes; then + AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) fi -fi, - if test x$enable_tiny != xyes; then - if test x$ac_cv_header_regex_h = xyes; then - AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes - AC_DEFINE(ENABLE_COLOR, 1, [Define this to have syntax highlighting, requires regex.h and ENABLE_NANORC too!]) color_support=yes - else - AC_MSG_ERROR([ -*** The header file regex.h was not found. If you wish to use color -*** support this header file is required. Please either install C -*** libraries that include the regex.h file or call the configure -*** script with --disable-color.]) + if test "x$enable_color" != xyes; then + AC_DEFINE(DISABLE_COLOR, 1, [Define this to disable syntax highlighting.]) + color_support=no + else + if test "x$enable_nanorc" != xyes; then + AC_MSG_ERROR([--enable-color with --enable-tiny cannot work without --enable-nanorc]) fi fi -) + if test "x$enable_extra" != xyes; then + AC_DEFINE(DISABLE_EXTRA, 1, [Define this to disable extra stuff.]) + fi + if test "x$enable_help" != xyes; then + AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) + fi + if test "x$enable_histories" != xyes; then + AC_DEFINE(DISABLE_HISTORIES, 1, [Define this to disable search and position histories.]) + fi + if test "x$enable_justify" != xyes; then + AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) + fi + if test "x$enable_libmagic" != xyes; then + enable_libmagic=no + fi + if test "x$enable_mouse" != xyes; then + AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.]) + fi + if test "x$enable_multibuffer" != xyes; then + AC_DEFINE(DISABLE_MULTIBUFFER, 1, [Define this to disable multiple file buffers.]) + fi + if test "x$enable_nanorc" != xyes; then + AC_DEFINE(DISABLE_NANORC, 1, [Define this to disable the use of .nanorc files.]) + fi + if test "x$enable_operatingdir" != xyes; then + AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).]) + fi + if test "x$enable_speller" != xyes; then + AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.]) + fi + if test "x$enable_tabcomp" != xyes; then + AC_DEFINE(DISABLE_TABCOMP, 1, [Define this to disable the tab completion functions for files and search strings.]) + fi + if test "x$enable_wrapping" != xyes; then + AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.]) + fi +fi -AC_ARG_ENABLE(multibuffer, -[ --disable-multibuffer Disable multiple file buffers], -[if test x$enableval != xno; then - AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes -fi], - [if test x$enable_tiny != xyes; then - AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes - fi]) +AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes) +AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes) -AC_ARG_ENABLE(nanorc, -[ --disable-nanorc Disable use of .nanorc files], -[if test x$enableval != xno; then - AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes -fi], - [if test x$enable_tiny != xyes; then - AC_DEFINE(ENABLE_NANORC, 1, [Define this to use .nanorc files.]) nanorc_support=yes - fi]) - -AC_ARG_ENABLE(all, -[ --enable-all Enable ALL extra nano functionality (ignored for compatibility as all options default to on)], -[if test x$enableval = xyes; then - echo "--enable-all option no longer needed, ignoring for compatibility" +AC_MSG_CHECKING([whether to enable UTF-8 support]) +AC_ARG_ENABLE(utf8, AS_HELP_STRING([--enable-utf8], [Enable UTF-8 support])) +AC_MSG_RESULT(${enable_utf8:-auto}) + +AC_ARG_ENABLE(altrcname, +AS_HELP_STRING([--enable-altrcname], [Specify an alternate rcfile name (default: .nanorc)]), +[if test x$enableval != no; then + AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify an alternate rcfile name (default: .nanorc).]) rcfilename=$enableval fi]) -AC_MSG_CHECKING([whether to enable UTF-8 support]) -AC_ARG_ENABLE(utf8, -[ --enable-utf8 Enable UTF-8 support], -[if test x$enableval = xyes; then - enable_utf8=yes -else - enable_utf8=no -fi], -[enable_utf8=auto]) -AC_MSG_RESULT($enable_utf8) AC_MSG_CHECKING([whether to use slang]) CURSES_LIB_NAME="" AC_ARG_WITH(slang, -[ --with-slang[=DIR] Use the slang library instead of curses], +AS_HELP_STRING([--with-slang[=DIR]], [Use the slang library instead of curses]), [ case "$with_slang" in no) AC_MSG_RESULT(no) @@ -217,12 +250,12 @@ AC_ARG_WITH(slang, AC_MSG_RESULT(yes) if test x$with_slang != xyes; then - # Add additional search path + # Add additional search path. LDFLAGS="-L$with_slang/lib $LDFLAGS" CPPFLAGS="-I$with_slang/include $CPPFLAGS" fi - if test x$enable_utf8 != xno; then + if test "x$enable_utf8" != xno; then AC_CHECK_HEADER(slcurses.h, AC_MSG_CHECKING([for SLutf8_enable in -lslang]) _libs=$LIBS @@ -235,7 +268,7 @@ int main(void) return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes + AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang" @@ -245,7 +278,7 @@ int main(void) CURSES_LIB_NAME=slang], [AC_MSG_RESULT(no) - # We might need the term library + # We might need the term library. for termlib in ncurses curses termcap terminfo termlib; do AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"]) test -n "$tcap" && break @@ -261,7 +294,7 @@ int main(void) return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes + AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap" @@ -271,7 +304,7 @@ int main(void) CURSES_LIB_NAME=slang], [AC_MSG_RESULT(no) - # We might need the math library + # We might need the math library. AC_MSG_CHECKING([for SLutf8_enable in -lslang $tcap -lm]) LIBS="$LIBS -lm" AC_TRY_RUN([ @@ -282,7 +315,7 @@ int main(void) return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes + AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) CURSES_LIB_WIDE=yes if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" @@ -302,8 +335,8 @@ int main(void) fi if eval "test x$CURSES_LIB_NAME = x"; then - # Reset libs if the above slang tests failed - if test x$enable_utf8 != xno; then + # Reset libs if the above slang tests failed. + if test "x$enable_utf8" != xno; then LIBS=$_libs fi @@ -319,7 +352,7 @@ int main(void) return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes + AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang" else @@ -328,7 +361,7 @@ int main(void) CURSES_LIB_NAME=slang], [AC_MSG_RESULT(no) - # We might need the term library + # We might need the term library. for termlib in ncurses curses termcap terminfo termlib; do AC_CHECK_LIB([${termlib}], tputs, [tcap="-l$termlib"]) test -n "$tcap" && break @@ -344,7 +377,7 @@ int main(void) return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes + AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap" else @@ -353,7 +386,7 @@ int main(void) CURSES_LIB_NAME=slang], [AC_MSG_RESULT(no) - # We might need the math library + # We might need the math library. AC_MSG_CHECKING([for SLtt_initialize in -lslang $tcap -lm]) LIBS="$LIBS -lm" AC_TRY_RUN([ @@ -364,7 +397,7 @@ int main(void) return 0; }], [AC_MSG_RESULT(yes) - AC_DEFINE(USE_SLANG, 1, [Define to use the slang wrappers for curses instead of native curses.]) slang_support=yes + AC_DEFINE(USE_SLANG, 1, [Define this to use the slang wrappers for curses instead of native curses.]) if test x$with_slang != xyes; then CURSES_LIB="-L${with_slang}/lib -lslang $tcap -lm" else @@ -392,57 +425,79 @@ int main(void) ;; esac], [AC_MSG_RESULT(no)]) -if test x$CURSES_LIB_NAME = xslang; then - AC_DEFINE(NANO_TINY, 1, [Define this to make the nano executable as small as possible.]) tiny_support=yes - AC_DEFINE(DISABLE_BROWSER, 1, [Define this to disable the built-in file browser.]) - AC_DEFINE(DISABLE_HELP, 1, [Define this to disable the help text display.]) - AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) - AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.]) - AC_DEFINE(DISABLE_OPERATINGDIR, 1, [Define this to disable the setting of the operating directory (chroot of sorts).]) - AC_DEFINE(DISABLE_SPELLER, 1, [Define this to disable the spell checker functions.]) - AC_DEFINE(DISABLE_TABCOMP, 1, [Define to disable the tab completion functions for files and search strings.]) - AC_DEFINE(DISABLE_WRAPPING, 1, [Define this to disable all text wrapping.]) -fi - -AM_CONDITIONAL(USE_COLOR, test x$color_support = xyes) -AM_CONDITIONAL(USE_NANORC, test x$nanorc_support = xyes) - -AC_ARG_ENABLE(altrcname, -[ --enable-altrcname Specify alternate rcfile name (default: .nanorc)], -[if test x$enableval != no; then - AC_DEFINE_UNQUOTED(RCFILE_NAME, "$enableval", [Specify alternate rcfile name (default: .nanorc)]) rcfilename=$enableval -fi]) dnl Checks for functions. -AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf) +AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen snprintf vsnprintf) -if test x$enable_utf8 != xno; then +if test "x$enable_utf8" != xno; then AC_CHECK_FUNCS(iswalnum iswblank iswpunct iswspace nl_langinfo mblen mbstowcs mbtowc wctomb wcwidth) fi +if test x$ac_cv_func_snprintf = xno; then + AM_PATH_GLIB_2_0(2.0.0,, + AC_MSG_ERROR([ +*** snprintf() not found. GLIB 2.x not found either. +*** You should install the GLIB 2.x library which can +*** be found at http://ftp.gtk.org/.]), + glib) +fi + if test x$ac_cv_func_vsnprintf = xno; then AM_PATH_GLIB_2_0(2.0.0,, AC_MSG_ERROR([ -*** vsnprintf() not found. GLIB 2.x not found either. You should -*** install the GLIB 2.x library which can be found at -*** ftp://ftp.gtk.org/.]), +*** vsnprintf() not found. GLIB 2.x not found either. +*** You should install the GLIB 2.x library which can +*** be found at http://ftp.gtk.org/.]), glib) fi dnl Checks for typedefs, structures, and compiler characteristics. +dnl Checks for available flags. + +AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], []) + dnl Checks for library functions. + AC_TYPE_SIGNAL AC_FUNC_VPRINTF AC_CHECK_FUNCS(getopt_long) + dnl Checks for libraries. +if eval "test x$CURSES_LIB_NAME = x"; then + if test "x$enable_utf8" != xno; then + PKG_CHECK_MODULES([NCURSESW], [ncursesw], [ + CURSES_LIB=$NCURSESW_LIBS + CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS" + CURSES_LIB_NAME=ncursesw + CURSES_LIB_WIDE=yes + ], [:]) + else + PKG_CHECK_MODULES([NCURSES], [ncurses], [ + CURSES_LIB=$NCURSES_LIBS + CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS" + CURSES_LIB_NAME=ncurses + ], [:]) + fi +fi + if eval "test x$CURSES_LIB_NAME = x"; then AC_CHECK_HEADERS(ncurses.h) - if test x$enable_utf8 != xno; then - AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CPPFLAGS="-I/usr/include/ncursesw $CPPFLAGS" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) + if test "x$enable_utf8" != xno; then + OLDLIBS="$LIBS" + AC_CHECK_TOOL(NCURSESW_CONFIG, ncursesw5-config, no) + if test "x$NCURSESW_CONFIG" != xno; then + CURSES_LIB=`$NCURSESW_CONFIG --libs` + LIBS="$CURSES_LIB $LIBS" + CPPFLAGS="`$NCURSESW_CONFIG --cflags` $CPPFLAGS" + AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) + else + AC_CHECK_LIB(ncursesw, get_wch, [CURSES_LIB="-lncursesw" CURSES_LIB_NAME=ncursesw CURSES_LIB_WIDE=yes]) + fi + LIBS="$OLDLIBS" fi if eval "test x$CURSES_LIB_NAME = x"; then @@ -453,12 +508,12 @@ fi if eval "test x$CURSES_LIB_NAME = x"; then AC_CHECK_HEADERS(curses.h) - if test x$enable_utf8 != xno; then + if test "x$enable_utf8" != xno; then AC_CHECK_LIB(curses, get_wch, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses CURSES_LIB_WIDE=yes]) fi if eval "test x$CURSES_LIB_NAME = x"; then - AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses]) + AC_CHECK_LIB(curses, initscr, [CURSES_LIB="-lcurses" CURSES_LIB_NAME=curses]) fi fi @@ -486,7 +541,7 @@ if test "x$GLIB_LIBS" != "x"; then LDFLAGS="$LDFLAGS $GLIB_LIBS" fi -if test x$enable_utf8 != xno && \ +if test "x$enable_utf8" != xno && \ test x$CURSES_LIB_WIDE = xyes && \ test x$ac_cv_func_iswalnum = xyes && \ test x$ac_cv_func_iswpunct = xyes && \ @@ -499,14 +554,14 @@ if test x$enable_utf8 != xno && \ test x$ac_cv_func_wcwidth = xyes; then AC_DEFINE(ENABLE_UTF8, 1, [Define this if your system has sufficient UTF-8 support (a wide curses library, iswalnum(), iswpunct(), iswblank() or iswspace(), nl_langinfo, mblen(), mbstowcs(), mbtowc(), wctomb(), and wcwidth()).]) else - if test x$enable_utf8 = xyes; then + if test "x$enable_utf8" = xyes; then AC_MSG_ERROR([ *** UTF-8 support was requested, but insufficient UTF-8 support was *** detected in your curses and/or C libraries. Please verify that your *** slang was built with UTF-8 support or your curses was built with *** wide character support, and that your C library was built with wide *** character support.]) - elif test x$enable_utf8 != xno; then + elif test "x$enable_utf8" != xno; then AC_MSG_WARN([ *** Insufficient UTF-8 support was detected in your curses and/or C *** libraries. If you want UTF-8 support, please verify that your slang @@ -517,9 +572,24 @@ else fi if test x$color_support = xyes; then - # now check for the end of word boundary support (/< and />) + # Now check for the end-of-word boundary support (/< and />). AC_MSG_CHECKING([for GNU-style word boundary regex support]) - AC_TRY_RUN([ + + AC_ARG_WITH(wordbounds, + AS_HELP_STRING([--with-wordbounds], [Use GNU-style word boundary delimiters]), + [ case "$with_wordbounds" in + no) + AC_MSG_RESULT(no) + ;; + *) + AC_MSG_RESULT(yes) + # We explicitly don't check if the user forced the option, because + # this is needed for cross compilers and we can't test the target. + AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes, + ;; + esac + ], [ + AC_TRY_RUN([ #ifdef HAVE_SYS_TYPES_H #include #endif @@ -531,16 +601,18 @@ int main(void) regmatch_t pmatch; if (regcomp(&r, "\\\\>", REG_EXTENDED|REG_NOSUB)) - return 1; + return 1; if (regexec(&r, "word boundary", nmatch, &pmatch, 0)) - return 1; + return 1; return 0; }], - AC_MSG_RESULT(yes) - AC_DEFINE(GNU_WORDBOUNDS, 1, [Define if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes, - AC_MSG_RESULT(no), - AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling]) -) + AC_MSG_RESULT(yes) + AC_DEFINE(GNU_WORDBOUNDS, 1, [Define this if the system supports GNU-style word boundaries in regexes.]) gnu_wordbounds=yes, + AC_MSG_RESULT(no), + AC_MSG_WARN([*** Can't check for GNU-style word boundary support when cross-compiling]) + ) +]) + # if test x$CURSES_LIB_NAME = xcurses; then AC_MSG_CHECKING([whether _XOPEN_SOURCE_EXTENDED is needed]) AC_TRY_RUN([ @@ -577,27 +649,37 @@ int main(void) LINES = 80; COLS = 25; return 0; -}], -AC_DEFINE(REDEFINIG_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug]) +}], +AC_DEFINE(REDEFINING_MACROS_OK, 1, [Define this if you know your curses library allows LINES and COLS to be redefined to deal with a resizing bug]) AC_MSG_RESULT(yes), AC_MSG_RESULT(no), AC_MSG_WARN([*** Can't check for macro redefinability when cross-compiling])) +AS_IF([test "x$enable_libmagic" != "xno"], [ + AC_CHECK_HEADERS_ONCE([magic.h]) + AC_CHECK_LIB(magic, magic_open) + AC_CHECK_HEADERS_ONCE([zlib.h]) + AC_CHECK_LIB(z, inflate) +]) -# Check for groff html support +# Check for groff html support. AC_MSG_CHECKING([for HTML support in groff]) groff -t -mandoc -Thtml /dev/null -if test $? -ne 0 ; then - echo "no" - echo "*** Will not generate HTML version of man pages ***" - echo "*** Consider installing a newer version of groff with HTML support ***" +if test $? -ne 0 ; then + AC_MSG_RESULT([no]) + AC_MSG_WARN([*** Will not generate HTML version of man pages *** +*** Consider installing a newer version of groff with HTML support ***]) groff_html_support=no else - echo "yes" + AC_MSG_RESULT([yes]) groff_html_support=yes fi AM_CONDITIONAL(GROFF_HTML, test x$groff_html_support = xyes) +# Check for the availability of makeinfo. +AC_CHECK_PROG(haveit, makeinfo, yes, no) +AM_CONDITIONAL(HAVE_MAKEINFO, test x$haveit = xyes) + AC_CONFIG_FILES([ Makefile diff --git a/depcomp b/depcomp index df8eea7..4ebd5b3 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,9 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2009-04-28.21; # UTC +scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -28,9 +27,9 @@ scriptversion=2009-04-28.21; # UTC case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; -h | --h*) cat <<\EOF Usage: depcomp [--help] [--version] PROGRAM [ARGS] @@ -40,11 +39,11 @@ as side-effects. Environment variables: depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. + source Source file read by 'PROGRAMS ARGS'. + object Object file output by 'PROGRAMS ARGS'. DEPDIR directory where to store dependencies. depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. + tmpdepfile Temporary file to use when outputting dependencies. libtool Whether libtool is used (yes/no). Report bugs to . @@ -57,6 +56,66 @@ EOF ;; esac +# Get the directory component of the given path, and save it in the +# global variables '$dir'. Note that this directory component will +# be either empty or ending with a '/' character. This is deliberate. +set_dir_from () +{ + case $1 in + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; + *) dir=;; + esac +} + +# Get the suffix-stripped basename of the given path, and save it the +# global variable '$base'. +set_base_from () +{ + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` +} + +# If no dependency file was actually created by the compiler invocation, +# we still have to create a dummy depfile, to avoid errors with the +# Makefile "include basename.Plo" scheme. +make_dummy_depfile () +{ + echo "#dummy" > "$depfile" +} + +# Factor out some common post-processing of the generated depfile. +# Requires the auxiliary global variable '$tmpdepfile' to be set. +aix_post_process_depfile () +{ + # If the compiler actually managed to produce a dependency file, + # post-process it. + if test -f "$tmpdepfile"; then + # Each line is of the form 'foo.o: dependency.h'. + # Do two passes, one to just change these to + # $object: dependency.h + # and one to simply output + # dependency.h: + # which is needed to avoid the deleted-header problem. + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" + } > "$depfile" + rm -f "$tmpdepfile" + else + make_dummy_depfile + fi +} + +# A tabulation character. +tab=' ' +# A newline character. +nl=' +' +# Character ranges might be problematic outside the C locale. +# These definitions help. +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ +lower=abcdefghijklmnopqrstuvwxyz +digits=0123456789 +alpha=${upper}${lower} + if test -z "$depmode" || test -z "$source" || test -z "$object"; then echo "depcomp: Variables source, object and depmode must be set" 1>&2 exit 1 @@ -69,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} rm -f "$tmpdepfile" +# Avoid interferences from the environment. +gccflag= dashmflag= + # Some modes work just like other modes, but use different flags. We # parameterize here, but still list the modes in the big case below, # to make depend.m4 easier to write. Note that we *cannot* use a case @@ -80,18 +142,32 @@ if test "$depmode" = hp; then fi if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout + # This is just like dashmstdout with a different argument. + dashmflag=-xM + depmode=dashmstdout fi cygpath_u="cygpath -u -f -" if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvisualcpp +fi + +if test "$depmode" = msvc7msys; then + # This is just like msvc7 but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u='sed s,\\\\,/,g' + depmode=msvc7 +fi + +if test "$depmode" = xlc; then + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. + gccflag=-qmakedep=gcc,-MF + depmode=gcc fi case "$depmode" in @@ -114,8 +190,7 @@ gcc3) done "$@" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -123,13 +198,17 @@ gcc3) ;; gcc) +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. +## (see the conditional assignment to $gccflag above). ## There are various ways to get dependency output from gcc. Here's ## why we pick this rather obscure method: ## - Don't want to use -MD because we'd like the dependencies to end ## up in a subdir. Having to rename by hand is ugly. ## (We might end up doing this anyway to support other compilers.) ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). +## -MM, not -M (despite what the docs say). Also, it might not be +## supported by the other compilers which use the 'gcc' depmode. ## - Using -M directly means running the compiler twice (even worse ## than renaming). if test -z "$gccflag"; then @@ -137,31 +216,31 @@ gcc) fi "$@" -Wp,"$gccflag$tmpdepfile" stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi rm -f "$depfile" echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. + # The second -e expression handles DOS-style file names with drive + # letters. sed -e 's/^[^:]*: / /' \ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. +## This next piece of magic avoids the "deleted header file" problem. ## The problem is that when a header file which appears in a .P file ## is deleted, the dependency causes make to die (because there is ## typically no way to rebuild the header). We avoid this by adding ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory +## Some versions of gcc put a space before the ':'. On the theory ## that the space means something, we add a space to the output as -## well. +## well. hp depmode also adds that space, but also prefixes the VPATH +## to the object. Take care to not repeat it in the output. ## Some versions of the HPUX 10.20 sed can't process this invocation ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -179,8 +258,7 @@ sgi) "$@" -MDupdate "$tmpdepfile" fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -188,43 +266,41 @@ sgi) if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files echo "$object : \\" > "$depfile" - # Clip off the initial element (the dependent). Don't try to be # clever and replace this with sed code, as IRIX sed won't handle # lines with more than a fixed number of characters (4096 in # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the + # the IRIX cc adds comments like '#:fec' to the end of the # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" echo >> "$depfile" - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" ;; +xlc) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + aix) # The C for AIX Compiler uses -M and outputs the dependencies # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the + # current directory. Also, the AIX compiler puts '$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.u tmpdepfile2=$base.u @@ -237,9 +313,7 @@ aix) "$@" -M fi stat=$? - - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi @@ -248,44 +322,100 @@ aix) do test -f "$tmpdepfile" && break done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" + aix_post_process_depfile + ;; + +tcc) + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 + # FIXME: That version still under development at the moment of writing. + # Make that this statement remains true also for stable, released + # versions. + # It will wrap lines (doesn't matter whether long or short) with a + # trailing '\', as in: + # + # foo.o : \ + # foo.c \ + # foo.h \ + # + # It will put a trailing '\' even on the last line, and will use leading + # spaces rather than leading tabs (at least since its commit 0394caf7 + # "Emit spaces for -MD"). + "$@" -MD -MF "$tmpdepfile" + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat fi + rm -f "$depfile" + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. + # We have to change lines of the first kind to '$object: \'. + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" + # And for each line of the second kind, we have to emit a 'dep.h:' + # dummy dependency, to avoid the deleted-header problem. + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" rm -f "$tmpdepfile" ;; -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output +## The order of this option in the case statement is important, since the +## shell code in configure will try each of these formats in the order +## listed in this file. A plain '-MD' option would be understood by many +## compilers, so we must ensure this comes after the gcc and icc options. +pgcc) + # Portland's C compiler understands '-MD'. + # Will always output deps to 'file.d' where file is the root name of the + # source file under compilation, even if file resides in a subdirectory. + # The object file name does not affect the name of the '.d' file. + # pgcc 10.2 will output # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : + # and will wrap long lines using '\' : # foo.o: sub/foo.c ... \ # sub/foo.h ... \ # ... + set_dir_from "$object" + # Use the source, not the object, to determine the base name, since + # that's sadly what pgcc will do too. + set_base_from "$source" + tmpdepfile=$base.d + + # For projects that build the same source file twice into different object + # files, the pgcc approach of using the *source* file root name can cause + # problems in parallel builds. Use a locking strategy to avoid stomping on + # the same $tmpdepfile. + lockdir=$base.d-lock + trap " + echo '$0: caught signal, cleaning up...' >&2 + rmdir '$lockdir' + exit 1 + " 1 2 13 15 + numtries=100 + i=$numtries + while test $i -gt 0; do + # mkdir is a portable test-and-set. + if mkdir "$lockdir" 2>/dev/null; then + # This process acquired the lock. + "$@" -MD + stat=$? + # Release the lock. + rmdir "$lockdir" + break + else + # If the lock is being held by a different process, wait + # until the winning process is done or we timeout. + while test -d "$lockdir" && test $i -gt 0; do + sleep 1 + i=`expr $i - 1` + done + fi + i=`expr $i - 1` + done + trap - 1 2 13 15 + if test $i -le 0; then + echo "$0: failed to acquire lock after $numtries attempts" >&2 + echo "$0: check lockdir '$lockdir'" >&2 + exit 1 + fi - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile" exit $stat fi @@ -297,8 +427,8 @@ icc) sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" # Some versions of the HPUX 10.20 sed can't process this invocation # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -309,9 +439,8 @@ hp2) # 'foo.d', which lands next to the object file, wherever that # happens to be. # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + set_dir_from "$object" + set_base_from "$object" if test "$libtool" = yes; then tmpdepfile1=$dir$base.d tmpdepfile2=$dir.libs/$base.d @@ -322,8 +451,7 @@ hp2) "$@" +Maked fi stat=$? - if test $stat -eq 0; then : - else + if test $stat -ne 0; then rm -f "$tmpdepfile1" "$tmpdepfile2" exit $stat fi @@ -333,77 +461,107 @@ hp2) test -f "$tmpdepfile" && break done if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" + # Add 'dependent.h:' lines. sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else - echo "#dummy" > "$depfile" + make_dummy_depfile fi rm -f "$tmpdepfile" "$tmpdepfile2" ;; tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; + # The Tru64 compiler uses -MD to generate dependencies as a side + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put + # dependencies in 'foo.d' instead, so we check for that too. + # Subdirectories are respected. + set_dir_from "$object" + set_base_from "$object" + + if test "$libtool" = yes; then + # Libtool generates 2 separate objects for the 2 libraries. These + # two compilations output dependencies in $dir.libs/$base.o.d and + # in $dir$base.o.d. We have to check for both files, because + # one of the two compilations can be disabled. We should prefer + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is + # automatically cleaned when .libs/ is deleted, while ignoring + # the former would cause a distcleancheck panic. + tmpdepfile1=$dir$base.o.d # libtool 1.5 + tmpdepfile2=$dir.libs/$base.o.d # Likewise. + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 + "$@" -Wc,-MD + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + tmpdepfile3=$dir$base.d + "$@" -MD + fi + + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done + # Same post-processing that is required for AIX mode. + aix_post_process_depfile + ;; + +msvc7) + if test "$libtool" = yes; then + showIncludes=-Wc,-showIncludes + else + showIncludes=-showIncludes + fi + "$@" $showIncludes > "$tmpdepfile" + stat=$? + grep -v '^Note: including file: ' "$tmpdepfile" + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + echo "$object : \\" > "$depfile" + # The first sed program below extracts the file names and escapes + # backslashes for cygpath. The second sed program outputs the file + # name when reading, but also accumulates all include files in the + # hold buffer in order to output them again at the end. This only + # works with sed implementations that can handle large buffers. + sed < "$tmpdepfile" -n ' +/^Note: including file: *\(.*\)/ { + s//\1/ + s/\\/\\\\/g + p +}' | $cygpath_u | sort -u | sed -n ' +s/ /\\ /g +s/\(.*\)/'"$tab"'\1 \\/p +s/.\(.*\) \\/\1:/ +H +$ { + s/.*/'"$tab"'/ + G + p +}' >> "$depfile" + echo >> "$depfile" # make sure the fragment doesn't end with a backslash + rm -f "$tmpdepfile" + ;; + +msvc7msys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; #nosideeffect) # This comment above is used by automake to tell side-effect @@ -422,7 +580,7 @@ dashmstdout) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -442,18 +600,18 @@ dashmstdout) done test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' + # Require at least two characters before searching for ':' # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. + # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" rm -f "$depfile" cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # Some versions of the HPUX 10.20 sed can't process this sed invocation + # correctly. Breaking it into two sed invocations is a workaround. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" ;; @@ -503,12 +661,15 @@ makedepend) touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" + # makedepend may prepend the VPATH from the source file name to the object. + # No need to regex-escape $object, excess matching of '.' is harmless. + sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" + # Some versions of the HPUX 10.20 sed can't process the last invocation + # correctly. Breaking it into two sed invocations is a workaround. + sed '1,2d' "$tmpdepfile" \ + | tr ' ' "$nl" \ + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ + | sed -e 's/$/ :/' >> "$depfile" rm -f "$tmpdepfile" "$tmpdepfile".bak ;; @@ -525,7 +686,7 @@ cpp) shift fi - # Remove `-o $object'. + # Remove '-o $object'. IFS=" " for arg do @@ -544,10 +705,10 @@ cpp) esac done - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" + "$@" -E \ + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" cat < "$tmpdepfile" >> "$depfile" @@ -579,23 +740,23 @@ msvisualcpp) shift ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; + set fnord "$@" + shift + shift + ;; *) - set fnord "$@" "$arg" - shift - shift - ;; + set fnord "$@" "$arg" + shift + shift + ;; esac done "$@" -E 2>/dev/null | sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" + echo "$tab" >> "$depfile" sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; diff --git a/doc/Makefile.am b/doc/Makefile.am index 15f35ee..c197ceb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,11 @@ +SUBDIRS = man + +if HAVE_MAKEINFO +SUBDIRS += texinfo +endif + if USE_COLOR -SUBDIRS = man syntax texinfo -else -SUBDIRS = man texinfo +SUBDIRS += syntax endif -EXTRA_DIST = faq.html +dist_html_DATA = faq.html diff --git a/doc/Makefile.in b/doc/Makefile.in index b30918f..d7461b4 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,7 +13,53 @@ # PARTICULAR PURPOSE. @SET_MAKE@ + VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -33,12 +78,15 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ +@HAVE_MAKEINFO_TRUE@am__append_1 = texinfo +@USE_COLOR_TRUE@am__append_2 = syntax subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/nanorc.sample.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs $(srcdir)/nanorc.sample.in \ + $(dist_html_DATA) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -50,20 +98,87 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = nanorc.sample CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(htmldir)" +DATA = $(dist_html_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = man texinfo syntax @@ -95,6 +210,7 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -140,6 +256,11 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_CONFIG = @NCURSESW_CONFIG@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -151,6 +272,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKGDATADIR = @PKGDATADIR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -180,6 +303,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +haveit = @haveit@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -204,17 +328,12 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@USE_COLOR_FALSE@SUBDIRS = man texinfo -@USE_COLOR_TRUE@SUBDIRS = man syntax texinfo -EXTRA_DIST = faq.html +SUBDIRS = man $(am__append_1) $(am__append_2) +dist_html_DATA = faq.html all: all-recursive .SUFFIXES: @@ -250,24 +369,48 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): nanorc.sample: $(top_builddir)/config.status $(srcdir)/nanorc.sample.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +install-dist_htmlDATA: $(dist_html_DATA) + @$(NORMAL_INSTALL) + @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ + done + +uninstall-dist_htmlDATA: + @$(NORMAL_UNINSTALL) + @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -282,57 +425,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -348,12 +446,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -365,15 +458,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -382,6 +471,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -418,13 +522,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -446,9 +547,12 @@ distdir: $(DISTFILES) done check-am: all-am check: check-recursive -all-am: Makefile +all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: + for dir in "$(DESTDIR)$(htmldir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-recursive install-exec: install-exec-recursive install-data: install-data-recursive @@ -459,10 +563,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -494,7 +603,7 @@ info: info-recursive info-am: -install-data-am: +install-data-am: install-dist_htmlDATA install-dvi: install-dvi-recursive @@ -538,23 +647,22 @@ ps: ps-recursive ps-am: -uninstall-am: +uninstall-am: uninstall-dist_htmlDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic cscopelist-am ctags ctags-am \ + distclean distclean-generic distclean-tags distdir dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-dist_htmlDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am + tags-am uninstall uninstall-am uninstall-dist_htmlDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/doc/faq.html b/doc/faq.html index 70baba5..d24a895 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -24,7 +24,6 @@

3.1. How do I install the RPM or DEB package?
3.2. Compiling from source: WHAT THE HECK DO I DO NOW?
3.3. Why does everything go into /usr/local?
- 3.4. I get errors about 'bindtextdomain','gettext', and/or 'gettextdomain'. What can I do about it?
3.5. nano should automatically run strip on the binary when installing it!
3.6. How can I make the executable smaller? This is too bloated!
3.7. Tell me more about this multibuffer stuff!
@@ -46,7 +45,8 @@ 4.11. How do I make nano my default editor (in Pine, mutt, etc.)?
4.12. I've compiled nano with color support, but I don't see any color when I run it!
4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?
- 4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?

+ 4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?
+ 4.15. On startup I get a message that says "Detected a legacy nano history file". Now older nano versions can't find my search history!

5. Internationalization

5.1. There's no translation for my language!
5.2. I don't like the translation for <x> in my language. How can I fix it?
@@ -84,7 +84,7 @@

1.5. Why the name change from TIP?

On January 10, 2000, TIP was officially renamed to nano because of a namespace conflict with another program called 'tip'. The original 'tip' program "establishes a full duplex terminal connection to a remote host", and was included with many older Unix systems (and newer ones like Solaris). The conflict was not noticed at first because there is no 'tip' utility included with most GNU/Linux distributions (where nano was developed).

1.6. What is the current version of nano?

-

The current version of nano *should* be 2.2.0. Of course, you should always check the nano homepage to see what the latest and greatest version is.

+

The current stable version of nano *should* be 2.2.6. Of course, you should always check the nano homepage to see what the latest and greatest version is.

1.7. I want to read the man page without having to download the program!

Jeez, demanding, aren't we? Okay, look here.

@@ -93,7 +93,6 @@

The nano distribution can be downloaded at the following fine web and ftp sites:

@@ -101,18 +100,17 @@

2.3. Debian (.deb) packages.

Debian users can check out the current nano packages for:

You can also have a look at the Package Pool to see all the available binary and source packages.

-

Note that versions < 0.9.10 are probably not for those wanting to get serious work done, so if you are using Debian 2.2, check that you have updated to 2.2r3, which comes with nano 0.9.23. If you're tracking unstable, you probably have the newest version already.

+

2.4. By subversion (for the brave).

For the 'bleeding edge' current version of nano, you can use subversion to download the current source code. Note: believe it or not, by downloading code that has not yet stabilized into an official release, there could quite possibly be bugs, in fact the code may not even compile! Anyway, see the nano SVN document for info on anonymous SVN access to the nano source.

@@ -121,10 +119,8 @@

It's simple really! As root, type rpm -Uvh nano-x.y.z-1.i386.rpm if you have a RedHat-ish system or dpkg -i nano_x.y.z-1.deb if you have a Debian-ish system, where x.y.z is the release of nano. There are other programs to install packages, and if you wish to use those, knock yourself out.

3.2. Compiling from source: WHAT THE HECK DO I DO NOW?

Okay, take a deep breath, this really isn't hard. Unpack the nano source with a command like:

-

tar -zxvf nano-x.y.z.tar.gz

-

If you get error messages about the -z option, try this:

-

gzip -dc nano-x.y.z.tar.gz | tar xvf -

-

(again, where x.y.z is the version number in question). Then you need to run configure with any options you might want (if any).

+

tar -xvf nano-x.y.z.tar.gz

+

Then you need to run configure with any options you might want (if any).

The average case is this:

cd nano-x.y.z/
./configure
@@ -134,73 +130,67 @@

Well, that's what the configure script defaults to. If you wish to change this, simply do this:

./configure --prefix=/usr

to put nano into /usr/bin when you run make install.

-

3.4. I get errors about 'bindtextdomain', 'gettext', and/or 'gettextdomain'. What can I do about it?

-

Try doing a ./configure --with-included-gettext and see if that solves your problem. You may need to do a make clean; make to get it to work fully.

3.5. nano should automatically run strip on the binary when installing it!

Actually, it does, but you have to use make install-strip. The default make install does not, and will not, run strip automatically.

3.6. How can I make the executable smaller? This is too bloated!

Actually, there are several parts of the editor that can be disabled. You can pass arguments to the configure script that disable certain features. Here's a brief list:

-  --disable-tabcomp       Disable tab completion functions
-  --disable-justify       Disable justify/unjustify functions
-  --disable-speller       Disable spell checker functions
-  --disable-help          Disable help functions
   --disable-browser       Disable built-in file browser
-  --disable-wrapping      Disable all wrapping of text (and -w flag)
+  --disable-color         Disable color and syntax highlighting
+  --disable-extra         Disable extra features, currently only an easter egg
+  --disable-help          Disable help functions
+  --disable-justify       Disable justify/unjustify functions
   --disable-mouse         Disable mouse support (and -m flag)
-  --disable-operatingdir  Disable setting of operating directory
-

There's also the --enable-tiny option which disables everything above, as well as some larger chunks of the program (like the marker code that you use Control-^ to select with). Also, if you know you aren't going to be using other languages you can use --disable-nls to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old strip to strip all debugging code and code that exists in libraries on your system.

-

If, on the other hand, you can't live without bells and whistles, you could try:

- 
-  --enable-extra          Enable extra features, currently only easter eggs
-  --enable-nanorc         Enable use of .nanorc files
-  --enable-color          Enable color and syntax highlighting
-  --enable-multibuffer    Enable having multiple file buffers open
-  --enable-all            Enable all of the above features
-  --disable-wrapping-as-root
-                          Disable text wrapping by default when the user is
-                          root
+ --disable-multibuffer Disable having multiple file buffers open + --disable-nanorc Disable the use of .nanorc files + --disable-operatingdir Disable setting of operating directory + --disable-speller Disable spell checker functions + --disable-tabcomp Disable tab completion functions + --disable-wrapping Disable all wrapping of text (and -w flag) +

There's also the --enable-tiny option which disables everything above, as well as some larger chunks of the program (like the marker code that you use with Control-^ to select text). Also, if you know you aren't going to be using other languages you can use --disable-nls to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old strip to strip all debugging code and code that exists in libraries on your system.

+

With --disable-wrapping-as-root you can disable any hard-wrapping by default when the user is root, useful to prevent accidentally changing long lines in system configuration files.

+

3.7. Tell me more about this multibuffer stuff!

-

To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with --enable-multibuffer (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit Meta-F, then insert the file as normal with ^R. If you always want files to be loaded into their own buffers, use the --multibuffer or -F flag when you invoke nano.

+

To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must not have configured it with --disable-multibuffer nor with --enable-tiny (use nano -V to check the compilation options). Then when you want to insert a file into its own buffer instead of into the current file, just hit Meta-F, then insert the file as normal with ^R. If you always want files to be loaded into their own buffers, use the --multibuffer or -F flag when you invoke nano.

You can move between the buffers you have open with the Meta-< and Meta-> keys, or more easily with Meta-, and Meta-. (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say "Close", instead of the normal "Exit" when only one buffer is open.

3.8. Tell me more about this verbatim input stuff!

-

To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press Meta-V. (If you're not at a prompt, you'll get the message "Verbatim Input".) Then press the key(s) that generate the character you want.

-

Alternatively, if you've enabled Unicode support (see section 5.3), you can press Meta-V and then type a six-digit hexadecimal code from 000000 to 10FFFF (case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to "Unicode Input" when you do this.

+

To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press Meta-V (if you're not at a prompt, you'll get the message "Verbatim Input"), then press the key(s) that generate the character you want.

+

Alternatively, if you've enabled Unicode support (see section 5.3), you can press Meta-V and then type a six-digit hexadecimal code (from 000000 to 10FFFF, case-insensitive), and the character with the corresponding value will be inserted instead. The prompt will change to "Unicode Input" when you do this.

3.9. How do I make a .nanorc file that nano will read when I start it?

-

It's not hard at all! But, your version of nano must have been compiled with --enable-nanorc, and again must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the nanorc.sample that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word set and the getopt_long flag for the feature, for example "set nowrap" or "set suspend".

+

It's not hard at all! But, your version of nano must not have been compiled with --disable-nanorc, and must be version 1.1.12 or newer (use nano -V to check your version and compiled features). Then simply copy the nanorc.sample that came with the nano source or your nano package (most likely in /usr/doc/nano) to .nanorc in your home directory. If you didn't get one, the syntax is simple. Flags are turned on and off by using the word set and the getopt_long flag for the feature, for example "set nowrap" or "set suspend".

3.9. How about in Win32?

If you're using the official nano .zip file and have extracted all the files, you should take the file nano.rc and place it somewhere on your Win32 system (for example if you have write permission to do so, at the top of C:\). Then you must create an Environment variable called HOME which points to the directory where you put nano.rc. In Windows XP, you can get to Environment variables by right-clicking "My Computer" either on the desktop or in the Start Menu, and selecting Properties. This should bring up the System Properties panel. Then click the Advanced Tab, and there should be a button called Environment Variables. Click that to bring up the Environment Variables section. Now, under User Variables you should be able to click the New button, and make a new Variables Name called HOME, with the Variable Value of whatever path you copied nano.rc into (just the directory name; don't add nano.rc onto the end).

-

We're still working on documentatino for enabling synax highlighting on Win32; please bear with us

-

Note that the nano.rc file must remain Unix formated in order for nano to unerstand it. In other words, you should use probably only use nano to edit its config file. Other programs like Wordpad and Notepad will either convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.

+

We're still working on documentation for enabling synax highlighting on Win32; please bear with us.

+

Note that the nano.rc file must remain Unix-formated in order for nano to understand it. In other words, you should probably use only nano to edit its config file. Other programs like Wordpad and Notepad will convert the file to DOS format when saving, and the latter does not even properly read Unix-formatted files to begin with.

4. Running

4.1. How do I open a file with a name beginning with '+' from the command line?

-

If a command line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number and the latter is always treated as a filename. If a command line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:

+

If a command-line option that begins with '+' is followed by another option, the former is always treated as a starting line and column number, and the latter is always treated as a filename. If a command-line option that begins with '+' isn't followed by another option, it's always treated as a filename. Examples:

To open '+filename.txt' starting on line 1: nano +filename.txt
To open '+filename.txt' starting on line 10: nano +10 +filename.txt
To open '+filename.txt' starting on line 1, column 20: nano +,20 +filename.txt
To open '+filename.txt' starting on line 10, column 20: nano +10,20 +filename.txt
- To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 10 (if nano has been compiled with multibuffer support): nano +1 +filename.txt +20 filename.txt

+ To open '+filename.txt' starting on line 1 and 'filename.txt' starting on line 40 (if nano has been compiled with multibuffer support): nano +1 +filename.txt +40 filename.txt

4.2. Ack! My Backspace/Delete/Enter/Meta/double bucky key doesn't seem to work! What can I do?

Try setting your $TERM variable to 'vt100'. nano doesn't yet support every term entry under the sun.

Bourne shell users (bash and sh): export TERM=vt100
C Shell users (tcsh and csh): setenv TERM vt100

4.3. Ack! My numeric keypad's keys don't work properly when NumLock is off! What can I do?

-

You can use the -K or --rebindkeypad options on the command line, or add the line set rebindkeypad to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.

+

You can use the -K or --rebindkeypad option on the command line, or add the line set rebindkeypad to your .nanorc. However, nano's mouse support won't work properly if you do any of these things.

4.4. Ack! When I hold down a Meta key combination for a while, the character of the held key gets inserted now and then. What gives?

This is a bug in the terminal, not in nano. When a key is repeating faster than nano can process it, the keyboard buffer becomes full and starts dropping incoming keystrokes. Unfortunately, it doesn't just drop whole keystrokes; it can also drop parts of multibyte key combinations, resulting in nano's receiving a wrong key.

4.5. How do I type the F13-F16 keys shown in the help browser? My keyboard only has F1-F12!

It depends on the terminal type you're using. On some terminals, such as the FreeBSD console, xterm, konsole, and gnome-terminal, Shift-F1 to Shift-F4 will generate F13 to F16. On other terminals, such as the Linux console, rxvt, and Eterm, Shift-F3 to Shift-F6 will generate F13 to F16.

4.6. nano crashes when I type <insert keystroke here>!

-

If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the nano-devel list or to nano@nano-editor.org.

+

If you aren't trying some bizarre keystroke combination with some bizarre $TERM entry, chances are you have found a bug. You are welcome to submit it to the nano-devel list or in the bug database on Savannah.

4.7. nano crashes when I resize my window. How can I fix that?

-

Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9 would be great, 0.9.12 is recommended).

+

Older versions of nano had this problem, please upgrade to a newer version (at least 0.9.9, but 2.2.6 is recommended).

4.8. [version 1.3.12 and later] I'm using glibc 2.2.3, and nano crashes when I use color support or do regular expression searches. How can I fix that?

It's a bug in glibc 2.2.3. You should upgrade to at least glibc 2.2.4.

4.9. [version 1.1.12 and earlier] Why does nano show ^\ in the shortcut list instead of ^J?

-

The help (^G) and justify (^J) function were among the last to be written. To show the improvements that nano had over Pico (go to line # and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users. If you use the -p option to nano (or hit Meta-P) you will get the same shortcuts at the bottom as Pico.

+

The help (^G) and justify (^J) functions were among the last to be written. To show the improvements that nano had over Pico (go to line number, and replace), ^_ and ^\ were put on the shortcut list. Later, ^G came back in place of ^_ as it proved to be very valuable for new Unix users.

4.10a. [version 1.1.12 and earlier] When I type in a search string, the string I last searched for is already in front of my cursor! What happened?!

-

In nano version 0.9.20, the default is to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor. If you prefer the old behavior, use the Pico emulation mode (-p or --pico) or just hit Meta-P while in nano (see the ^G help text for more details).

+

Since nano version 0.9.20, the default was to have a completely consistent user interface across all user input functions. This means that regardless of whether you're being asked for a filename to insert or write, or a string to search for, the previous value is already inserted before the cursor.

4.10b. [version 1.1.99pre1 and later] Hey, the search string behavior has reverted, it's now like Pico, what happened to the consistency?

It was decided that consistency was nice, but people are used to Pico's inconsistent behavior. Also, in version 1.1.99pre1, search and replace history was introduced. If you wish to edit your previous search/replace entry (or any previous entry), you can do so by hitting the up arrow to cycle through your history. This method allows the best of both worlds: You don't need to erase the previous string if you want to enter a new one, but you can with one keystroke recall previous entries for editing. Therefore there is now no "Pico mode", nano is and has always been a Pico clone, and clones by default should be compatible.

4.11. How do I make nano my default editor (in Pine, mutt, etc.)?

@@ -208,7 +198,7 @@

export EDITOR=/usr/local/bin/nano

or, if you use tcsh, put this in your .cshrc file:

setenv EDITOR /usr/local/bin/nano

-

Change /usr/local/bin/nano to wherever nano is installed on your system. Type "which nano" to find out. This will not take effect until the next time you login. So log out and back in again.

+

Change /usr/local/bin/nano to wherever nano is installed on your system. Type "which nano" to find out. This will not take effect until the next time you log in. So log out and back in again.

Then, on top of that, if you use Pine, you must go into setup (type S at the main menu), and then configure (type C). Hit Enter on the lines that say:

[ ] enable-alternate-editor-cmd
[ ] enable-alternate-editor-implicitly

@@ -217,19 +207,24 @@

my_hdr X-Composer: nano x.y.z

Again, replace x.y.z with the version of nano you use.

4.12. I've compiled nano with color support, but I don't see any color when I run it!

-

If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Some example configurations are in the nanorc.sample that comes with the nano source or your nano package. See Section 3.9.

+

If you want nano to actually use color, you have to specify the color configurations you want it to use in your .nanorc. Several example configurations are in the doc/syntax subdirectory of the nano source, which are normally installed to /usr/local/share/nano. To enable all of them, uncomment the line # include "/usr/local/share/nano/*.nanorc" in your nanorc. See also section 3.9.

4.13. How do I select text for or paste text from the clipboard in an X terminal when I'm running nano in one and nano's mouse support is turned on?

Try holding down the Shift key and selecting or pasting the text as you normally would.

4.14. When I paste text into a document, each line gets indented further than the last. Why does nano do this, and how can I avoid it?

You have the autoindent feature turned on. Hit Meta-I to turn it off, paste your text, and then hit Meta-I again to turn it back on.

+

4.15. On startup I get a message that says "Detected a legacy nano history file". Now older nano versions can't find my search history!

+

In nano 2.3.0, cursor-position history was introduced, and both history files now reside under a .nano directory in your home. nano was trying to move this file into the new location so it could continue to use it. This means that if you try and use an earlier version of nano, it will be unable to see your current search history. To fix this, run the following commands:
+mv ~/.nano/search_history ~/.nano_history
+ln -sf ~/.nano_history ~/.nano/search_history
+

5. Internationalization

5.1. There's no translation for my language!

-

On June of 2001, GNU nano entered the Free Translation Project and since then, translations should be managed from there.

-

If there isn't a translation for your language, you could ask your language team to translate nano, or better still, join your team and do it yourself. Joining a team is easy. You just need to ask the TP coordinator to add you to your team, and send a translation disclaimer to the FSF (this is necessary as nano is an official GNU package, but it does not mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).

-

In any case, translating nano is very easy. Just grab the nano.pot file from the latest and greatest nano distribution (it's in the po/ directory) and translate each line into your native language on the msgstr line. When you're done, you should send it to the TP's central po repository.

+

On June of 2001, GNU nano entered the Translation Project and since then, translations should be managed from there.

+

If there isn't a translation for your language, you could ask your language team to translate nano, or better still, join that team and do it yourself. Joining a team is easy. You just need to ask the team leader to add you, and then send a translation disclaimer to the FSF (this is necessary as nano is an official GNU package, but it does not mean that you transfer the rights of your work to the FSF, it's just so the FSF can legally manage them).

+

In any case, translating nano is very easy. Just grab the latest nano.pot file listed on nano's page at the TP, and translate each msgid line into your native language on the msgstr line. When you're done, you should send it to the TP's central po repository.

5.2. I don't like the translation for <x> in my language. How can I fix it?

-

The best way would probably be to e-mail the person listed in the Last-Translator: field in the <your_language>.po file with your suggested corrections and they can make the changes reach the nano-devel list.

+

The best way would probably be to send an e-mail to the team's mailing listed mentione in the Language-Team: field in the <your_language>.po file with your suggested corrections, and then they can make the changes reach the nano-devel list.

5.3. What is the status of Unicode support?

In version 1.3.12 or later, Unicode should be usable. With your terminal, locale (LC_ALL and similar environment variables), and encoding configured to properly support UTF-8, you should be able to enter and save Unicode text.

@@ -246,22 +241,23 @@ Of course, due to the license change you can now use the

7. Miscellaneous

7.1. nano-related mailing lists.

-

There are three mailing lists for nano hosted at Savannah, info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:

+

There are three mailing lists for nano hosted at Savannah: info-nano, help-nano and nano-devel. info-nano is a very low traffic list where new versions of nano are announced (surprise!). help-nano is for getting help with the editor without needing to hear all of the development issues surrounding it. nano-devel is a normally low, sometimes high traffic list for discussing the present and future development of nano. Here are links to where you can sign up for a given list:

info-nano - http://mail.gnu.org/mailman/listinfo/info-nano/
help-nano - http://mail.gnu.org/mailman/listinfo/help-nano/
nano-devel - http://mail.gnu.org/mailman/listinfo/nano-devel/

7.2. I want to send the development team a big load of cash (or just a thank you).

-

That's fine. Send it our way! Better yet, fix a bug in the program or implement a cool feature and send us that instead (though cash is fine too).

+

That's fine. Send it our way! Better yet, fix a bug in the program or implement a cool feature and send us that instead (though cash is fine too).

7.3. How do I submit a bug report or patch?

-

The best place to submit bugs is to the Savannah bug tracker as you can check whether the bug you are submitting has already been submitted. +

The best place to submit bugs is to the Savannah bug tracker as you can check whether the bug you are submitting has already been submitted.

Please submit patches for nano via the Savannah project's patch manager for the nano project.

7.4. How do I join the development team?

-

The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after awhile. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.

+

The easiest way is to consistently send in good patches that add some needed functionality, fix a bug or two, and/or make the program more optimized/efficient. Then ask nicely and you will probably be added to the Savannah development list and be given SVN write access after a while. There is a lot of responsibility that goes along with being a team member, so don't think it's just something to add to your resume.

7.5. Can I have write access to the subversion tree?

Re-read Section 7.4 and you should know the answer.

8. ChangeLog

-

2009/11/30 - Update various bits for nano 2.2.x. (DLR)
+

2014/04/24 - A bunch of small fixes and updates. (Benno)
+2009/11/30 - Update various bits for nano 2.2.x. (DLR)
2009/11/18 - Typo fix. (j.mader@gmail.com)
2008/03/16 - Update docs to refer to subversion instead of CVS, add more words about Alpine, and refer to Savannah for bugs and patches. (chrisa)
2007/12/21 - Update maintainer information. (DLR)
@@ -326,6 +322,6 @@ Of course, due to the license change you can now use the &2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,11 +78,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ +@USE_NLS_TRUE@am__append_1 = fr +@USE_NANORC_TRUE@am__append_2 = nanorc.5 +@USE_NANORC_TRUE@am__append_3 = nanorc.5.html +@GROFF_HTML_TRUE@am__append_4 = $(html_pages) subdir = doc/man -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs $(dist_man_MANS) \ + $(am__dist_html_DATA_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -50,15 +100,33 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -80,18 +148,45 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(htmlmandir)" + "$(DESTDIR)$(htmldir)" man5dir = $(mandir)/man5 NROFF = nroff -MANS = $(man_MANS) -DATA = $(htmlman_DATA) +MANS = $(dist_man_MANS) +am__dist_html_DATA_DIST = nano.1.html rnano.1.html nanorc.5.html +DATA = $(dist_html_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = fr @@ -123,6 +218,7 @@ am__relativize = \ reldir="$$dir2" ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -168,6 +264,11 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_CONFIG = @NCURSESW_CONFIG@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -179,6 +280,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKGDATADIR = @PKGDATADIR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -208,6 +311,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +haveit = @haveit@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -232,26 +336,16 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@USE_NLS_FALSE@SUBDIRS = -@USE_NLS_TRUE@SUBDIRS = fr -@USE_NANORC_FALSE@man_MANS = nano.1 rnano.1 -@USE_NANORC_TRUE@man_MANS = nano.1 nanorc.5 rnano.1 -@GROFF_HTML_TRUE@@USE_NANORC_FALSE@BUILT_SOURCES = nano.1.html rnano.1.html -@GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html -nano_man_mans = nano.1 nanorc.5 rnano.1 -@GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html -@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html -@GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html -@GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans) -@GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) +SUBDIRS = $(am__append_1) +BUILT_SOURCES = $(am__append_4) +dist_man_MANS = nano.1 rnano.1 $(am__append_2) +html_pages = nano.1.html rnano.1.html $(am__append_3) +@GROFF_HTML_TRUE@dist_html_DATA = $(html_pages) +EXTRA_DIST = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -286,13 +380,20 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-man1: $(man_MANS) +install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -317,20 +418,25 @@ uninstall-man1: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man1dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } -install-man5: $(man_MANS) + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list=''; test -n "$(man5dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man5dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.5[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -355,51 +461,53 @@ uninstall-man5: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man5dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } -install-htmlmanDATA: $(htmlman_DATA) + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) +install-dist_htmlDATA: $(dist_html_DATA) @$(NORMAL_INSTALL) - test -z "$(htmlmandir)" || $(MKDIR_P) "$(DESTDIR)$(htmlmandir)" - @list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \ + @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmlmandir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmlmandir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ done -uninstall-htmlmanDATA: +uninstall-dist_htmlDATA: @$(NORMAL_UNINSTALL) - @list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \ + @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(htmlmandir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(htmlmandir)" && rm -f $$files + dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -414,57 +522,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -480,12 +543,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -497,15 +555,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -514,24 +568,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -563,13 +619,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -595,7 +648,7 @@ check: $(BUILT_SOURCES) all-am: Makefile $(MANS) $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmlmandir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -609,10 +662,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -645,7 +703,7 @@ info: info-recursive info-am: -install-data-am: install-htmlmanDATA install-man +install-data-am: install-dist_htmlDATA install-man install-dvi: install-dvi-recursive @@ -689,36 +747,35 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-htmlmanDATA uninstall-man +uninstall-am: uninstall-dist_htmlDATA uninstall-man uninstall-man: uninstall-man1 uninstall-man5 -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - ctags-recursive install install-am install-strip \ - tags-recursive +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic ctags \ - ctags-recursive distclean distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic cscopelist-am ctags ctags-am \ + distclean distclean-generic distclean-tags distdir dvi dvi-am \ + html html-am info info-am install install-am install-data \ + install-data-am install-dist_htmlDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-htmlmanDATA install-info \ - install-info-am install-man install-man1 install-man5 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ - tags-recursive uninstall uninstall-am uninstall-htmlmanDATA \ - uninstall-man uninstall-man1 uninstall-man5 - - -@GROFF_HTML_TRUE@nano.1.html: nano.1 -@GROFF_HTML_TRUE@ groff -t -mandoc -Thtml < $? > $@ -@GROFF_HTML_TRUE@nanorc.5.html: nanorc.5 -@GROFF_HTML_TRUE@ groff -t -mandoc -Thtml < $? > $@ -@GROFF_HTML_TRUE@rnano.1.html: rnano.1 -@GROFF_HTML_TRUE@ groff -t -mandoc -Thtml < $? > $@ + install-html-am install-info install-info-am install-man \ + install-man1 install-man5 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-dist_htmlDATA uninstall-man uninstall-man1 \ + uninstall-man5 + + +nano.1.html: nano.1 + groff -t -mandoc -Thtml < $? > $@ +nanorc.5.html: nanorc.5 + groff -t -mandoc -Thtml < $? > $@ +rnano.1.html: rnano.1 + groff -t -mandoc -Thtml < $? > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/man/fr/Makefile.am b/doc/man/fr/Makefile.am index 7a43052..d8c2d18 100644 --- a/doc/man/fr/Makefile.am +++ b/doc/man/fr/Makefile.am @@ -1,23 +1,15 @@ mandir = @mandir@/fr +htmldir = @htmldir@/fr -if USE_NANORC -man_MANS = nano.1 nanorc.5 rnano.1 -if GROFF_HTML -BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html -endif -else -man_MANS = nano.1 rnano.1 -if GROFF_HTML -BUILT_SOURCES = nano.1.html rnano.1.html -endif -endif +BUILT_SOURCES = -nano_man_mans = nano.1 nanorc.5 rnano.1 -if GROFF_HTML -htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html -htmlmandir = $(datadir)/nano/man-html/fr +dist_man_MANS = nano.1 rnano.1 +html_pages = nano.1.html rnano.1.html -nano_built_sources = nano.1.html nanorc.5.html rnano.1.html +if USE_NANORC +dist_man_MANS += nanorc.5 +html_pages += nanorc.5.html +endif nano.1.html: nano.1 groff -t -mandoc -Thtml < $? > $@ @@ -26,8 +18,9 @@ nanorc.5.html: nanorc.5 rnano.1.html: rnano.1 groff -t -mandoc -Thtml < $? > $@ -EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) -else -EXTRA_DIST = $(nano_man_mans) +if GROFF_HTML +BUILT_SOURCES += $(html_pages) +dist_html_DATA = $(html_pages) endif +EXTRA_DIST = $(BUILT_SOURCES) diff --git a/doc/man/fr/Makefile.in b/doc/man/fr/Makefile.in index 79d5987..3e3e3ac 100644 --- a/doc/man/fr/Makefile.in +++ b/doc/man/fr/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -34,11 +78,16 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -target_triplet = @target@ +@USE_NANORC_TRUE@am__append_1 = nanorc.5 +@USE_NANORC_TRUE@am__append_2 = nanorc.5.html +@GROFF_HTML_TRUE@am__append_3 = $(html_pages) subdir = doc/man/fr -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/mkinstalldirs $(dist_man_MANS) \ + $(am__dist_html_DATA_DIST) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ + $(top_srcdir)/m4/ax_check_compile_flag.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -50,8 +99,25 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -73,16 +139,25 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \ - "$(DESTDIR)$(htmlmandir)" + "$(DESTDIR)$(htmldir)" man5dir = $(mandir)/man5 NROFF = nroff -MANS = $(man_MANS) -DATA = $(htmlman_DATA) +MANS = $(dist_man_MANS) +am__dist_html_DATA_DIST = nano.1.html rnano.1.html nanorc.5.html +DATA = $(dist_html_DATA) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -128,6 +203,11 @@ MKDIR_P = @MKDIR_P@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ +NCURSESW_CFLAGS = @NCURSESW_CFLAGS@ +NCURSESW_CONFIG = @NCURSESW_CONFIG@ +NCURSESW_LIBS = @NCURSESW_LIBS@ +NCURSES_CFLAGS = @NCURSES_CFLAGS@ +NCURSES_LIBS = @NCURSES_LIBS@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -139,6 +219,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKGDATADIR = @PKGDATADIR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POSUB = @POSUB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -168,12 +250,13 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +haveit = @haveit@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = @htmldir@ +htmldir = @htmldir@/fr includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ @@ -192,24 +275,15 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ sysconfdir = @sysconfdir@ -target = @target@ target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -@USE_NANORC_FALSE@man_MANS = nano.1 rnano.1 -@USE_NANORC_TRUE@man_MANS = nano.1 nanorc.5 rnano.1 -@GROFF_HTML_TRUE@@USE_NANORC_FALSE@BUILT_SOURCES = nano.1.html rnano.1.html -@GROFF_HTML_TRUE@@USE_NANORC_TRUE@BUILT_SOURCES = nano.1.html nanorc.5.html rnano.1.html -nano_man_mans = nano.1 nanorc.5 rnano.1 -@GROFF_HTML_TRUE@htmlman_DATA = nano.1.html nanorc.5.html rnano.1.html -@GROFF_HTML_TRUE@htmlmandir = $(datadir)/nano/man-html/fr -@GROFF_HTML_TRUE@nano_built_sources = nano.1.html nanorc.5.html rnano.1.html -@GROFF_HTML_FALSE@EXTRA_DIST = $(nano_man_mans) -@GROFF_HTML_TRUE@EXTRA_DIST = $(nano_man_mans) $(nano_built_sources) +BUILT_SOURCES = $(am__append_3) +dist_man_MANS = nano.1 rnano.1 $(am__append_1) +html_pages = nano.1.html rnano.1.html $(am__append_2) +@GROFF_HTML_TRUE@dist_html_DATA = $(html_pages) +EXTRA_DIST = $(BUILT_SOURCES) all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -244,13 +318,20 @@ $(top_srcdir)/configure: $(am__configure_deps) $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-man1: $(man_MANS) +install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -275,20 +356,25 @@ uninstall-man1: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man1dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } -install-man5: $(man_MANS) + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-man5: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)" - @list=''; test -n "$(man5dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.5[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man5dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.5[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -313,54 +399,40 @@ uninstall-man5: @$(NORMAL_UNINSTALL) @list=''; test -n "$(man5dir)" || exit 0; \ files=`{ for i in $$list; do echo "$$i"; done; \ - l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ sed -n '/\.5[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man5dir)" && rm -f $$files; } -install-htmlmanDATA: $(htmlman_DATA) + dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir) +install-dist_htmlDATA: $(dist_html_DATA) @$(NORMAL_INSTALL) - test -z "$(htmlmandir)" || $(MKDIR_P) "$(DESTDIR)$(htmlmandir)" - @list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \ + @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(htmldir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ done | $(am__base_list) | \ while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmlmandir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(htmlmandir)" || exit $$?; \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(htmldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(htmldir)" || exit $$?; \ done -uninstall-htmlmanDATA: +uninstall-dist_htmlDATA: @$(NORMAL_UNINSTALL) - @list='$(htmlman_DATA)'; test -n "$(htmlmandir)" || list=; \ + @list='$(dist_html_DATA)'; test -n "$(htmldir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(htmlmandir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(htmlmandir)" && rm -f $$files -tags: TAGS -TAGS: + dir='$(DESTDIR)$(htmldir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -395,7 +467,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(MANS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmlmandir)"; do \ + for dir in "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(htmldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -409,10 +481,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -445,7 +522,7 @@ info: info-am info-am: -install-data-am: install-htmlmanDATA install-man +install-data-am: install-dist_htmlDATA install-man install-dvi: install-dvi-am @@ -489,32 +566,33 @@ ps: ps-am ps-am: -uninstall-am: uninstall-htmlmanDATA uninstall-man +uninstall-am: uninstall-dist_htmlDATA uninstall-man uninstall-man: uninstall-man1 uninstall-man5 .MAKE: all check install install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dist_htmlDATA install-dvi \ install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-htmlmanDATA install-info \ - install-info-am install-man install-man1 install-man5 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-htmlmanDATA uninstall-man uninstall-man1 \ + install-html-am install-info install-info-am install-man \ + install-man1 install-man5 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am ps ps-am tags-am uninstall uninstall-am \ + uninstall-dist_htmlDATA uninstall-man uninstall-man1 \ uninstall-man5 -@GROFF_HTML_TRUE@nano.1.html: nano.1 -@GROFF_HTML_TRUE@ groff -t -mandoc -Thtml < $? > $@ -@GROFF_HTML_TRUE@nanorc.5.html: nanorc.5 -@GROFF_HTML_TRUE@ groff -t -mandoc -Thtml < $? > $@ -@GROFF_HTML_TRUE@rnano.1.html: rnano.1 -@GROFF_HTML_TRUE@ groff -t -mandoc -Thtml < $? > $@ +nano.1.html: nano.1 + groff -t -mandoc -Thtml < $? > $@ +nanorc.5.html: nanorc.5 + groff -t -mandoc -Thtml < $? > $@ +rnano.1.html: rnano.1 + groff -t -mandoc -Thtml < $? > $@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/doc/man/fr/nano.1 b/doc/man/fr/nano.1 index f840374..fdfb3cd 100644 --- a/doc/man/fr/nano.1 +++ b/doc/man/fr/nano.1 @@ -2,14 +2,14 @@ .\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 .\" Free Software Foundation, Inc. .\" -.\" Le travail d'adaptation franaise de cette page de manuel a t -.\" ralis par Jean-Philippe Gurard, en 2003, 2004, 2005, 2006 et 2007. +.\" Le travail d'adaptation française de cette page de manuel a été +.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007. .\" Ce travail d'adaptation est dans le domaine public. Attention, la .\" page traduite reste soumise au droit d'auteur de ses auteurs .\" originaux. .\" .\" The French translation of this document is a public domain work of -.\" Jean-Philippe Gurard. This translation work was made in 2003, 2004, +.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004, .\" 2005, 2006 and 2007. The translated man page in itself is still .\" subject to the copyright of its original authors. .\" @@ -29,92 +29,92 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.\" Ce document est publi sous une double licence. Vous pouvez +.\" Ce document est publié sous une double licence. Vous pouvez .\" le distribuer et le modifier selon les termes de l'une des deux -.\" licences ci-dessous: +.\" licences ci-dessous : .\" -.\" * La Licence publique gnrale GNU (GNU GPL) version 3 ou, -.\" votre choix, suprieure, telle que publie par la Free -.\" Software Foundation. Vous devriez avoir reu une copie de la -.\" Licence publique gnrale GNU avec ce programme. Si ce n'est pas +.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à +.\" votre choix, supérieure, telle que publiée par la Free +.\" Software Foundation. Vous devriez avoir reçu une copie de la +.\" Licence publique générale GNU avec ce programme. Si ce n'est pas .\" le cas, consultez . .\" .\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou, -.\" votre choix, suprieure, telle que publie par la Free +.\" à votre choix, supérieure, telle que publiée par la Free .\" Software Foundation, sans section invariante, ni texte de -.\" premire ou de quatrime de couverture. Vous devriez avoir reu +.\" première ou de quatrième de couverture. Vous devriez avoir reçu .\" une copie de la Licence de documentation libre GNU avec ce .\" programme. Si ce n'est pas le cas, consultez .\" . .\" -.\" $Id: nano.1 4443 2009-11-27 02:50:12Z astyanax $ +.\" $Id: nano.1 5071 2014-07-16 17:25:55Z jordi $ .TH NANO 1 "version 2.0.0" "29\ novembre\ 2007" .\" Please adjust this date whenever revising the manpage. -.\" Merci de modifier ces dates chaque mise jour de cette page. +.\" Merci de modifier ces dates à chaque mise à jour de cette page. .\" .SH NOM -nano \- NAno un NOuvel diteur, un clone libre et amlior de Pico +nano \- NAno un NOuvel éditeur, un clone libre et amélioré de Pico .SH SYNOPSIS .B nano -.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]... +.I [OPTIONS]\ [[+LIGNE,COLONNE]\ FICHIER]... .br .SH DESCRIPTION -Cette page de manuel dcrit brivement la commande \fBnano\fR. +Cette page de manuel décrit brièvement la commande \fBnano\fR. .PP .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invoke bold face and italics, .\" respectively. -\fBnano\fR est un diteur petit, sympathique et libre, qui vise remplacer -Pico, l'diteur par dfaut du logiciel non libre Pine. \fBnano\fR ne se +\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à remplacer +Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se contentant pas de copier l'interface et l'ergonomie de Pico, il offre -galement certaines fonctions manquantes (ou dsactives par dfaut) -dans Pico. Ces fonctionnalits sont, par exemple, les fonctions de -recherche et de remplacement, et la possibilit de sauter directement -une ligne et une colonne prcise. +également certaines fonctions manquantes (ou désactivées par défaut) +dans Pico. Ces fonctionnalités sont, par exemple, les fonctions de +recherche et de remplacement, et la possibilité de sauter directement à +une ligne et à une colonne précise. .SH OPTIONS .TP -.B \+\fILIGNE\fP,\fICOLONNE\fP -Dmarre avec le curseur positionn la colonne \fICOLONNE\fP de -la ligne \fILIGNE\fR (l'un des deux, au moins, devant tre spcifi) au -lieu de dmarrer la colonne\ 1, ligne\ 1. +.B +\fILIGNE\fP,\fICOLONNE\fP +Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de +la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au +lieu de démarrer à la colonne\ 1, ligne\ 1. .TP .B \-? -Identique \fB-h (\-\-help)\fP. +Identique à \fB\-h (\-\-help)\fP. .TP .B \-A (\-\-smarthome) -Rend plus malin le fonctionnement de la touche \ Dbut\ . Lorsque l'on -appuie sur cette touche n'importe quel endroit except au tout dbut -du texte d'une ligne (i.\ e. au premier caractre non blanc), le curseur -se positionnera au dbut du texte de la ligne (qu'il soit en avant ou en -arrire). Si le curseur est dj l, il se placera au vrai dbut de la +Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque l'on +appuie sur cette touche à n'importe quel endroit excepté au tout début +du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur +se positionnera au début du texte de la ligne (qu'il soit en avant ou en +arrière). Si le curseur est déjà là, il se placera au vrai début de la ligne. .TP .B \-B (\-\-backup) -Lors de l'criture d'un fichier, cre une copie de scurit de la -version prcdente, en ajoutant un tilde (~) au nom du fichier. +Lors de l'écriture d'un fichier, crée une copie de sécurité de la +version précédente, en ajoutant un tilde (~) au nom du fichier. .TP .B \-D (\-\-boldtext) -Utilise des caractres gras la place de la vido inverse. +Utilise des caractères gras à la place de la vidéo inverse. .TP -.B \-C \fIrpertoire\fP (\-\-backupdir=\fIrpertoire\fP) -Dfinit le rpertoire utilis par \fBnano\fP pour enregistrer les copies -de scurit uniques si celles-ci sont actives. +.B \-C \fIrépertoire\fP (\-\-backupdir=\fIrépertoire\fP) +Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies +de sécurité uniques si celles-ci sont activées. .TP .B \-E (\-\-tabstospaces) Convertit les tabulations clavier en espaces. .TP .B \-F (\-\-multibuffer) -Active le mode multi-espace, autorisant l'dition simultane de +Active le mode multi-espace, autorisant l'édition simultanée de plusieurs fichiers, si ce mode est disponible. .TP .B \-H (\-\-historylog) -Enregistre les chanes ayant fait l'objet d'une recherche ou d'un +Enregistre les chaînes ayant fait l'objet d'une recherche ou d'un remplacement dans le fichier \fI~/.nano_history\fR afin de permettre leur -rutilisation. Ceci n'est possible que si \fBnano\fR est configur pour +réutilisation. Ceci n'est possible que si \fBnano\fR est configuré pour utiliser les fichiers nanorc. .TP .B \-I (\-\-ignorercfiles) @@ -122,63 +122,63 @@ Ne pas utiliser pas les fichiers \fISYSCONFDIR/nanorc\fR et \fI~/.nanorc\fR (si \fBnano\fR est capable de les utiliser). .TP .B \-K (\-\-rebindkeypad) -Interprte les touches du pav numrique afin qu'elles fonctionnent +Interprète les touches du pavé numérique afin qu'elles fonctionnent toutes correctement. Vous ne devriez utiliser cette option que si ce n'est pas le cas, car nano ne sera plus capable d'utiliser la souris -correctement lorsque cette option sera active. +correctement lorsque cette option sera activée. .TP .B \-L (\-\-nonewlines) -Ne pas ajouter de passage la ligne la fin des fichiers. +Ne pas ajouter de passage à la ligne à la fin des fichiers. .TP .B \-N (\-\-noconvert) -Dsactive la conversion automatique des fichiers depuis les formats Mac et +Désactive la conversion automatique des fichiers depuis les formats Mac et DOS. .TP .B \-O (\-\-morespace) -Utiliser la ligne blanche situe sous la ligne de titre comme -espace supplmentaire d'dition. +Utiliser la ligne blanche située sous la ligne de titre comme +espace supplémentaire d'édition. .TP -.B \-Q \fIchane\fP (\-\-quotestr=\fIchane\fP) -Dfinit le prfixe par dfaut des citations. Nano utilise ce prfixe -pour raliser une justification correcte des citations. Si nano est -capable d'utiliser des expressions rationnelles, le prfixe par dfaut +.B \-Q \fIchaîne\fP (\-\-quotestr=\fIchaîne\fP) +Définit le préfixe par défaut des citations. Nano utilise ce préfixe +pour réaliser une justification correcte des citations. Si nano est +capable d'utiliser des expressions rationnelles, le préfixe par défaut sera "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera "\fI>\ \fP". Dans -l'expression rationnelle prcdente, \ \fI\\t\fP\ reprsente une +l'expression rationnelle précédente, «\ \fI\\t\fP\ » représente une tabulation. .TP .B \-R (\-\-restricted) -Mode restreint\ : aucune lecture ou criture de fichiers non indiqus +Mode restreint\ : aucune lecture ou écriture de fichiers non indiqués sur la ligne de commande, pas de lecture des fichiers nanorc, -interdiction de suspendre, interdiction d'ajouter au dbut, la fin, -de sauvegarder un fichier ayant dj un nom sous un nom diffrent, -d'utiliser une copie de scurit ou le correcteur orthographique. Cette -option peut aussi tre active en appelant \fBnano\fP sous un nom -commenant par \ r\ (par exemple \ rnano\ ). +interdiction de suspendre, interdiction d'ajouter au début, à la fin, +de sauvegarder un fichier ayant déjà un nom sous un nom différent, +d'utiliser une copie de sécurité ou le correcteur orthographique. Cette +option peut aussi être activée en appelant \fBnano\fP sous un nom +commençant par «\ r\ » (par exemple «\ rnano\ »). .TP .B \-S (\-\-smooth) -Active le dfilement progressif. Le texte dfilera ligne-par-ligne au lieu -de dfiler morceau-par-morceau. +Active le défilement progressif. Le texte défilera ligne-par-ligne au lieu +de défiler morceau-par-morceau. .TP .B \-T \fInombre\fP (\-\-tabsize=\fInombre\fP) -Dfinit la taille (largeur) des tabulations en nombre de colonnes. Le -nombre indiqu doit tre strictement suprieur 0. La valeur par dfaut +Définit la taille (largeur) des tabulations en nombre de colonnes. Le +nombre indiqué doit être strictement supérieur à 0. La valeur par défaut est de 8. .TP .B \-U (\-\-quickblank) -Effacement rapide de la ligne d'tat. Les messages affichs par la ligne -d'tat disparatront aprs une frappe clavier au lieu de 25. Notez que +Effacement rapide de la ligne d'état. Les messages affichés par la ligne +d'état disparaîtront après une frappe clavier au lieu de 25. Notez que l'option \fB-c\fP prend le pas sur cette option. .TP .B \-V (\-\-version) -Affiche la version, puis s'arrte. +Affiche la version, puis s'arrête. .TP .B \-W (\-\-wordbounds) -Dtection plus prcise des limites de mots, obtenue en considrant les -caractres de ponctuation comme faisant partie des mots. +Détection plus précise des limites de mots, obtenue en considérant les +caractères de ponctuation comme faisant partie des mots. .TP -.B \-Y \fIchane\fP (\-\-syntax=\fIchane\fP) +.B \-Y \fIchaîne\fP (\-\-syntax=\fIchaîne\fP) Indique quel mode de colorisation syntaxique adopter, parmi les modes -dfinis dans le fichier \fI.nanorc\fR, si cette fonctionnalit est +définis dans le fichier \fI.nanorc\fR, si cette fonctionnalité est disponible. .TP .B \-c (\-\-const) @@ -186,111 +186,111 @@ Affiche en permanence la position du curseur. Notez que cette option prend le pas sur l'option \fB-U\fP. .TP .B \-d (\-\-rebinddelete) -Interprte diffremment la touche \ Supprimer\ , afin que les touches -\ Effacement arrire\ et \ Supprimer\ fonctionnent correctement. -Vous ne devriez avoir besoin de cette option que si, sur votre systme, -la touche \ Effacement arrire\ produit l'effet de la touche -\ Supprimer\ . +Interprète différemment la touche «\ Supprimer\ », afin que les touches +«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. +Vous ne devriez avoir besoin de cette option que si, sur votre système, +la touche «\ Effacement arrière\ » produit l'effet de la touche +«\ Supprimer\ ». .TP .B \-h (\-\-help) -Affiche un rsum des options de lancement de nano, puis s'arrte. +Affiche un résumé des options de lancement de nano, puis s'arrête. .TP .B \-i (\-\-autoindent) -Indentation automatique. Commence chaque nouvelle ligne au mme niveau que -la ligne prcdente. Utile pour l'dition de code source. +Indentation automatique. Commence chaque nouvelle ligne au même niveau que +la ligne précédente. Utile pour l'édition de code source. .TP .B \-k (\-\-cut) -Coupe le texte du curseur la fin de la ligne, au lieu de couper la -ligne entire. +Coupe le texte du curseur à la fin de la ligne, au lieu de couper la +ligne entière. .TP .B \-l (\-\-nofollow) -Si le fichier dit est un lien symbolique, au lieu de le suivre, -remplace le lien par le nouveau fichier. Sans doute utile pour diter +Si le fichier édité est un lien symbolique, au lieu de le suivre, +remplace le lien par le nouveau fichier. Sans doute utile pour éditer les fichiers de \fI/tmp\fR, non\ ? .TP .B \-m (\-\-mouse) Active l'utilisation de la souris, si elle est disponible pour votre -systme. Lorsque celle-ci est active, il est possible d'utiliser la +système. Lorsque celle-ci est activée, il est possible d'utiliser la souris pour positionner le curseur, pour marquer le texte (avec un double-clic) et pour lancer les fonctions correspondant aux raccourcis. Il est possible d'utiliser la souris sous X\ Window ou en mode console avec gpm. .TP -.B \-o \fIrpertoire\fP (\-\-operatingdir=\fIrpertoire\fP) -Dfinit le rpertoire de travail. Demande \fBnano\fP de mettre en place -quelque chose de similaire un environnement d'excution restreint +.B \-o \fIrépertoire\fP (\-\-operatingdir=\fIrépertoire\fP) +Définit le répertoire de travail. Demande à \fBnano\fP de mettre en place +quelque chose de similaire à un environnement d'exécution restreint (\fIchroot\fR). .TP .B \-p (\-\-preserve) -Prserve les squences XON et XOFF (^Q et ^S), afin qu'elle soient reues +Préserve les séquences XON et XOFF (^Q et ^S), afin qu'elle soient reçues par le terminal. .TP .B \-r \fIcolonne\fP (\-\-fill=\fIcolonne\fP) -Passe automatiquement la ligne une fois arriv la colonne -\fIcolonne\fR. Si la valeur indique est de 0 ou moins, le point de -passage la ligne aura lieu la taille de l'cran moins \fIcolonne\fR. -Cela permet de faire varier le point de passage la ligne lorsque l'on -change la taille de l'cran. La valeur par dfaut est de \-8. +Passe automatiquement à la ligne une fois arrivé à la colonne +\fIcolonne\fR. Si la valeur indiquée est de 0 ou moins, le point de +passage à la ligne aura lieu à la taille de l'écran moins \fIcolonne\fR. +Cela permet de faire varier le point de passage à la ligne lorsque l'on +change la taille de l'écran. La valeur par défaut est de \-8. .TP .B \-s \fIprogramme\fP (\-\-speller=\fIprogramme\fP) Choix d'un correcteur orthographique de remplacement. .TP .B \-t (\-\-tempfile) -S'il a t modifi, le fichier sera sauvegard automatiquement sans -demande de confirmation. Identique l'option \fB-t\fP de Pico. +S'il a été modifié, le fichier sera sauvegardé automatiquement sans +demande de confirmation. Identique à l'option \fB-t\fP de Pico. .TP .B \-v (\-\-view) Mode visualisation (lecture seule). .TP .B \-w (\-\-nowrap) -Dsactive le passage automatique la ligne. +Désactive le passage automatique à la ligne. .TP .B \-x (\-\-nohelp) -Dsactive la barre d'aide affiche en bas de l'cran. +Désactive la barre d'aide affichée en bas de l'écran. .TP .B \-z (\-\-suspend) -Autorise suspendre l'diteur. +Autorise à suspendre l'éditeur. .TP .B \-a, \-b, \-e, \-f, \-g, \-j -Ignor, pour tre compatible avec Pico. +Ignoré, pour être compatible avec Pico. .SH "FICHIERS D'INITIALISATION" \fBnano\fR lit les fichiers d'initialisation dans l'ordre suivant\ : -\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Rfrez-vous la page de +\fISYSCONFDIR/nanorc\fR, puis \fI~/.nanorc\fR. Référez-vous à la page de manuel de \fBnanorc(5)\fR et au fichier d'exemple \fInanorc.sample\fR, -qui devraient tous les deux tre livrs avec \fBnano\fR. +qui devraient tous les deux être livrés avec \fBnano\fR. .SH NOTES -Si aucun correcteur orthographique de remplacement n'est indiqu dans la +Si aucun correcteur orthographique de remplacement n'est indiqué dans la ligne de commande ou dans l'un des fichiers nanorc, \fBnano\fR prendra -la commande indique par la variable d'environnement \fBSPELL\fR si -elle est dfinie. +la commande indiquée par la variable d'environnement \fBSPELL\fR si +elle est définie. Dans certains cas, \fBnano\fR essaiera de sauvegarder le fichier en cours -d'dition dans un fichier de secours. Cela arrivera principalement si -\fBnano\fR reoit un signal SIGHUP ou SIGTERM, ou bien se trouve court de -mmoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en -cours n'avait pas encore de nom, ou sera compos du nom du fichier en cours -suivi du suffixe \ .save\ . Si un fichier de ce nom existe dj dans -le rpertoire, un \ .save\ et un nombre seront ajouts la fin du +d'édition dans un fichier de secours. Cela arrivera principalement si +\fBnano\fR reçoit un signal SIGHUP ou SIGTERM, ou bien se trouve à court de +mémoire. Le nom de ce fichier de secours sera \fInano.save\fR si le fichier en +cours n'avait pas encore de nom, ou sera composé du nom du fichier en cours +suivi du suffixe «\ .save\ ». Si un fichier de ce nom existe déjà dans +le répertoire, un «\ .save\ » et un nombre seront ajoutés à la fin du nom du fichier en cours afin de le rendre unique (par exemple, -\ .save.1\ ). En mode multi-espace, \fBnano\fR ralisera une +«\ .save.1\ »). En mode multi-espace, \fBnano\fR réalisera une sauvegarde de tous les fichiers en cours dans leurs fichiers de secours respectifs. .SH BOGUES Merci de nous faire parvenir vos commentaires et de nous signaler les -bogues, en crivant, en anglais, \fBnano@nano-editor.org\fR. +bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR. -La liste de discussion anglophone \fBnano\fR est disponible l'adresse +La liste de discussion anglophone \fBnano\fR est disponible à l'adresse \fBnano-devel@gnu.org\fR. -Pour vous abonner, envoyez un courrier lectronique -\fBnano-devel-request@gnu.org\fR, ayant pour objet \ subscribe\ . +Pour vous abonner, envoyez un courrier électronique à +\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ». -N'hsitez pas galement envoyez vos commentaires, suggestions et -corrections relatives l'adaptation franaise de cette page de manuel -ou du logiciel \fBjean-philippe.guerard@tigreraye.org\fR. +N'hésitez pas également à envoyez vos commentaires, suggestions et +corrections relatives à l'adaptation française de cette page de manuel +ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR. .SH "SITE INTERNET" http://www.nano-editor.org/ @@ -300,27 +300,27 @@ http://www.nano-editor.org/ .TP \fBnanorc\fR(5) .PP -\fI/usr/share/doc/nano/\fR (ou son quivalent sur votre systme) +\fI/usr/share/doc/nano/\fR (ou son équivalent sur votre système) .SH AUTEUR Chris Allegretta et d'autres (voir les fichiers \fIAUTHORS\fR et \fITHANKS\fR pour plus d'information). Cette page de -manuel a t initialement rdige par Jordi Mallach pour -le systme Debian (mais elle peut tre utilise par d'autres). +manuel a été initialement rédigée par Jordi Mallach pour +le système Debian (mais elle peut être utilisée par d'autres). .SH TRADUCTION -Cette adaptation franaise a t ralise par Jean-Philippe\ Gurard - le 29\ novembre\ 2007 partir +Cette adaptation française a été réalisée par Jean-Philippe\ Guérard + le 29\ novembre\ 2007 à partir de la version 1.54 du 11\ octobre\ 2007 de la page de manuel de nano -2.0.0. Cette page a t relue par Grard Delafond. +2.0.0. Cette page a été relue par Gérard Delafond. -Un maximum de soin a t apport lors de l'laboration de cette -traduction\ ; nanmoins, quelques imperfections peuvent subsister. Si -vous en rencontrez, que ce soit dans la version franaise ou dans la -version originale, n'hsitez pas les signaler l'auteur ou au +Un maximum de soin a été apporté lors de l'élaboration de cette +traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si +vous en rencontrez, que ce soit dans la version française ou dans la +version originale, n'hésitez pas à les signaler à l'auteur ou au traducteur. -La version originale la plus jour de ce document est toujours +La version originale la plus à jour de ce document est toujours consultable via la commande\ : LANGUAGE=en man nano diff --git a/doc/man/fr/nano.1.html b/doc/man/fr/nano.1.html index e8f9548..e7085e9 100644 --- a/doc/man/fr/nano.1.html +++ b/doc/man/fr/nano.1.html @@ -1,5 +1,5 @@ - - + + @@ -41,8 +41,8 @@

nano − -NAno un NOuvel éditeur, un clone libre et -amélioré de Pico

+NAno un NOuvel éditeur, un clone libre et +amélioré de Pico

SYNOPSIS @@ -58,21 +58,23 @@ amélioré de Pico

Cette page de -manuel décrit brièvement la commande -nano.

+manuel décrit brièvement la +commande nano.

nano est -un éditeur petit, sympathique et libre, qui vise -à remplacer Pico, l’éditeur par -défaut du logiciel non libre Pine. nano ne se -contentant pas de copier l’interface et -l’ergonomie de Pico, il offre également -certaines fonctions manquantes (ou désactivées -par défaut) dans Pico. Ces fonctionnalités -sont, par exemple, les fonctions de recherche et de -remplacement, et la possibilité de sauter directement -à une ligne et à une colonne -précise.

+un éditeur petit, sympathique et libre, qui +vise à remplacer Pico, +l’éditeur par défaut du +logiciel non libre Pine. nano ne se contentant pas de +copier l’interface et l’ergonomie de Pico, il +offre également certaines fonctions manquantes +(ou désactivées par +défaut) dans Pico. Ces +fonctionnalités sont, par exemple, les +fonctions de recherche et de remplacement, et la +possibilité de sauter directement +à une ligne et à une colonne +précise.

OPTIONS @@ -82,11 +84,12 @@ précise.

+LIGNE,COLONNE

-

Démarre avec le curseur -positionné à la colonne COLONNE de la -ligne LIGNE (l’un des deux, au moins, devant -être spécifié) au lieu de -démarrer à la colonne 1, +

Démarre avec le +curseur positionné à la colonne +COLONNE de la ligne LIGNE (l’un des +deux, au moins, devant être +spécifié) au lieu de +démarrer à la colonne 1, ligne 1.

−?

- - +
+ -

Identique à -h (−−help).

 +

Identique à −h +(−−help).
@@ -111,39 +115,42 @@ ligne 1.

Rend plus malin le fonctionnement de la touche -« Début ». Lorsque l’on -appuie sur cette touche à n’importe quel -endroit excepté au tout début du texte -d’une ligne (i. e. au premier caractère -non blanc), le curseur se positionnera au début du -texte de la ligne (qu’il soit en avant ou en -arrière). Si le curseur est déjà -là, il se placera au vrai début de la -ligne.

+« Début Â». +Lorsque l’on appuie sur cette touche à +n’importe quel endroit excepté au tout +début du texte d’une ligne (i. e. au +premier caractère non blanc), le curseur se +positionnera au début du texte de la ligne +(qu’il soit en avant ou en arrière). Si le +curseur est déjà là, +il se placera au vrai début de la ligne.

−B (−−backup)

-

Lors de l’écriture -d’un fichier, crée une copie de -sécurité de la version -précédente, en ajoutant un tilde (~) au nom du -fichier.

+

Lors de +l’écriture d’un fichier, +crée une copie de +sécurité de la version +précédente, en ajoutant un tilde +(~) au nom du fichier.

−D (−−boldtext)

-

Utilise des caractères -gras à la place de la vidéo inverse.

+

Utilise des +caractères gras à la place de la +vidéo inverse.

−C -répertoire -(−−backupdir=répertoire)

+répertoire +(−−backupdir=répertoire)

-

Définit le -répertoire utilisé par nano pour -enregistrer les copies de sécurité uniques si -celles-ci sont activées.

+

Définit le +répertoire utilisé par nano +pour enregistrer les copies de +sécurité uniques si celles-ci sont +activées.

−E (−−tabstospaces)

@@ -155,18 +162,20 @@ clavier en espaces.

(−−multibuffer)

Active le mode multi-espace, -autorisant l’édition simultanée de -plusieurs fichiers, si ce mode est disponible.

+autorisant l’édition +simultanée de plusieurs fichiers, si ce mode +est disponible.

−H (−−historylog)

-

Enregistre les chaînes -ayant fait l’objet d’une recherche ou d’un -remplacement dans le fichier ~/.nano_history afin de -permettre leur réutilisation. Ceci n’est -possible que si nano est configuré pour -utiliser les fichiers nanorc.

+

Enregistre les +chaînes ayant fait l’objet d’une +recherche ou d’un remplacement dans le fichier +~/.nano_history afin de permettre leur +réutilisation. Ceci n’est possible que si +nano est configuré pour utiliser les +fichiers nanorc.

−I (−−ignorercfiles)

@@ -178,110 +187,120 @@ fichiers SYSCONFDIR/nanorc et ~/.nanorc (si

−K (−−rebindkeypad)

-

Interprète les touches -du pavé numérique afin qu’elles -fonctionnent toutes correctement. Vous ne devriez utiliser -cette option que si ce n’est pas le cas, car nano ne -sera plus capable d’utiliser la souris correctement -lorsque cette option sera activée.

+

Interprète les +touches du pavé numérique afin +qu’elles fonctionnent toutes correctement. Vous ne +devriez utiliser cette option que si ce n’est pas le +cas, car nano ne sera plus capable d’utiliser la +souris correctement lorsque cette option sera +activée.

−L (−−nonewlines)

Ne pas ajouter de passage -à la ligne à la fin des fichiers.

+à la ligne à la fin des +fichiers.

−N (−−noconvert)

-

Désactive la conversion -automatique des fichiers depuis les formats Mac et DOS.

+

Désactive la +conversion automatique des fichiers depuis les formats Mac +et DOS.

−O (−−morespace)

Utiliser la ligne blanche -située sous la ligne de titre comme espace -supplémentaire d’édition.

+située sous la ligne de titre comme espace +supplémentaire +d’édition.

−Q -chaîne -(−−quotestr=chaîne)

- -

Définit le -préfixe par défaut des citations. Nano utilise -ce préfixe pour réaliser une justification -correcte des citations. Si nano est capable d’utiliser -des expressions rationnelles, le préfixe par -défaut sera +chaîne +(−−quotestr=chaîne)

+ +

Définit le +préfixe par défaut des citations. +Nano utilise ce préfixe pour +réaliser une justification correcte des +citations. Si nano est capable d’utiliser des +expressions rationnelles, le préfixe par +défaut sera "^([ \t]*[#:>\|}])+", sinon, ce sera "> ". Dans l’expression -rationnelle précédente, -« \t » représente une -tabulation.

+rationnelle précédente, +« \t Â» +représente une tabulation.

−R (−−restricted)

Mode restreint : aucune -lecture ou écriture de fichiers non indiqués -sur la ligne de commande, pas de lecture des fichiers -nanorc, interdiction de suspendre, interdiction -d’ajouter au début, à la fin, de -sauvegarder un fichier ayant déjà un nom sous -un nom différent, d’utiliser une copie de -sécurité ou le correcteur orthographique. -Cette option peut aussi être activée en -appelant nano sous un nom commençant par -« r » (par exemple -« rnano »).

+lecture ou écriture de fichiers non +indiqués sur la ligne de commande, pas de +lecture des fichiers nanorc, interdiction de suspendre, +interdiction d’ajouter au début, +à la fin, de sauvegarder un fichier ayant +déjà un nom sous un nom +différent, d’utiliser une copie de +sécurité ou le correcteur +orthographique. Cette option peut aussi être +activée en appelant nano sous un nom +commençant par +« r Â» (par exemple +« rnano Â»).

−S (−−smooth)

-

Active le défilement -progressif. Le texte défilera ligne-par-ligne au lieu -de défiler morceau-par-morceau.

+

Active le +défilement progressif. Le texte +défilera ligne-par-ligne au lieu de +défiler morceau-par-morceau.

−T nombre (−−tabsize=nombre)

-

Définit la taille +

Définit la taille (largeur) des tabulations en nombre de colonnes. Le nombre -indiqué doit être strictement supérieur -à 0. La valeur par défaut est de 8.

+indiqué doit être strictement +supérieur à 0. La valeur par +défaut est de 8.

−U (−−quickblank)

Effacement rapide de la ligne -d’état. Les messages affichés par la -ligne d’état disparaîtront après -une frappe clavier au lieu de 25. Notez que l’option --c prend le pas sur cette option.

+d’état. Les messages +affichés par la ligne d’état +disparaîtront après une frappe +clavier au lieu de 25. Notez que l’option -c +prend le pas sur cette option.

−V (−−version)

Affiche la version, puis -s’arrête.

+s’arrête.

−W (−−wordbounds)

-

Détection plus -précise des limites de mots, obtenue en -considérant les caractères de ponctuation -comme faisant partie des mots.

+

Détection plus +précise des limites de mots, obtenue en +considérant les caractères de +ponctuation comme faisant partie des mots.

−Y -chaîne -(−−syntax=chaîne)

+chaîne +(−−syntax=chaîne)

Indique quel mode de colorisation syntaxique adopter, parmi les modes -définis dans le fichier .nanorc, si cette -fonctionnalité est disponible.

+définis dans le fichier .nanorc, si +cette fonctionnalité est disponible.

−c (−−const)

@@ -293,89 +312,95 @@ l’option -U.

−d (−−rebinddelete)

-

Interprète -différemment la touche -« Supprimer », afin que les touches -« Effacement arrière » et -« Supprimer » fonctionnent -correctement. Vous ne devriez avoir besoin de cette option -que si, sur votre système, la touche -« Effacement arrière » produit +

Interprète +différemment la touche +« Supprimer Â», afin que +les touches « Effacement +arrière Â» et +« Supprimer Â» +fonctionnent correctement. Vous ne devriez avoir besoin de +cette option que si, sur votre système, la +touche « Effacement +arrière Â» produit l’effet de la touche -« Supprimer ».

+« Supprimer Â».

−h (−−help)

-

Affiche un résumé -des options de lancement de nano, puis -s’arrête.

+

Affiche un +résumé des options de lancement de +nano, puis s’arrête.

−i (−−autoindent)

Indentation automatique. -Commence chaque nouvelle ligne au même niveau que la -ligne précédente. Utile pour -l’édition de code source.

+Commence chaque nouvelle ligne au même niveau +que la ligne précédente. Utile +pour l’édition de code source.

−k (−−cut)

Coupe le texte du curseur -à la fin de la ligne, au lieu de couper la ligne -entière.

+à la fin de la ligne, au lieu de couper la +ligne entière.

−l (−−nofollow)

Si le fichier -édité est un lien symbolique, au lieu de le -suivre, remplace le lien par le nouveau fichier. Sans doute -utile pour éditer les fichiers de /tmp, -non ?

+édité est un lien symbolique, au +lieu de le suivre, remplace le lien par le nouveau fichier. +Sans doute utile pour éditer les fichiers de +/tmp, non ?

−m (−−mouse)

Active l’utilisation de -la souris, si elle est disponible pour votre système. -Lorsque celle-ci est activée, il est possible -d’utiliser la souris pour positionner le curseur, pour -marquer le texte (avec un double-clic) et pour lancer les -fonctions correspondant aux raccourcis. Il est possible +la souris, si elle est disponible pour votre +système. Lorsque celle-ci est +activée, il est possible d’utiliser la +souris pour positionner le curseur, pour marquer le texte +(avec un double-clic) et pour lancer les fonctions +correspondant aux raccourcis. Il est possible d’utiliser la souris sous X Window ou en mode console avec gpm.

−o -répertoire -(−−operatingdir=répertoire)

- -

Définit le -répertoire de travail. Demande à nano -de mettre en place quelque chose de similaire à un -environnement d’exécution restreint +répertoire +(−−operatingdir=répertoire)

+ +

Définit le +répertoire de travail. Demande à +nano de mettre en place quelque chose de similaire +à un environnement +d’exécution restreint (chroot).

−p (−−preserve)

-

Préserve les -séquences XON et XOFF (^Q et ^S), afin qu’elle -soient reçues par le terminal.

+

Préserve les +séquences XON et XOFF (^Q et ^S), afin +qu’elle soient reçues par le +terminal.

−r colonne (−−fill=colonne)

-

Passe automatiquement à -la ligne une fois arrivé à la colonne -colonne. Si la valeur indiquée est de 0 ou -moins, le point de passage à la ligne aura lieu -à la taille de l’écran moins -colonne. Cela permet de faire varier le point de -passage à la ligne lorsque l’on change la -taille de l’écran. La valeur par défaut -est de −8.

+

Passe automatiquement +à la ligne une fois arrivé +à la colonne colonne. Si la valeur +indiquée est de 0 ou moins, le point de passage +à la ligne aura lieu à la taille +de l’écran moins colonne. Cela +permet de faire varier le point de passage à la +ligne lorsque l’on change la taille de +l’écran. La valeur par +défaut est de −8.

−s programme @@ -387,10 +412,11 @@ orthographique de remplacement.

−t (−−tempfile)

-

S’il a été -modifié, le fichier sera sauvegardé -automatiquement sans demande de confirmation. Identique -à l’option -t de Pico.

+

S’il a +été modifié, le +fichier sera sauvegardé automatiquement sans +demande de confirmation. Identique à +l’option -t de Pico.

−v (−−view)

@@ -401,27 +427,27 @@ seule).

−w (−−nowrap)

-

Désactive le passage -automatique à la ligne.

+

Désactive le +passage automatique à la ligne.

−x (−−nohelp)

-

Désactive la barre -d’aide affichée en bas de -l’écran.

+

Désactive la barre +d’aide affichée en bas de +l’écran.

−z (−−suspend)

-

Autorise à suspendre -l’éditeur.

+

Autorise à +suspendre l’éditeur.

−a, −b, −e, −f, −g, −j

-

Ignoré, pour être -compatible avec Pico.

+

Ignoré, pour +être compatible avec Pico.

FICHIERS D’INITIALISATION @@ -431,10 +457,11 @@ compatible avec Pico.

nano lit les fichiers d’initialisation dans l’ordre suivant : SYSCONFDIR/nanorc, puis -~/.nanorc. Référez-vous à la -page de manuel de nanorc(5) et au fichier -d’exemple nanorc.sample, qui devraient tous les -deux être livrés avec nano.

+~/.nanorc. Référez-vous +à la page de manuel de nanorc(5) et au +fichier d’exemple nanorc.sample, qui devraient +tous les deux être livrés avec +nano.

NOTES @@ -443,28 +470,31 @@ deux être livrés avec nano.

Si aucun correcteur orthographique de remplacement n’est -indiqué dans la ligne de commande ou dans l’un -des fichiers nanorc, nano prendra la commande -indiquée par la variable d’environnement -SPELL si elle est définie.

+indiqué dans la ligne de commande ou dans +l’un des fichiers nanorc, nano prendra la +commande indiquée par la variable +d’environnement SPELL si elle est +définie.

Dans certains cas, nano essaiera de sauvegarder le fichier en cours -d’édition dans un fichier de secours. Cela -arrivera principalement si nano reçoit un -signal SIGHUP ou SIGTERM, ou bien se trouve à court -de mémoire. Le nom de ce fichier de secours sera -nano.save si le fichier en cours n’avait pas -encore de nom, ou sera composé du nom du fichier en -cours suivi du suffixe « .save ». Si -un fichier de ce nom existe déjà dans le -répertoire, un « .save » et un -nombre seront ajoutés à la fin du nom du +d’édition dans un fichier de secours. +Cela arrivera principalement si nano +reçoit un signal SIGHUP ou SIGTERM, ou bien se +trouve à court de mémoire. Le nom +de ce fichier de secours sera nano.save si le fichier +en cours n’avait pas encore de nom, ou sera +composé du nom du fichier en cours suivi du +suffixe « .save Â». Si un +fichier de ce nom existe déjà dans +le répertoire, un +« .save Â» et un nombre +seront ajoutés à la fin du nom du fichier en cours afin de le rendre unique (par exemple, -« .save.1 »). En mode multi-espace, -nano réalisera une sauvegarde de tous les -fichiers en cours dans leurs fichiers de secours -respectifs.

+« .save.1 Â»). En mode +multi-espace, nano réalisera une +sauvegarde de tous les fichiers en cours dans leurs fichiers +de secours respectifs.

BOGUES @@ -473,24 +503,25 @@ respectifs.

Merci de nous faire parvenir vos commentaires et de nous signaler les -bogues, en écrivant, en anglais, à +bogues, en écrivant, en anglais, à nano@nano-editor.org.

La liste de -discussion anglophone nano est disponible à -l’adresse nano-devel@gnu.org.

+discussion anglophone nano est disponible +à l’adresse +nano-devel@gnu.org.

Pour vous -abonner, envoyez un courrier électronique à -nano-devel-request@gnu.org, ayant pour objet -« subscribe ».

+abonner, envoyez un courrier électronique +à nano-devel-request@gnu.org, ayant pour +objet « subscribe Â».

-

N’hésitez -pas également à envoyez vos commentaires, -suggestions et corrections relatives à -l’adaptation française de cette page de manuel -ou du logiciel à +

N’hésitez +pas également à envoyez vos +commentaires, suggestions et corrections relatives +à l’adaptation française de +cette page de manuel ou du logiciel à jean-philippe.guerard@tigreraye.org.

SITE INTERNET @@ -509,8 +540,8 @@ ou du logiciel à

nanorc(5)
-/usr/share/doc/nano/ (ou son équivalent sur votre -système)

+/usr/share/doc/nano/ (ou son équivalent sur +votre système)

AUTEUR @@ -521,9 +552,10 @@ système)

Allegretta <chrisa@asty.org> et d’autres (voir les fichiers AUTHORS et THANKS pour plus d’information). Cette page de manuel a -été initialement rédigée par -Jordi Mallach <jordi@gnu.org> pour le système -Debian (mais elle peut être utilisée par +été initialement +rédigée par Jordi Mallach +<jordi@gnu.org> pour le système Debian +(mais elle peut être utilisée par d’autres).

TRADUCTION @@ -532,26 +564,30 @@ d’autres).

Cette -adaptation française a été -réalisée par Jean-Philippe Guérard +adaptation française a +été +réalisée par +Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org> le -29 novembre 2007 à partir de la version -1.54 du 11 octobre 2007 de la page de manuel de -nano 2.0.0. Cette page a été relue par -Gérard Delafond.

+29 novembre 2007 à partir de la +version 1.54 du 11 octobre 2007 de la page de +manuel de nano 2.0.0. Cette page a +été relue par Gérard +Delafond.

Un maximum de -soin a été apporté lors de -l’élaboration de cette traduction ; -néanmoins, quelques imperfections peuvent subsister. -Si vous en rencontrez, que ce soit dans la version -française ou dans la version originale, -n’hésitez pas à les signaler à -l’auteur ou au traducteur.

+soin a été apporté +lors de l’élaboration de cette +traduction ; néanmoins, quelques +imperfections peuvent subsister. Si vous en rencontrez, que +ce soit dans la version française ou dans la +version originale, n’hésitez pas +à les signaler à l’auteur ou +au traducteur.

La version -originale la plus à jour de ce document est toujours -consultable via la commande :

+originale la plus à jour de ce document est +toujours consultable via la commande :

LANGUAGE=en man nano

diff --git a/doc/man/fr/nanorc.5 b/doc/man/fr/nanorc.5 index 0607045..9c25635 100644 --- a/doc/man/fr/nanorc.5 +++ b/doc/man/fr/nanorc.5 @@ -2,14 +2,14 @@ .\" Copyright (C) 2003, 2004, 2005, 2006, 2007 .\" Free Software Foundation, Inc. .\" -.\" Le travail d'adaptation franaise de cette page de manuel a t -.\" ralis par Jean-Philippe Gurard, en 2003, 2004, 2005, 2006 et 2007. +.\" Le travail d'adaptation française de cette page de manuel a été +.\" réalisé par Jean-Philippe Guérard, en 2003, 2004, 2005, 2006 et 2007. .\" Ce travail d'adaptation est dans le domaine public. Attention, la .\" page traduite reste soumise au droit d'auteur de ses auteurs .\" originaux. .\" .\" The French translation of this document is a public domain work of -.\" Jean-Philippe Gurard. This translation work was made in 2003, 2004, +.\" Jean-Philippe Guérard. This translation work was made in 2003, 2004, .\" 2005, 2006 and 2007. The translated man page in itself is still .\" subject to the copyright of its original authors. .\" @@ -29,71 +29,71 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.\" Ce document est publi sous une double licence. Vous pouvez +.\" Ce document est publié sous une double licence. Vous pouvez .\" le distribuer et le modifier selon les termes de l'une des deux -.\" licences ci-dessous: +.\" licences ci-dessous : .\" -.\" * La Licence publique gnrale GNU (GNU GPL) version 3 ou, -.\" votre choix, suprieure, telle que publie par la Free -.\" Software Foundation. Vous devriez avoir reu une copie de la -.\" Licence publique gnrale GNU avec ce programme. Si ce n'est +.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à +.\" votre choix, supérieure, telle que publiée par la Free +.\" Software Foundation. Vous devriez avoir reçu une copie de la +.\" Licence publique générale GNU avec ce programme. Si ce n'est .\" pas le cas, consultez . .\" .\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 -.\" ou, votre choix, suprieure, telle que publie par la Free +.\" ou, à votre choix, supérieure, telle que publiée par la Free .\" Software Foundation, sans section invariante, ni texte de -.\" premire ou de quatrime de couverture. Vous devriez avoir reu +.\" première ou de quatrième de couverture. Vous devriez avoir reçu .\" une copie de la Licence de documentation libre GNU avec ce .\" programme. Si ce n'est pas le cas, consultez .\" . .\" -.\" $Id: nanorc.5 4443 2009-11-27 02:50:12Z astyanax $ +.\" $Id: nanorc.5 5071 2014-07-16 17:25:55Z jordi $ .TH NANORC 5 "version 2.0.0" "29\ novembre\ 2007" .\" Please adjust this date whenever revising the manpage. -.\" Merci de modifier ces dates chaque mise jour de cette page. +.\" Merci de modifier ces dates à chaque mise à jour de cette page. .SH NOM -nanorc \- fichier de configuration de l'diteur nano du projet GNU +nanorc \- fichier de configuration de l'éditeur nano du projet GNU .SH DESCRIPTION -Cette page de manuel dcrit brivement le fichier de configuration de -l'diteur \fBnano\fP GNU. +Cette page de manuel décrit brièvement le fichier de configuration de +l'éditeur \fBnano\fP GNU. .PP -\fBnano\fP est un petit diteur sympathique et libre, qui vise -remplacer Pico, l'diteur par dfaut du logiciel non libre Pine. +\fBnano\fP est un petit éditeur sympathique et libre, qui vise à +remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fP ne se contentant pas de copier l'interface et l'ergonomie de -Pico, il offre galement certaines fonctionnalits manquantes (ou -dsactives par dfaut) de Pico. Ces fonctionnalits sont, par exemple, -les fonctions de recherche et de remplacement et la possibilit de -sauter directement une ligne et une colonne prcise. +Pico, il offre également certaines fonctionnalités manquantes (ou +désactivées par défaut) de Pico. Ces fonctionnalités sont, par exemple, +les fonctions de recherche et de remplacement et la possibilité de +sauter directement à une ligne et à une colonne précise. .PP -Le fichier \fInanorc\fP contient les paramtres par dfaut de -\fBnano\fP. Il ne doit pas tre au format DOS ou Mac. Lors de son -dmarrage, nano commencera par lire le fichier de configuration gnral +Le fichier \fInanorc\fP contient les paramètres par défaut de +\fBnano\fP. Il ne doit pas être au format DOS ou Mac. Lors de son +démarrage, nano commencera par lire le fichier de configuration général \fISYSCONFDIR/nanorc\fP, puis lira le fichier de configuration personnel de l'utilisateur \fI~/.nanorc\fP. .SH OPTIONS -Le fichier de configuration accepte une srie de commandes \fBset\fP -(activer) et \fBunset\fP (dsactiver), qui permettent de dfinir le -paramtrage de nano au dmarrage sans avoir utiliser d'options de +Le fichier de configuration accepte une série de commandes \fBset\fP +(activer) et \fBunset\fP (désactiver), qui permettent de définir le +paramétrage de nano au démarrage sans avoir à utiliser d'options de ligne de commande. De plus, les mots clefs \fBsyntax\fP (syntaxe), -\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible la casse) -sont utiliss pour dfinir les rgles de colorisation pour diffrents +\fBcolor\fP (couleur) et \fBicolor\fP (couleur insensible à la casse) +sont utilisés pour définir les règles de colorisation pour différents motifs de texte. \fBnano\fP lit une commande par ligne. -Les options du fichier de configuration ont priorit sur les valeurs par -dfaut utilises par nano. Les options de la ligne de commande sont +Les options du fichier de configuration ont priorité sur les valeurs par +défaut utilisées par nano. Les options de la ligne de commande sont prioritaires par rapport aux options du fichier de configuration. Les -options sont dsactives (unset) par dfaut, sauf les options prenant un +options sont désactivées (unset) par défaut, sauf les options prenant un argument. -Les apostrophes (\ \fI'\fP\ ) et les guillemets droits (\ \fI"\fP\ ) -prsents dans des chanes de caractres utilises comme paramtres n'ont -pas besoin d'tre prcdes d'une barre oblique inverse -(\ \fI\\\fP\ ). La chane sera termine par le dernier guillemet +Les apostrophes («\ \fI'\fP\ ») et les guillemets droits («\ \fI"\fP\ ») +présents dans des chaînes de caractères utilisées comme paramètres n'ont +pas besoin d'être précédées d'une barre oblique inversée +(«\ \fI\\\fP\ »). La chaîne sera terminée par le dernier guillemet droit. Par exemple, pour l'option \fBbrackets\fP, "\fI"')>]}\fP" -correspondra \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP. +correspondra à \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP et \fI}\fP. Les commandes et arguments reconnus sont\ : @@ -102,69 +102,69 @@ Les commandes et arguments reconnus sont\ : Active l'indentation automatique. .TP .B set/unset backup -Cre des copies de scurit nommes +Crée des copies de sécurité nommées .IR nom_du_fichier~ . .TP -.B set backupdir "\fIrpertoire\fP" -Dfinit le rpertoire utilis par \fBnano\fP pour enregistrer les copies -de scurit uniques, si l'enregistrement de copies de scurit est -activ. +.B set backupdir "\fIrépertoire\fP" +Définit le répertoire utilisé par \fBnano\fP pour enregistrer les copies +de sécurité uniques, si l'enregistrement de copies de sécurité est +activé. .TP .B set/unset backwards -Par dfaut, les recherches se font vers l'arrire. +Par défaut, les recherches se font vers l'arrière. .TP .B set/unset boldtext -Utilise des caractres gras la place de la vido inverse. +Utilise des caractères gras à la place de la vidéo inverse. .TP -.B set brackets "\fIchane\fP" -Dfinit les caractres considrs comme des crochets fermants lors de la -justification des paragraphes. Ces caractres ne doivent pas contenir -d'espaces. Seules les ponctuations terminales, ventuellement suivies +.B set brackets "\fIchaîne\fP" +Définit les caractères considérés comme des crochets fermants lors de la +justification des paragraphes. Ces caractères ne doivent pas contenir +d'espaces. Seules les ponctuations terminales, éventuellement suivies de crochets fermants, peuvent terminer une phrase. -La valeur par dfaut de cette option est\ : "\fI"')>]}\fP". +La valeur par défaut de cette option est\ : "\fI"')>]}\fP". N.D.T.\ : reportez-vous au paragraphe sur l'option \fBpunct\fR pour plus d'informations. .TP .B set/unset casesensitive -Par dfaut, les recherches ne tiennent pas compte de la casse. +Par défaut, les recherches ne tiennent pas compte de la casse. .TP .B set/unset const -Affiche en permanence la position du curseur dans la ligne d'tat. +Affiche en permanence la position du curseur dans la ligne d'état. .TP .B set/unset cut -Par dfaut, coupe le texte du curseur la fin de la ligne, au lieu de -couper la ligne entire. +Par défaut, coupe le texte du curseur à la fin de la ligne, au lieu de +couper la ligne entière. .TP .B set fill \fIn\fP -Passe automatiquement la ligne une fois arriv la colonne -\fIn\fR. Si la valeur indique est de 0 ou moins, le point de passage -la ligne aura lieu la taille de l'cran moins \fIn\fR. Cela permet de -faire varier le point de passage la ligne lorsque l'on change la -taille de l'cran. La valeur par dfaut est de \-8. +Passe automatiquement à la ligne une fois arrivé à la colonne +\fIn\fR. Si la valeur indiquée est de 0 ou moins, le point de passage à +la ligne aura lieu à la taille de l'écran moins \fIn\fR. Cela permet de +faire varier le point de passage à la ligne lorsque l'on change la +taille de l'écran. La valeur par défaut est de \-8. .TP .B set/unset historylog Active l'utilisation de .I ~/.nano_history -pour enregistrer et relire les chanes ayant fait l'objet d'une +pour enregistrer et relire les chaînes ayant fait l'objet d'une recherche ou d'un remplacement. .TP -.B set matchbrackets "\fIchane\fP" -Dfinit les crochets ouvrants et fermant pour la recherche de crochets +.B set matchbrackets "\fIchaîne\fP" +Définit les crochets ouvrants et fermant pour la recherche de crochets correspondants. Cette liste ne doit pas contenir de blancs. L'ensemble -des crochets ouvrants doit tre indiqu en premier, suivi de l'ensemble -des crochets fermant, qui doit tre dans le mme ordre. La valeur par -dfaut de cette option est "\fI(<[{)>]}\fP". +des crochets ouvrants doit être indiqué en premier, suivi de l'ensemble +des crochets fermant, qui doit être dans le même ordre. La valeur par +défaut de cette option est "\fI(<[{)>]}\fP". .TP .B set/unset morespace -Utiliser la ligne blanche situe sous la ligne de titre comme espace -supplmentaire d'dition. +Utiliser la ligne blanche située sous la ligne de titre comme espace +supplémentaire d'édition. .TP .B set/unset mouse Active l'utilisation de la souris, si elle est disponible pour votre -systme. Lorsque celle-ci est active, il est possible d'utiliser la +système. Lorsque celle-ci est activée, il est possible d'utiliser la souris pour positionner le curseur, pour marquer le texte (avec un double-clic) et pour lancer les fonctions correspondant aux raccourcis. Il est possible d'utiliser la souris sous X\ Window ou en mode console @@ -178,167 +178,167 @@ espace. Pas de conversion depuis les formats DOS et Mac. .TP .B set/unset nofollow -Ne suit pas les liens symboliques lors de l'criture des fichiers. +Ne suit pas les liens symboliques lors de l'écriture des fichiers. .TP .B set/unset nohelp -Dsactive les lignes d'aide affiche en bas de l'cran. +Désactive les lignes d'aide affichée en bas de l'écran. .TP .B set/unset nonewlines -Ne pas ajouter de passage la ligne la fin des fichiers. +Ne pas ajouter de passage à la ligne à la fin des fichiers. .TP .B set/unset nowrap -Dsactive le passage automatique la ligne. +Désactive le passage automatique à la ligne. .TP -.B set operatingdir "\fIrpertoire\fP" -\fBnano\fP ne lira et n'crira des fichiers qu' l'intrieur du -\fIrpertoire\fP et de ses sous-rpertoires. De plus, celui-ci devient -le rpertoire courant, afin que les fichiers soient lus depuis ce -rpertoire. Par dfaut, cette fonction est dsactive. +.B set operatingdir "\fIrépertoire\fP" +\fBnano\fP ne lira et n'écrira des fichiers qu'à l'intérieur du +\fIrépertoire\fP et de ses sous-répertoires. De plus, celui-ci devient +le répertoire courant, afin que les fichiers soient lus depuis ce +répertoire. Par défaut, cette fonction est désactivée. .TP .B set/unset preserve -Prserve les squences XON et XOFF (^Q et ^S). +Préserve les séquences XON et XOFF (^Q et ^S). .TP -.B set punct "\fIchane\fP" -Dfinit les caractres interprts comme des ponctuations terminales -lors de la justification des paragraphes. Ces caractres ne peuvent -inclure de blancs. Seules les ponctuations terminales, ventuellement +.B set punct "\fIchaîne\fP" +Définit les caractères interprétés comme des ponctuations terminales +lors de la justification des paragraphes. Ces caractères ne peuvent +inclure de blancs. Seules les ponctuations terminales, éventuellement suivies de crochets fermants, peuvent terminer une phrase. La valeur par -dfaut de cette option est "\fI!.?\fP". +défaut de cette option est "\fI!.?\fP". -N.D.T.\ : ce rglage permet, lors de la justification, de conserver -2\ espaces au lieu d'une derrire les ponctuations terminales, ce qui +N.D.T.\ : ce réglage permet, lors de la justification, de conserver +2\ espaces au lieu d'une derrière les ponctuations terminales, ce qui correspond aux normes typographiques anglo-saxonnes, mais n'a pas lieu -d'tre en franais. Pour le franais, le plus simple est d'indiquer, -dans le fichier nanorc, une chane vide pour ce paramtre. +d'être en français. Pour le français, le plus simple est d'indiquer, +dans le fichier nanorc, une chaîne vide pour ce paramètre. .TP .B set/unset quickblank -Effacement rapide de la ligne d'tat. Les messages affichs par la ligne -d'tat disparatront aprs une frappe clavier au lieu de 25. -.TP -.B set quotestr "\fIchane\fP" -Dfinit le prfixe par dfaut utilis pour les citations dans les -courriers lectroniques. Ce prfixe est utilis pour raliser une -justification correcte de ces citations. Il s'agira, si votre systme le -permet, d'une expression rationnelle tendue. Dans le cas -contraire, il s'agira d'une chane de texte brut. Si vous disposez des -expressions rationnelles, la valeur par dfaut de cette option sera +Effacement rapide de la ligne d'état. Les messages affichés par la ligne +d'état disparaîtront après une frappe clavier au lieu de 25. +.TP +.B set quotestr "\fIchaîne\fP" +Définit le préfixe par défaut utilisé pour les citations dans les +courriers électroniques. Ce préfixe est utilisé pour réaliser une +justification correcte de ces citations. Il s'agira, si votre système le +permet, d'une expression rationnelle étendue. Dans le cas +contraire, il s'agira d'une chaîne de texte brut. Si vous disposez des +expressions rationnelles, la valeur par défaut de cette option sera "\fI^([\ \\t]*[#:>\\|}])+\fP", sinon, ce sera ">\ ". Notez que le -\ \\t\ ci-dessus correspond un caractre de tabulation. +«\ \\t\ » ci-dessus correspond à un caractère de tabulation. .TP .B set/unset rebinddelete -Interprte diffremment la touche \ Supprimer\ , afin que les touches -\ Effacement arrire\ et \ Supprimer\ fonctionnent correctement. -Vous ne devriez avoir besoin de cette option que si, sur votre systme, -la touche \ Effacement arrire\ produit l'effet de la touche \ -Supprimer\ . +Interprète différemment la touche «\ Supprimer\ », afin que les touches +«\ Effacement arrière\ » et «\ Supprimer\ » fonctionnent correctement. +Vous ne devriez avoir besoin de cette option que si, sur votre système, +la touche «\ Effacement arrière\ » produit l'effet de la touche «\ +Supprimer\ ». .TP .B set/unset rebindkeypad -Interprte les touches du pav numrique afin qu'elles fonctionnent +Interprète les touches du pavé numérique afin qu'elles fonctionnent toutes correctement. Vous ne devriez utiliser cette option que si ce n'est pas le cas, car nano ne sera plus capable d'utiliser la souris -correctement lorsque cette option sera active. +correctement lorsque cette option sera activée. .TP .B set/unset regexp -Utilise par dfaut des expressions rationnelles tendues pour les +Utilise par défaut des expressions rationnelles étendues pour les recherches. .TP .B set/unset smarthome -Rend plus malin le fonctionnement de la touche \ Dbut\ . Lorsque -cette touche est presse n'importe quel endroit except au tout dbut -du texte d'une ligne (i.\ e. au premier caractre non blanc), le curseur -se positionnera au dbut du texte de la ligne (qu'il soit en avant ou en -arrire). Si le curseur est dj l, il se placera au vrai dbut de la +Rend plus malin le fonctionnement de la touche «\ Début\ ». Lorsque +cette touche est pressée à n'importe quel endroit excepté au tout début +du texte d'une ligne (i.\ e. au premier caractère non blanc), le curseur +se positionnera au début du texte de la ligne (qu'il soit en avant ou en +arrière). Si le curseur est déjà là, il se placera au vrai début de la ligne. .TP .B set/unset smooth -Active le dfilement ligne-par-ligne du texte. +Active le défilement ligne-par-ligne du texte. .TP .B set speller "\fIprogramme\fP" Utilise le correcteur orthographique \fIprogramme\fP au lieu du -correcteur intgr, qui s'appuie sur \fIspell\fP. +correcteur intégré, qui s'appuie sur \fIspell\fP. .TP .B set/unset suspend -Autorise suspendre \fBnano\fP. +Autorise à suspendre \fBnano\fP. .TP .B set tabsize \fIn\fP Utilise une taille de tabulation de \fIn\fP colonnes. Cette valeur doit -tre strictement suprieure 0. La valeur par dfaut est de\ 8. +être strictement supérieure à 0. La valeur par défaut est de\ 8. .TP .B set/unset tabstospaces Convertit les tabulations clavier en espaces. .TP .B set/unset tempfile -S'il a t modifi, le fichier sera sauvegard automatiquement en +S'il a été modifié, le fichier sera sauvegardé automatiquement en quittant, sans demande de confirmation. .TP .B set/unset view Interdit de modifier les fichiers. .TP -.B set whitespace "\fIchane\fP" -Dfinit les deux caractres utiliss pour afficher les premiers -caractres des tabulations et des espaces. Ces deux caractres doivent -tre mono-colonne. +.B set whitespace "\fIchaîne\fP" +Définit les deux caractères utilisés pour afficher les premiers +caractères des tabulations et des espaces. Ces deux caractères doivent +être mono-colonne. .TP .B set/unset wordbounds -Dtection plus prcise des limites de mots, obtenue en considrant les -caractres de ponctuation comme faisant partie des mots. +Détection plus précise des limites de mots, obtenue en considérant les +caractères de ponctuation comme faisant partie des mots. .TP -.B syntax "\fIchane\fP" ["\fImotif_de_fichier\fP" ... ] -Dfinit une syntaxe nomme \fIchane\fP qui pourra tre activ via +.B syntax "\fIchaîne\fP" ["\fImotif_de_fichier\fP" ... ] +Définit une syntaxe nommée \fIchaîne\fP qui pourra être activé via l'option \fB-Y\fP (ou \fB--syntax\fP) ou qui sera automatiquement -active si le nom du fichier en cours correspond l'expression -rationnelle tendue \fImotif_de_fichier\fP. Toutes les instructions -suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront -cette syntaxe, jusqu' la dfinition d'une nouvelle syntaxe. +activée si le nom du fichier en cours correspond à l'expression +rationnelle étendue \fImotif_de_fichier\fP. Toutes les instructions +suivantes de colorisation \fBcolor\fP ou \fBicolor\fP s'appliqueront à +cette syntaxe, jusqu'à la définition d'une nouvelle syntaxe. -La syntaxe nomme \fInone\fP (aucune) est rserve\ ; si elle est -indique dans la ligne de commande, cela revient ne dfinir aucune -syntaxe. La syntaxe nomme \fIdefault\fP (par dfaut) est spciale, elle -ne ncessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux -fichiers ne correspondant aucun des \fImotif_de_fichier\fP des autres +La syntaxe nommée \fInone\fP (aucune) est réservée\ ; si elle est +indiquée dans la ligne de commande, cela revient à ne définir aucune +syntaxe. La syntaxe nommée \fIdefault\fP (par défaut) est spéciale, elle +ne nécessite aucun motif de \fImotif_de_fichier\fP, et s'applique aux +fichiers ne correspondant à aucun des \fImotif_de_fichier\fP des autres syntaxes. .TP .B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ... -Pour la syntaxe en cours, affiche toutes les expressions correspondant -l'expression rationnelle tendue \fImotif\fP en utilisant la couleur de +Pour la syntaxe en cours, affiche toutes les expressions correspondant à +l'expression rationnelle étendue \fImotif\fP en utilisant la couleur de texte \fIcouleur_texte\fP et la couleur de fond \fIcouleur_fond\fP, -l'une de ces deux couleurs au moins devant tre dfinie. Les couleurs -acceptes par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP +l'une de ces deux couleurs au moins devant être définie. Les couleurs +acceptées par \fBnano\fP pour le texte et le fond sont\ : \fIwhite\fP (blanc), \fIblack\fP (noir), \fIred\fP (rouge), \fIblue\fP (bleu), \fIgreen\fP (vert), \fIyellow\fP (jaune), \fImagenta\fP, et \fIcyan\fP. -Pour la couleur du texte, vous pouvez ajouter ces couleurs le prfixe +Pour la couleur du texte, vous pouvez ajouter à ces couleurs le préfixe \fIbright\fP (lumineux) pour obtenir une couleur plus lumineuse. Si -votre terminal est capable de grer la transparence, ne pas spcifier de -\fIcouleur_fond\fP indique \fBnano\fP d'essayer d'utiliser un fond +votre terminal est capable de gérer la transparence, ne pas spécifier de +\fIcouleur_fond\fP indique à \fBnano\fP d'essayer d'utiliser un fond transparent. .TP .B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] "\fImotif\fP" ... -Comme ci-dessus, mais la recherche des motifs est effectue sans tenir +Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir compte de la casse. .TP -.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_dbut\fP" end="\fImotif_fin\fP" -Affiche les expressions commenant par l'expression rationnelle tendue -\fImotif_dbut\fP et se terminant par l'expression rationnelle tendue +.B color \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP" +Affiche les expressions commençant par l'expression rationnelle étendue +\fImotif_début\fP et se terminant par l'expression rationnelle étendue \fImotif_fin\fP en utilisant la couleur de texte \fIcouleur_texte\fP et la couleur de fond \fIcouleur_fond\fP, l'une de ces deux couleurs au -moins devant tre dfinie. Cela permet la colorisation syntaxique de -s'tendre sur plusieurs lignes. Notez que toutes les occurrences -successives de \fImotif_dbut\fP aprs le \fImotif_dbut\fP initial -seront surlignes jusqu' la prochaine instance de \fImotif_fin\fP. +moins devant être définie. Cela permet à la colorisation syntaxique de +s'étendre sur plusieurs lignes. Notez que toutes les occurrences +successives de \fImotif_début\fP après le \fImotif_début\fP initial +seront surlignées jusqu'à la prochaine instance de \fImotif_fin\fP. .TP -.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_dbut\fP" end="\fImotif_fin\fP" -Comme ci-dessus, mais la recherche des motifs est effectue sans tenir +.B icolor \fIcouleur_texte\fP[,\fIcouleur_fond\fP] start="\fImotif_début\fP" end="\fImotif_fin\fP" +Comme ci-dessus, mais la recherche des motifs est effectuée sans tenir compte de la casse. .TP .B include "\fIfichier_de_syntaxes\fP" Lit le fichier \fIfichier_de_syntaxes\fP contenant une liste -autosuffisante de dfinitions de syntaxes. Ce fichier ne doit contenir +autosuffisante de définitions de syntaxes. Ce fichier ne doit contenir que des commandes \fBsyntax\fP, \fBcolor\fP et \fBicolor\fP. .SH FICHIERS .TP .I $SYSCONFDIR/nanorc -Fichier de configuration gnral +Fichier de configuration général .TP .I ~/.nanorc Fichier de configuration personnel @@ -348,29 +348,29 @@ Fichier de configuration personnel .TP \fBnano\fP(1) .PP -\fI/usr/share/doc/nano/examples/nanorc.sample\fP (ou son quivalent sur -votre systme) +\fI/usr/share/doc/nano/examples/nanorc.sample\fP (ou son équivalent sur +votre système) .SH AUTEUR Chris Allegretta et d'autres (voir les fichiers \fIAUTHORS\fP et \fITHANKS\fP pour plus d'information). Cette page de -manuel a t initialement rdige par Jordi Mallach pour -le systme Debian (mais elle peut tre utilise par d'autres). +manuel a été initialement rédigée par Jordi Mallach pour +le système Debian (mais elle peut être utilisée par d'autres). .SH TRADUCTION -Cette adaptation franaise a t ralise par Jean-Philippe\ Gurard - le 29\ novembre\ 2007 partir de +Cette adaptation française a été réalisée par Jean-Philippe\ Guérard + le 29\ novembre\ 2007 à partir de la version 1.56 du 11\ octobre\ 2007 de la page de manuel de nanorc -(pour la version 2.0.0 de nano). Cette page a t relue par Grard +(pour la version 2.0.0 de nano). Cette page a été relue par Gérard Delafond. -Un maximum de soin a t apport lors de l'laboration de cette -traduction\ ; nanmoins, quelques imperfections peuvent subsister. Si -vous en rencontrez, que ce soit dans la version franaise ou dans la -version originale, n'hsitez pas les signaler l'auteur ou au +Un maximum de soin a été apporté lors de l'élaboration de cette +traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si +vous en rencontrez, que ce soit dans la version française ou dans la +version originale, n'hésitez pas à les signaler à l'auteur ou au traducteur. -La version originale la plus jour de ce document est toujours +La version originale la plus à jour de ce document est toujours consultable via la commande\ : LANGUAGE=en man nano diff --git a/doc/man/fr/nanorc.5.html b/doc/man/fr/nanorc.5.html index e438be8..092aaef 100644 --- a/doc/man/fr/nanorc.5.html +++ b/doc/man/fr/nanorc.5.html @@ -1,5 +1,5 @@ - - + + @@ -37,8 +37,8 @@

nanorc − -fichier de configuration de l’éditeur nano du -projet GNU

+fichier de configuration de l’éditeur +nano du projet GNU

DESCRIPTION @@ -46,29 +46,34 @@ projet GNU

Cette page de -manuel décrit brièvement le fichier de -configuration de l’éditeur nano GNU.

+manuel décrit brièvement le fichier +de configuration de l’éditeur nano +GNU.

nano est -un petit éditeur sympathique et libre, qui vise -à remplacer Pico, l’éditeur par -défaut du logiciel non libre Pine. nano ne se -contentant pas de copier l’interface et -l’ergonomie de Pico, il offre également -certaines fonctionnalités manquantes (ou -désactivées par défaut) de Pico. Ces -fonctionnalités sont, par exemple, les fonctions de -recherche et de remplacement et la possibilité de -sauter directement à une ligne et à une -colonne précise.

+un petit éditeur sympathique et libre, qui vise +à remplacer Pico, l’éditeur +par défaut du logiciel non libre Pine. +nano ne se contentant pas de copier l’interface +et l’ergonomie de Pico, il offre +également certaines +fonctionnalités manquantes (ou +désactivées par +défaut) de Pico. Ces +fonctionnalités sont, par exemple, les +fonctions de recherche et de remplacement et la +possibilité de sauter directement +à une ligne et à une colonne +précise.

Le fichier -nanorc contient les paramètres par -défaut de nano. Il ne doit pas être au -format DOS ou Mac. Lors de son démarrage, nano -commencera par lire le fichier de configuration -général SYSCONFDIR/nanorc, puis lira le -fichier de configuration personnel de l’utilisateur +nanorc contient les paramètres par +défaut de nano. Il ne doit pas +être au format DOS ou Mac. Lors de son +démarrage, nano commencera par lire le fichier +de configuration général +SYSCONFDIR/nanorc, puis lira le fichier de +configuration personnel de l’utilisateur ~/.nanorc.

OPTIONS @@ -77,38 +82,44 @@ fichier de configuration personnel de l’utilisateur

Le fichier de -configuration accepte une série de commandes -set (activer) et unset (désactiver), -qui permettent de définir le paramétrage de -nano au démarrage sans avoir à utiliser +configuration accepte une série de commandes +set (activer) et unset +(désactiver), qui permettent de +définir le paramétrage de nano au +démarrage sans avoir à utiliser d’options de ligne de commande. De plus, les mots clefs syntax (syntaxe), color (couleur) et -icolor (couleur insensible à la casse) sont -utilisés pour définir les règles de -colorisation pour différents motifs de texte. -nano lit une commande par ligne.

+icolor (couleur insensible à la casse) +sont utilisés pour définir les +règles de colorisation pour +différents motifs de texte. nano lit une +commande par ligne.

Les options du -fichier de configuration ont priorité sur les valeurs -par défaut utilisées par nano. Les options de -la ligne de commande sont prioritaires par rapport aux -options du fichier de configuration. Les options sont -désactivées (unset) par défaut, sauf -les options prenant un argument.

+fichier de configuration ont priorité sur les +valeurs par défaut utilisées par +nano. Les options de la ligne de commande sont prioritaires +par rapport aux options du fichier de configuration. Les +options sont désactivées (unset) +par défaut, sauf les options prenant un +argument.

Les apostrophes -(« ’ ») et les guillemets -droits (« " ») -présents dans des chaînes de caractères -utilisées comme paramètres n’ont pas -besoin d’être précédées -d’une barre oblique inversée -(« \ »). La chaîne sera -terminée par le dernier guillemet droit. Par exemple, -pour l’option brackets, -""’)>]}" correspondra -à ", ’, ), ->, ] et }.

+(« ’ Â») et +les guillemets droits +(« " Â») +présents dans des chaînes de +caractères utilisées comme +paramètres n’ont pas besoin +d’être +précédées d’une +barre oblique inversée +(« \ Â»). La +chaîne sera terminée par le dernier +guillemet droit. Par exemple, pour l’option +brackets, ""’)>]}" +correspondra à ", ’, +), >, ] et }.

Les commandes et arguments reconnus sont :
@@ -119,42 +130,45 @@ automatique.

set/unset backup

-

Crée des copies de -sécurité nommées +

Crée des copies de +sécurité nommées nom_du_fichier~.

set backupdir -répertoire

+répertoire

-

Définit le -répertoire utilisé par nano pour -enregistrer les copies de sécurité uniques, si -l’enregistrement de copies de sécurité -est activé.

+

Définit le +répertoire utilisé par nano +pour enregistrer les copies de +sécurité uniques, si +l’enregistrement de copies de +sécurité est +activé.

set/unset backwards

-

Par défaut, les -recherches se font vers l’arrière.

+

Par défaut, les +recherches se font vers l’arrière.

set/unset boldtext

-

Utilise des caractères -gras à la place de la vidéo inverse.

+

Utilise des +caractères gras à la place de la +vidéo inverse.

set brackets -chaîne

+chaîne

-

Définit les -caractères considérés comme des -crochets fermants lors de la justification des paragraphes. -Ces caractères ne doivent pas contenir -d’espaces. Seules les ponctuations terminales, -éventuellement suivies de crochets fermants, peuvent -terminer une phrase.

+

Définit les +caractères considérés +comme des crochets fermants lors de la justification des +paragraphes. Ces caractères ne doivent pas +contenir d’espaces. Seules les ponctuations +terminales, éventuellement suivies de crochets +fermants, peuvent terminer une phrase.

La valeur par -défaut de cette option est : +défaut de cette option est : ""’)>]}".

N.D.T. : @@ -164,64 +178,70 @@ pour plus d’informations.

set/unset casesensitive

-

Par défaut, les +

Par défaut, les recherches ne tiennent pas compte de la casse.

set/unset const

Affiche en permanence la -position du curseur dans la ligne d’état.

+position du curseur dans la ligne +d’état.

set/unset cut

-

Par défaut, coupe le -texte du curseur à la fin de la ligne, au lieu de -couper la ligne entière.

+

Par défaut, coupe +le texte du curseur à la fin de la ligne, au +lieu de couper la ligne entière.

set fill n

-

Passe automatiquement à -la ligne une fois arrivé à la colonne -n. Si la valeur indiquée est de 0 ou moins, le -point de passage à la ligne aura lieu à la -taille de l’écran moins n. Cela permet -de faire varier le point de passage à la ligne -lorsque l’on change la taille de l’écran. -La valeur par défaut est de −8.

+

Passe automatiquement +à la ligne une fois arrivé +à la colonne n. Si la valeur +indiquée est de 0 ou moins, le point de passage +à la ligne aura lieu à la taille +de l’écran moins n. Cela permet de +faire varier le point de passage à la ligne +lorsque l’on change la taille de +l’écran. La valeur par +défaut est de −8.

set/unset historylog

Active l’utilisation de ~/.nano_history pour enregistrer et relire les -chaînes ayant fait l’objet d’une recherche -ou d’un remplacement.

+chaînes ayant fait l’objet d’une +recherche ou d’un remplacement.

set matchbrackets -chaîne

+chaîne

-

Définit les crochets -ouvrants et fermant pour la recherche de crochets +

Définit les +crochets ouvrants et fermant pour la recherche de crochets correspondants. Cette liste ne doit pas contenir de blancs. -L’ensemble des crochets ouvrants doit être -indiqué en premier, suivi de l’ensemble des -crochets fermant, qui doit être dans le même -ordre. La valeur par défaut de cette option est +L’ensemble des crochets ouvrants doit +être indiqué en premier, suivi de +l’ensemble des crochets fermant, qui doit +être dans le même ordre. La valeur +par défaut de cette option est "(<[{)>]}".

set/unset morespace

Utiliser la ligne blanche -située sous la ligne de titre comme espace -supplémentaire d’édition.

+située sous la ligne de titre comme espace +supplémentaire +d’édition.

set/unset mouse

Active l’utilisation de -la souris, si elle est disponible pour votre système. -Lorsque celle-ci est activée, il est possible -d’utiliser la souris pour positionner le curseur, pour -marquer le texte (avec un double-clic) et pour lancer les -fonctions correspondant aux raccourcis. Il est possible +la souris, si elle est disponible pour votre +système. Lorsque celle-ci est +activée, il est possible d’utiliser la +souris pour positionner le curseur, pour marquer le texte +(avec un double-clic) et pour lancer les fonctions +correspondant aux raccourcis. Il est possible d’utiliser la souris sous X Window ou en mode console avec gpm.

@@ -239,155 +259,168 @@ formats DOS et Mac.

set/unset nofollow

Ne suit pas les liens -symboliques lors de l’écriture des +symboliques lors de l’écriture des fichiers.

set/unset nohelp

-

Désactive les lignes -d’aide affichée en bas de -l’écran.

+

Désactive les +lignes d’aide affichée en bas de +l’écran.

set/unset nonewlines

Ne pas ajouter de passage -à la ligne à la fin des fichiers.

+à la ligne à la fin des +fichiers.

set/unset nowrap

-

Désactive le passage -automatique à la ligne.

+

Désactive le +passage automatique à la ligne.

set operatingdir -répertoire

+répertoire

nano ne lira et -n’écrira des fichiers qu’à -l’intérieur du répertoire et de -ses sous-répertoires. De plus, celui-ci devient le -répertoire courant, afin que les fichiers soient lus -depuis ce répertoire. Par défaut, cette -fonction est désactivée.

+n’écrira des fichiers +qu’à l’intérieur du +répertoire et de ses +sous-répertoires. De plus, celui-ci devient le +répertoire courant, afin que les fichiers +soient lus depuis ce répertoire. Par +défaut, cette fonction est +désactivée.

set/unset preserve

-

Préserve les -séquences XON et XOFF (^Q et ^S).

+

Préserve les +séquences XON et XOFF (^Q et ^S).

set punct -chaîne

- -

Définit les -caractères interprétés comme des -ponctuations terminales lors de la justification des -paragraphes. Ces caractères ne peuvent inclure de -blancs. Seules les ponctuations terminales, -éventuellement suivies de crochets fermants, peuvent -terminer une phrase. La valeur par défaut de cette -option est "!.?".

+chaîne

+ +

Définit les +caractères interprétés +comme des ponctuations terminales lors de la justification +des paragraphes. Ces caractères ne peuvent +inclure de blancs. Seules les ponctuations terminales, +éventuellement suivies de crochets fermants, +peuvent terminer une phrase. La valeur par +défaut de cette option est +"!.?".

N.D.T. : -ce réglage permet, lors de la justification, de -conserver 2 espaces au lieu d’une derrière -les ponctuations terminales, ce qui correspond aux normes -typographiques anglo-saxonnes, mais n’a pas lieu -d’être en français. Pour le -français, le plus simple est d’indiquer, dans -le fichier nanorc, une chaîne vide pour ce -paramètre.

+ce réglage permet, lors de la justification, de +conserver 2 espaces au lieu d’une +derrière les ponctuations terminales, ce qui +correspond aux normes typographiques anglo-saxonnes, mais +n’a pas lieu d’être en +français. Pour le français, le +plus simple est d’indiquer, dans le fichier nanorc, +une chaîne vide pour ce +paramètre.

set/unset quickblank

Effacement rapide de la ligne -d’état. Les messages affichés par la -ligne d’état disparaîtront après -une frappe clavier au lieu de 25.

+d’état. Les messages +affichés par la ligne d’état +disparaîtront après une frappe +clavier au lieu de 25.

set quotestr -chaîne

+chaîne

-

Définit le -préfixe par défaut utilisé pour les -citations dans les courriers électroniques. Ce -préfixe est utilisé pour réaliser une +

Définit le +préfixe par défaut +utilisé pour les citations dans les courriers +électroniques. Ce préfixe est +utilisé pour réaliser une justification correcte de ces citations. Il s’agira, -si votre système le permet, d’une expression -rationnelle étendue. Dans le cas contraire, il -s’agira d’une chaîne de texte brut. Si -vous disposez des expressions rationnelles, la valeur par -défaut de cette option sera -"^([ \t]*[#:>\|}])+", sinon, ce -sera "> ". Notez que le -« \t » ci-dessus correspond à -un caractère de tabulation.

+si votre système le permet, d’une +expression rationnelle étendue. Dans le cas +contraire, il s’agira d’une chaîne +de texte brut. Si vous disposez des expressions +rationnelles, la valeur par défaut de cette +option sera "^([ \t]*[#:>\|}])+", +sinon, ce sera "> ". Notez que le +« \t Â» ci-dessus +correspond à un caractère de +tabulation.

set/unset rebinddelete

-

Interprète -différemment la touche -« Supprimer », afin que les touches -« Effacement arrière » et -« Supprimer » fonctionnent -correctement. Vous ne devriez avoir besoin de cette option -que si, sur votre système, la touche -« Effacement arrière » produit -l’effet de la touche «  -Supprimer ».

+

Interprète +différemment la touche +« Supprimer Â», afin que +les touches « Effacement +arrière Â» et +« Supprimer Â» +fonctionnent correctement. Vous ne devriez avoir besoin de +cette option que si, sur votre système, la +touche « Effacement +arrière Â» produit +l’effet de la touche «  +Supprimer Â».

set/unset rebindkeypad

-

Interprète les touches -du pavé numérique afin qu’elles -fonctionnent toutes correctement. Vous ne devriez utiliser -cette option que si ce n’est pas le cas, car nano ne -sera plus capable d’utiliser la souris correctement -lorsque cette option sera activée.

+

Interprète les +touches du pavé numérique afin +qu’elles fonctionnent toutes correctement. Vous ne +devriez utiliser cette option que si ce n’est pas le +cas, car nano ne sera plus capable d’utiliser la +souris correctement lorsque cette option sera +activée.

set/unset regexp

-

Utilise par défaut des -expressions rationnelles étendues pour les +

Utilise par défaut +des expressions rationnelles étendues pour les recherches.

set/unset smarthome

Rend plus malin le fonctionnement de la touche -« Début ». Lorsque cette touche -est pressée à n’importe quel endroit -excepté au tout début du texte d’une -ligne (i. e. au premier caractère non blanc), le -curseur se positionnera au début du texte de la ligne -(qu’il soit en avant ou en arrière). Si le -curseur est déjà là, il se placera au -vrai début de la ligne.

+« Début Â». +Lorsque cette touche est pressée à +n’importe quel endroit excepté au tout +début du texte d’une ligne (i. e. au +premier caractère non blanc), le curseur se +positionnera au début du texte de la ligne +(qu’il soit en avant ou en arrière). Si le +curseur est déjà là, +il se placera au vrai début de la ligne.

set/unset smooth

-

Active le défilement -ligne-par-ligne du texte.

+

Active le +défilement ligne-par-ligne du texte.

set speller programme

Utilise le correcteur orthographique programme au lieu du correcteur -intégré, qui s’appuie sur +intégré, qui s’appuie sur spell.

set/unset suspend

-

Autorise à suspendre -nano.

+

Autorise à +suspendre nano.

set tabsize n

Utilise une taille de tabulation de n colonnes. Cette valeur doit -être strictement supérieure à 0. La -valeur par défaut est de 8.

+être strictement supérieure +à 0. La valeur par défaut est +de 8.

set/unset tabstospaces

@@ -397,10 +430,10 @@ clavier en espaces.

set/unset tempfile

-

S’il a été -modifié, le fichier sera sauvegardé -automatiquement en quittant, sans demande de -confirmation.

+

S’il a +été modifié, le +fichier sera sauvegardé automatiquement en +quittant, sans demande de confirmation.

set/unset view

@@ -408,112 +441,119 @@ confirmation.

fichiers.

set whitespace -chaîne

+chaîne

-

Définit les deux -caractères utilisés pour afficher les premiers -caractères des tabulations et des espaces. Ces deux -caractères doivent être mono-colonne.

+

Définit les deux +caractères utilisés pour afficher +les premiers caractères des tabulations et des +espaces. Ces deux caractères doivent +être mono-colonne.

set/unset wordbounds

-

Détection plus -précise des limites de mots, obtenue en -considérant les caractères de ponctuation -comme faisant partie des mots.

+

Détection plus +précise des limites de mots, obtenue en +considérant les caractères de +ponctuation comme faisant partie des mots.

syntax -chaîne +chaîne ["motif_de_fichier" ... ]

-

Définit une syntaxe -nommée chaîne qui pourra être -activé via l’option -Y (ou ---syntax) ou qui sera automatiquement activée -si le nom du fichier en cours correspond à -l’expression rationnelle étendue -motif_de_fichier. Toutes les instructions suivantes -de colorisation color ou icolor -s’appliqueront à cette syntaxe, -jusqu’à la définition d’une -nouvelle syntaxe.

+

Définit une +syntaxe nommée chaîne qui +pourra être activé via +l’option -Y (ou --syntax) ou qui sera +automatiquement activée si le nom du fichier en +cours correspond à l’expression +rationnelle étendue motif_de_fichier. +Toutes les instructions suivantes de colorisation +color ou icolor s’appliqueront +à cette syntaxe, jusqu’à la +définition d’une nouvelle syntaxe.

La syntaxe -nommée none (aucune) est -réservée ; si elle est indiquée -dans la ligne de commande, cela revient à ne -définir aucune syntaxe. La syntaxe nommée -default (par défaut) est spéciale, elle -ne nécessite aucun motif de motif_de_fichier, -et s’applique aux fichiers ne correspondant à -aucun des motif_de_fichier des autres syntaxes.

+nommée none (aucune) est +réservée ; si elle est +indiquée dans la ligne de commande, cela +revient à ne définir aucune +syntaxe. La syntaxe nommée default (par +défaut) est spéciale, elle ne +nécessite aucun motif de +motif_de_fichier, et s’applique aux fichiers ne +correspondant à aucun des +motif_de_fichier des autres syntaxes.

color couleur_texte[,couleur_fond] motif ...

Pour la syntaxe en cours, -affiche toutes les expressions correspondant à -l’expression rationnelle étendue motif -en utilisant la couleur de texte couleur_texte et la -couleur de fond couleur_fond, l’une de ces deux -couleurs au moins devant être définie. Les -couleurs acceptées par nano pour le texte et -le fond sont : white (blanc), black -(noir), red (rouge), blue (bleu), green -(vert), yellow (jaune), magenta, et -cyan. Pour la couleur du texte, vous pouvez ajouter -à ces couleurs le préfixe bright -(lumineux) pour obtenir une couleur plus lumineuse. Si votre -terminal est capable de gérer la transparence, ne pas -spécifier de couleur_fond indique à -nano d’essayer d’utiliser un fond -transparent.

+affiche toutes les expressions correspondant à +l’expression rationnelle étendue +motif en utilisant la couleur de texte +couleur_texte et la couleur de fond +couleur_fond, l’une de ces deux couleurs au +moins devant être définie. Les +couleurs acceptées par nano pour le +texte et le fond sont : white (blanc), +black (noir), red (rouge), blue (bleu), +green (vert), yellow (jaune), magenta, +et cyan. Pour la couleur du texte, vous pouvez +ajouter à ces couleurs le préfixe +bright (lumineux) pour obtenir une couleur plus +lumineuse. Si votre terminal est capable de +gérer la transparence, ne pas +spécifier de couleur_fond indique +à nano d’essayer d’utiliser +un fond transparent.

icolor couleur_texte[,couleur_fond] motif ...

Comme ci-dessus, mais la -recherche des motifs est effectuée sans tenir compte -de la casse.

+recherche des motifs est effectuée sans tenir +compte de la casse.

color couleur_texte[,couleur_fond] -start="motif_début" +start="motif_début" end="motif_fin"

Affiche les expressions -commençant par l’expression rationnelle -étendue motif_début et se terminant par -l’expression rationnelle étendue -motif_fin en utilisant la couleur de texte -couleur_texte et la couleur de fond +commençant par l’expression rationnelle +étendue motif_début et se +terminant par l’expression rationnelle +étendue motif_fin en utilisant la +couleur de texte couleur_texte et la couleur de fond couleur_fond, l’une de ces deux couleurs au -moins devant être définie. Cela permet à -la colorisation syntaxique de s’étendre sur -plusieurs lignes. Notez que toutes les occurrences -successives de motif_début après le -motif_début initial seront surlignées -jusqu’à la prochaine instance de -motif_fin.

+moins devant être définie. Cela +permet à la colorisation syntaxique de +s’étendre sur plusieurs lignes. Notez que +toutes les occurrences successives de +motif_début après le +motif_début initial seront +surlignées jusqu’à la +prochaine instance de motif_fin.

icolor couleur_texte[,couleur_fond] -start="motif_début" +start="motif_début" +
end="motif_fin"

Comme ci-dessus, mais la -recherche des motifs est effectuée sans tenir compte -de la casse.

+recherche des motifs est effectuée sans tenir +compte de la casse.

include fichier_de_syntaxes

Lit le fichier fichier_de_syntaxes contenant une liste -autosuffisante de définitions de syntaxes. Ce fichier -ne doit contenir que des commandes syntax, +autosuffisante de définitions de syntaxes. Ce +fichier ne doit contenir que des commandes syntax, color et icolor.

FICHIERS @@ -525,7 +565,7 @@ ne doit contenir que des commandes syntax,

$SYSCONFDIR/nanorc

Fichier de configuration -général

+général

~/.nanorc

@@ -540,7 +580,7 @@ personnel

nano(1)
/usr/share/doc/nano/examples/nanorc.sample (ou son -équivalent sur votre système)

+équivalent sur votre système)

AUTEUR @@ -551,9 +591,10 @@ personnel

Allegretta <chrisa@asty.org> et d’autres (voir les fichiers AUTHORS et THANKS pour plus d’information). Cette page de manuel a -été initialement rédigée par -Jordi Mallach <jordi@gnu.org> pour le système -Debian (mais elle peut être utilisée par +été initialement +rédigée par Jordi Mallach +<jordi@gnu.org> pour le système Debian +(mais elle peut être utilisée par d’autres).

TRADUCTION @@ -562,26 +603,30 @@ d’autres).

Cette -adaptation française a été -réalisée par Jean-Philippe Guérard +adaptation française a +été +réalisée par +Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org> le -29 novembre 2007 à partir de la version -1.56 du 11 octobre 2007 de la page de manuel de -nanorc (pour la version 2.0.0 de nano). Cette page a -été relue par Gérard Delafond.

+29 novembre 2007 à partir de la +version 1.56 du 11 octobre 2007 de la page de +manuel de nanorc (pour la version 2.0.0 de nano). Cette page +a été relue par +Gérard Delafond.

Un maximum de -soin a été apporté lors de -l’élaboration de cette traduction ; -néanmoins, quelques imperfections peuvent subsister. -Si vous en rencontrez, que ce soit dans la version -française ou dans la version originale, -n’hésitez pas à les signaler à -l’auteur ou au traducteur.

+soin a été apporté +lors de l’élaboration de cette +traduction ; néanmoins, quelques +imperfections peuvent subsister. Si vous en rencontrez, que +ce soit dans la version française ou dans la +version originale, n’hésitez pas +à les signaler à l’auteur ou +au traducteur.

La version -originale la plus à jour de ce document est toujours -consultable via la commande :

+originale la plus à jour de ce document est +toujours consultable via la commande :

LANGUAGE=en man nano

diff --git a/doc/man/fr/rnano.1 b/doc/man/fr/rnano.1 index 2f64367..70c06f8 100644 --- a/doc/man/fr/rnano.1 +++ b/doc/man/fr/rnano.1 @@ -3,13 +3,13 @@ .\" Skeleton based on nano-tiny.1: .\" Copyright (C) 2002 Free Software Foundation, Inc. .\" -.\" Le travail d'adaptation franaise de cette page de manuel a t -.\" ralis par Jean-Philippe Gurard, en 2006 et 2007. Ce travail +.\" Le travail d'adaptation française de cette page de manuel a été +.\" réalisé par Jean-Philippe Guérard, en 2006 et 2007. Ce travail .\" d'adaptation est dans le domaine public. Attention, la page traduite .\" reste soumise au droit d'auteur de ses auteurs originaux. .\" .\" The French translation of this document is a public domain work of -.\" Jean-Philippe Gurard. This translation work was made in 2006 and +.\" Jean-Philippe Guérard. This translation work was made in 2006 and .\" 2007. The translated man page in itself is still subject to the .\" copyright of its original authors. .\" @@ -29,126 +29,126 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.\" Ce document est publi sous une double licence. Vous pouvez +.\" Ce document est publié sous une double licence. Vous pouvez .\" le distribuer et le modifier selon les termes de l'une des deux -.\" licences ci-dessous: +.\" licences ci-dessous : .\" -.\" * La Licence publique gnrale GNU (GNU GPL) version 3 ou, -.\" votre choix, suprieure, telle que publie par la Free -.\" Software Foundation. Vous devriez avoir reu une copie de la -.\" Licence publique gnrale GNU avec ce programme. Si ce n'est pas +.\" * La Licence publique générale GNU (GNU GPL) version 3 ou, à +.\" votre choix, supérieure, telle que publiée par la Free +.\" Software Foundation. Vous devriez avoir reçu une copie de la +.\" Licence publique générale GNU avec ce programme. Si ce n'est pas .\" le cas, consultez . .\" .\" * La Licence de documentation libre GNU (GNU FDL), version 1.2 ou, -.\" votre choix, suprieure, telle que publie par la Free +.\" à votre choix, supérieure, telle que publiée par la Free .\" Software Foundation, sans section invariante, ni texte de -.\" premire ou de quatrime de couverture. Vous devriez avoir reu +.\" première ou de quatrième de couverture. Vous devriez avoir reçu .\" une copie de la Licence de documentation libre GNU avec ce .\" programme. Si ce n'est pas le cas, consultez .\" . .\" -.\" $Id: rnano.1 4188 2007-12-08 04:27:44Z dolorous $ +.\" $Id: rnano.1 5071 2014-07-16 17:25:55Z jordi $ .TH RNANO 1 "version 2.0.0" "29\ novembre\ 20O7" .\" Please adjust this date whenever revising the manpage. -.\" Merci de modifier ces dates chaque mise jour de cette page. +.\" Merci de modifier ces dates à chaque mise à jour de cette page. .\" .SH NOM -rnano \- Le mode restreint de NAno un NOuvel diteur, un clone libre et -amlior de Pico +rnano \- Le mode restreint de NAno un NOuvel éditeur, un clone libre et +amélioré de Pico .SH SYNOPSIS .B rnano -.I [OPTIONS]\ [[\+LIGNE,COLONNE]\ FICHIER]... +.I [OPTIONS]\ [[+LIGNE,COLONNE]\ FICHIER]... .br .SH DESCRIPTION -Cette page de manuel dcrit brivement la commande \fBrnano\fR. +Cette page de manuel décrit brièvement la commande \fBrnano\fR. .PP .\" TeX users may be more comfortable with the \fB\fP and .\" \fI\fP escape sequences to invoke bold face and italics, .\" respectively. -\fBnano\fR est un diteur petit, sympathique et libre, qui vise -remplacer Pico, l'diteur par dfaut du logiciel non libre Pine. +\fBnano\fR est un éditeur petit, sympathique et libre, qui vise à +remplacer Pico, l'éditeur par défaut du logiciel non libre Pine. \fBnano\fR ne se contentant pas de copier l'interface et l'ergonomie de -Pico, il offre galement certaines fonctions manquantes (ou dsactives -par dfaut) dans Pico. Ces fonctionnalits sont, par exemple, les -fonctions de recherche et de remplacement, et la possibilit de sauter -directement une ligne et une colonne prcise.. +Pico, il offre également certaines fonctions manquantes (ou désactivées +par défaut) dans Pico. Ces fonctionnalités sont, par exemple, les +fonctions de recherche et de remplacement, et la possibilité de sauter +directement à une ligne et à une colonne précise.. .PP \fBrnano\fP est une version de \fBnano\fP fonctionnant en mode -restreint, qui ne permet d'diter que les fichiers indiqus et qui -n'autorise pas l'utilisateur accder au systme de fichier ou un -interprteur de commandes. +restreint, qui ne permet d'éditer que les fichiers indiqués et qui +n'autorise pas l'utilisateur à accéder au système de fichier ou à un +interpréteur de commandes. .PP En mode restreint, \fBnano\fP refusera\ : .IP \[bu] 2 -de lire ou d'crire dans un fichier n'ayant pas t indiqu dans la +de lire ou d'écrire dans un fichier n'ayant pas été indiqué dans la ligne de commande\ ; .IP \[bu] de lire un fichier nanorc\ ; .IP \[bu] -de permettre de suspendre l'dition\ ; +de permettre de suspendre l'édition\ ; .IP \[bu] -de permettre d'ajouter en dbut ou en fin d'un fichier, ou de -l'enregistrer sous un nom diffrent\ ; +de permettre d'ajouter en début ou en fin d'un fichier, ou de +l'enregistrer sous un nom différent\ ; .IP \[bu] -l'utilisation de copies de scurit ou de la correction orthographique. +l'utilisation de copies de sécurité ou de la correction orthographique. .SH OPTIONS .TP -.B \+\fILIGNE\fP,\fICOLONNE\fP -Dmarre avec le curseur positionn la colonne \fICOLONNE\fP de -la ligne \fILIGNE\fR (l'un des deux, au moins, devant tre spcifi) au -lieu de dmarrer la colonne\ 1, ligne\ 1. +.B +\fILIGNE\fP,\fICOLONNE\fP +Démarre avec le curseur positionné à la colonne \fICOLONNE\fP de +la ligne \fILIGNE\fR (l'un des deux, au moins, devant être spécifié) au +lieu de démarrer à la colonne\ 1, ligne\ 1. .TP .B \-? -Identique \fB-h (\-\-help)\fP. +Identique à \fB\-h (\-\-help)\fP. .TP .B \-h (\-\-help) -Affiche un rsum des options de lancement de nano, puis s'arrte. +Affiche un résumé des options de lancement de nano, puis s'arrête. .TP .B \-V (\-\-version) -Affiche la version, puis s'arrte. +Affiche la version, puis s'arrête. .PP -Reportez-vous la page de manuel \fBnano\fP(1) si vous souhaitez -consulter la documentation complte de \fBnano\fP. +Reportez-vous à la page de manuel \fBnano\fP(1) si vous souhaitez +consulter la documentation complète de \fBnano\fP. .SH BOGUES Merci de nous faire parvenir vos commentaires et de nous signaler les -bogues, en crivant, en anglais, \fBnano@nano-editor.org\fR. +bogues, en écrivant, en anglais, à \fBnano@nano-editor.org\fR. -La liste de discussion anglophone \fBnano\fR est disponible l'adresse +La liste de discussion anglophone \fBnano\fR est disponible à l'adresse \fBnano-devel@gnu.org\fR. -Pour vous abonner, envoyez un courrier lectronique -\fBnano-devel-request@gnu.org\fR, ayant pour objet \ subscribe\ . +Pour vous abonner, envoyez un courrier électronique à +\fBnano-devel-request@gnu.org\fR, ayant pour objet «\ subscribe\ ». -N'hsitez pas galement envoyez vos commentaires, suggestions et -corrections relatives l'adaptation franaise de cette page de manuel -ou du logiciel \fBjean-philippe.guerard@tigreraye.org\fR. +N'hésitez pas également à envoyez vos commentaires, suggestions et +corrections relatives à l'adaptation française de cette page de manuel +ou du logiciel à \fBjean-philippe.guerard@tigreraye.org\fR. .SH "SITE INTERNET" http://www.nano-editor.org/ .SH AUTEUR Chris Allegretta et d'autres (voir le fichier -\fIAUTHORS\fR). Cette page de manuel a t initialement rdige par -Thijs Kinkhorst , pour le systme GNU Debian (mais -elle peut tre utilise par d'autres). +\fIAUTHORS\fR). Cette page de manuel a été initialement rédigée par +Thijs Kinkhorst , pour le système GNU Debian (mais +elle peut être utilisée par d'autres). .SH TRADUCTION -Cette adaptation franaise a t ralise par Jean-Philippe\ Gurard - le 29\ novembre\ 2007 partir +Cette adaptation française a été réalisée par Jean-Philippe\ Guérard + le 29\ novembre\ 2007 à partir de la version 1.19 du 6\ novembre\ 2007 de la page de manuel de rnano (pour la version 2.0.0 de nano). -Un maximum de soin a t apport lors de l'laboration de cette -traduction\ ; nanmoins, quelques imperfections peuvent subsister. Si -vous en rencontrez, que ce soit dans la version franaise ou dans la -version originale, n'hsitez pas les signaler l'auteur ou au +Un maximum de soin a été apporté lors de l'élaboration de cette +traduction\ ; néanmoins, quelques imperfections peuvent subsister. Si +vous en rencontrez, que ce soit dans la version française ou dans la +version originale, n'hésitez pas à les signaler à l'auteur ou au traducteur. -La version originale la plus jour de ce document est toujours +La version originale la plus à jour de ce document est toujours consultable via la commande\ : LANGUAGE=en man nano diff --git a/doc/man/fr/rnano.1.html b/doc/man/fr/rnano.1.html index 26c2d1b..58d34fb 100644 --- a/doc/man/fr/rnano.1.html +++ b/doc/man/fr/rnano.1.html @@ -1,5 +1,5 @@ - - + + @@ -38,8 +38,9 @@

rnano − -Le mode restreint de NAno un NOuvel éditeur, un clone -libre et amélioré de Pico

+Le mode restreint de NAno un NOuvel éditeur, un +clone libre et amélioré de +Pico

SYNOPSIS @@ -55,29 +56,31 @@ libre et amélioré de Pico

Cette page de -manuel décrit brièvement la commande -rnano.

+manuel décrit brièvement la +commande rnano.

nano est -un éditeur petit, sympathique et libre, qui vise -à remplacer Pico, l’éditeur par -défaut du logiciel non libre Pine. nano ne se -contentant pas de copier l’interface et -l’ergonomie de Pico, il offre également -certaines fonctions manquantes (ou désactivées -par défaut) dans Pico. Ces fonctionnalités -sont, par exemple, les fonctions de recherche et de -remplacement, et la possibilité de sauter directement -à une ligne et à une colonne -précise..

+un éditeur petit, sympathique et libre, qui +vise à remplacer Pico, +l’éditeur par défaut du +logiciel non libre Pine. nano ne se contentant pas de +copier l’interface et l’ergonomie de Pico, il +offre également certaines fonctions manquantes +(ou désactivées par +défaut) dans Pico. Ces +fonctionnalités sont, par exemple, les +fonctions de recherche et de remplacement, et la +possibilité de sauter directement +à une ligne et à une colonne +précise..

rnano est une version de nano fonctionnant en mode -restreint, qui ne permet d’éditer que les -fichiers indiqués et qui n’autorise pas -l’utilisateur à accéder au -système de fichier ou à un interpréteur -de commandes.

+restreint, qui ne permet d’éditer que les +fichiers indiqués et qui n’autorise pas +l’utilisateur à accéder au +système de fichier ou à un +interpréteur de commandes.

En mode restreint, nano refusera :

@@ -94,9 +97,9 @@ restreint, nano refusera :

-

de lire ou d’écrire dans un fichier -n’ayant pas été indiqué dans la -ligne de commande ;

+

de lire ou d’écrire dans un fichier +n’ayant pas été +indiqué dans la ligne de commande ;

@@ -119,7 +122,7 @@ ligne de commande ;

de permettre de suspendre -l’édition ;

+l’édition ;

@@ -130,9 +133,9 @@ l’édition ;

-

de permettre d’ajouter en début ou en fin -d’un fichier, ou de l’enregistrer sous un nom -différent ;

+

de permettre d’ajouter en début ou en +fin d’un fichier, ou de l’enregistrer sous un +nom différent ;

@@ -143,8 +146,9 @@ différent ;

-

l’utilisation de copies de sécurité -ou de la correction orthographique.

+

l’utilisation de copies de +sécurité ou de la correction +orthographique.

OPTIONS @@ -155,11 +159,12 @@ ou de la correction orthographique.

+LIGNE,COLONNE

-

Démarre avec le curseur -positionné à la colonne COLONNE de la -ligne LIGNE (l’un des deux, au moins, devant -être spécifié) au lieu de -démarrer à la colonne 1, +

Démarre avec le +curseur positionné à la colonne +COLONNE de la ligne LIGNE (l’un des +deux, au moins, devant être +spécifié) au lieu de +démarrer à la colonne 1, ligne 1.

−?

- - +
+ -

Identique à -h (−−help).

 +

Identique à −h +(−−help).

−h (−−help)

-

Affiche un résumé -des options de lancement de nano, puis -s’arrête.

+

Affiche un +résumé des options de lancement de +nano, puis s’arrête.

−V (−−version)

Affiche la version, puis -s’arrête.

+s’arrête.

Reportez-vous -à la page de manuel nano(1) si vous souhaitez -consulter la documentation complète de +à la page de manuel nano(1) si vous +souhaitez consulter la documentation complète de nano.

BOGUES @@ -204,24 +210,25 @@ consulter la documentation complète de

Merci de nous faire parvenir vos commentaires et de nous signaler les -bogues, en écrivant, en anglais, à +bogues, en écrivant, en anglais, à nano@nano-editor.org.

La liste de -discussion anglophone nano est disponible à -l’adresse nano-devel@gnu.org.

+discussion anglophone nano est disponible +à l’adresse +nano-devel@gnu.org.

Pour vous -abonner, envoyez un courrier électronique à -nano-devel-request@gnu.org, ayant pour objet -« subscribe ».

+abonner, envoyez un courrier électronique +à nano-devel-request@gnu.org, ayant pour +objet « subscribe Â».

-

N’hésitez -pas également à envoyez vos commentaires, -suggestions et corrections relatives à -l’adaptation française de cette page de manuel -ou du logiciel à +

N’hésitez +pas également à envoyez vos +commentaires, suggestions et corrections relatives +à l’adaptation française de +cette page de manuel ou du logiciel à jean-philippe.guerard@tigreraye.org.

SITE INTERNET @@ -240,10 +247,11 @@ ou du logiciel à

Chris Allegretta <chrisa@asty.org> et d’autres (voir le fichier AUTHORS). Cette page de manuel a -été initialement rédigée par -Thijs Kinkhorst <thijs@kinkhorst.com>, pour le -système GNU Debian (mais elle peut être -utilisée par d’autres).

+été initialement +rédigée par Thijs Kinkhorst +<thijs@kinkhorst.com>, pour le système GNU +Debian (mais elle peut être +utilisée par d’autres).

TRADUCTION @@ -251,25 +259,28 @@ utilisée par d’autres).

Cette -adaptation française a été -réalisée par Jean-Philippe Guérard +adaptation française a +été +réalisée par +Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org> le -29 novembre 2007 à partir de la version -1.19 du 6 novembre 2007 de la page de manuel de -rnano (pour la version 2.0.0 de nano).

+29 novembre 2007 à partir de la +version 1.19 du 6 novembre 2007 de la page de +manuel de rnano (pour la version 2.0.0 de nano).

Un maximum de -soin a été apporté lors de -l’élaboration de cette traduction ; -néanmoins, quelques imperfections peuvent subsister. -Si vous en rencontrez, que ce soit dans la version -française ou dans la version originale, -n’hésitez pas à les signaler à -l’auteur ou au traducteur.

+soin a été apporté +lors de l’élaboration de cette +traduction ; néanmoins, quelques +imperfections peuvent subsister. Si vous en rencontrez, que +ce soit dans la version française ou dans la +version originale, n’hésitez pas +à les signaler à l’auteur ou +au traducteur.

La version -originale la plus à jour de ce document est toujours -consultable via la commande :

+originale la plus à jour de ce document est +toujours consultable via la commande :

LANGUAGE=en man nano

diff --git a/doc/man/nano.1 b/doc/man/nano.1 index 6921431..63ec8ec 100644 --- a/doc/man/nano.1 +++ b/doc/man/nano.1 @@ -1,6 +1,8 @@ .\" Hey, EMACS: -*- nroff -*- +.\" $Id: nano.1 5135 2015-03-08 15:59:15Z bens $ +.\" .\" Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, -.\" 2008, 2009 Free Software Foundation, Inc. +.\" 2009, 2010, 2013, 2014 Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: @@ -18,8 +20,7 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.\" $Id: nano.1 4502 2010-04-14 21:55:39Z astyanax $ -.TH NANO 1 "version 2.2.0" "November 30, 2009" +.TH NANO 1 "version 2.4.0" "March 2015" .\" Please adjust this date whenever revising the manpage. .\" @@ -28,203 +29,212 @@ nano \- Nano's ANOther editor, an enhanced free Pico clone .SH SYNOPSIS .B nano -.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]... -.br +.RI [ options "] [[+" line , column "]\ " file "]..." .SH DESCRIPTION -This manual page briefly documents the \fBnano\fP command. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invoke bold face and italics, -.\" respectively. \fBnano\fP is a small, free and friendly editor which aims to replace -Pico, the default editor included in the non-free Pine package. Rather -than just copying Pico's look and feel, \fBnano\fP also implements some +Pico, the default editor included in the non-free Pine package. On +top of copying Pico's look and feel, \fBnano\fP also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line and column number". .SH OPTIONS .TP -.B \+\fILINE\fP,\fICOLUMN\fP -Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP +.B +\fIline\fP,\fIcolumn\fP +Places the cursor on line number \fIline\fP and at column number \fIcolumn\fP (at least one of which must be specified) on startup, instead of the -default of line 1, column 1. +default line 1, column 1. .TP -.B \-? -Same as \fB-h (\-\-help)\fP. -.TP -.B \-A (\-\-smarthome) +.BR \-A ", " \-\-smarthome Make the Home key smarter. When Home is pressed anywhere but at the very beginning of non-whitespace characters on a line, the cursor will jump to that beginning (either forwards or backwards). If the cursor is already at that position, it will jump to the true beginning of the line. .TP -.B \-B (\-\-backup) +.BR \-B ", " \-\-backup When saving a file, back up the previous version of it to the current -filename suffixed with a ~. +filename suffixed with a tilde (\fB~\fP). .TP -.B \-C \fIdir\fP (\-\-backupdir=\fIdir\fP) -Set the directory where \fBnano\fP puts unique backup files if file +.BR \-C\ \fIdirectory\fR ", " \-\-backupdir= \fIdirectory +Set the directory where \fBnano\fP puts unique backup files, if file backups are enabled. .TP -.B \-D (\-\-boldtext) +.BR \-D ", " \-\-boldtext Use bold text instead of reverse video text. .TP -.B \-E (\-\-tabstospaces) +.BR \-E ", " \-\-tabstospaces Convert typed tabs to spaces. .TP -.B \-F (\-\-multibuffer) -Enable multiple file buffers, if available. +.BR \-F ", " \-\-multibuffer +Enable multiple file buffers (if support for them has been compiled in). +.TP +.BR \-G ", " \-\-locking +Enable vim-style file locking when editing files. .TP -.B \-H (\-\-historylog) -Log search and replace strings to \fI~/.nano_history\fP, so they can be -retrieved in later sessions, if \fInanorc\fP support is available. +.BR \-H ", " \-\-historylog +Log search and replace strings to \fI~/.nano/search_history\fP, so they can be +retrieved in later sessions. .TP -.B \-I (\-\-ignorercfiles) -Don't look at \fISYSCONFDIR/nanorc\fP or \fI~/.nanorc\fP, if -\fInanorc\fP support is available. +.BR \-I ", " \-\-ignorercfiles +Don't look at the system's \fBnanorc\fP nor at \fB~/.nanorc\fP. .TP -.B \-K (\-\-rebindkeypad) +.BR \-K ", " \-\-rebindkeypad Interpret the numeric keypad keys so that they all work properly. You should only need to use this option if they don't, as mouse support won't work properly with this option enabled. .TP -.B \-L (\-\-nonewlines) +.BR \-L ", " \-\-nonewlines Don't add newlines to the ends of files. .TP -.B \-N (\-\-noconvert) +.BR \-N ", " \-\-noconvert Disable automatic conversion of files from DOS/Mac format. .TP -.B \-O (\-\-morespace) +.BR \-O ", " \-\-morespace Use the blank line below the titlebar as extra editing space. .TP -.B \-Q \fIstr\fP (\-\-quotestr=\fIstr\fP) +.BR \-P ", " \-\-poslog +Log and later read back the location of the cursor and place it there +again. +.TP +.BR "\-Q ""\fIcharacters\fB""" ", " "\-\-quotestr=""" \fIcharacters\fR """ Set the quoting string for justifying. The default is -"\fI^([\ \\t]*[#:>\\|}])+\fP" if extended regular expression support is -available, or "\fI>\ \fP" otherwise. Note that \fI\\t\fP stands for a +\fB"^([\ \\t]*[#:>\\|}])+"\fP if extended regular expression support is +available, or \fB">\ "\fP otherwise. Note that \fB\\t\fP stands for a Tab. .TP -.B \-R (\-\-restricted) +.BR \-R ", " \-\-restricted Restricted mode: don't read or write to any file not specified on the -command line; read any \fInanorc\fP files; allow suspending; allow a -file to be appended to, prepended to, or saved under a different name if -it already has one; or use backup files or spell checking. Also -accessible by invoking \fBnano\fP with any name beginning with 'r' (e.g. -"rnano"). -.TP -.B \-S (\-\-smooth) +command line; don't read any \fInanorc\fP files nor history files; +don't allow suspending nor spell checking; +don't allow a file to be appended to, prepended to, or saved under a +different name if it already has one; and don't use backup files. +This restricted mode is also accessible by invoking \fBnano\fP +with any name beginning with 'r' (e.g. "rnano"). +.TP +.BR \-S ", " \-\-smooth Enable smooth scrolling. Text will scroll line-by-line, instead of the usual chunk-by-chunk behavior. .TP -.B \-T \fIcols\fP (\-\-tabsize=\fIcols\fP) -Set the size (width) of a tab to \fIcols\fP columns. The value of -\fIcols\fP must be greater than 0. The default value is 8. +.BR \-T\ \fInumber\fR ", " \-\-tabsize= \fInumber +Set the size (width) of a tab to \fInumber\fP columns. The value of +\fInumber\fP must be greater than 0. The default value is 8. .TP -.B \-U (\-\-quickblank) +.BR \-U ", " \-\-quickblank Do quick statusbar blanking. Statusbar messages will disappear after 1 -keystroke instead of 25. Note that \fB-c\fP overrides this. +keystroke instead of 25. Note that \fB\-c\fP overrides this. .TP -.B \-V (\-\-version) +.BR \-V ", " \-\-version Show the current version number and exit. .TP -.B \-W (\-\-wordbounds) +.BR \-W ", " \-\-wordbounds Detect word boundaries more accurately by treating punctuation characters as part of a word. .TP -.B \-Y \fIstr\fP (\-\-syntax=\fIstr\fP) -Specify a specific syntax highlighting from the \fInanorc\fP to use, if -available. +.BR \-Y\ \fIname\fR ", " \-\-syntax= \fIname +Specify the name of the syntax highlighting to use from among the ones +defined in the \fInanorc\fP files. .TP -.B \-c (\-\-const) -Constantly show the cursor position. Note that this overrides \fB-U\fP. +.BR \-c ", " \-\-const +Constantly show the cursor position. Note that this overrides \fB\-U\fP. .TP -.B \-d (\-\-rebinddelete) +.BR \-d ", " \-\-rebinddelete Interpret the Delete key differently so that both Backspace and Delete work properly. You should only need to use this option if Backspace acts like Delete on your system. .TP -.B \-h (\-\-help) -Show a summary of command line options and exit. +.BR \-h ", " \-\-help +Show a summary of the available command-line options and exit. .TP -.B \-i (\-\-autoindent) +.BR \-i ", " \-\-autoindent Indent new lines to the previous line's indentation. Useful when editing source code. .TP -.B \-k (\-\-cut) -Enable cut from cursor to end of line. +.BR \-k ", " \-\-cut +Make the 'Cut Text' command (normally ^K) cut from the current cursor +position to the end of the line, instead of cutting the entire line. .TP -.B \-l (\-\-nofollow) +.BR \-l ", " \-\-nofollow If the file being edited is a symbolic link, replace the link with a new file instead of following it. Good for editing files in \fI/tmp\fP, perhaps? .TP -.B \-m (\-\-mouse) +.BR \-m ", " \-\-mouse Enable mouse support, if available for your system. When enabled, mouse clicks can be used to place the cursor, set the mark (with a double click), and execute shortcuts. The mouse will work in the X Window -System, and on the console when gpm is running. +System, and on the console when gpm is running. Text can still be +selected through dragging by holding down the Shift key. .TP -.B \-o \fIdir\fP (\-\-operatingdir=\fIdir\fP) -Set operating directory. Makes \fBnano\fP set up something similar to a -chroot. +.BR \-n ", " \-\-noread +Treat any name given on the command line as a new file. This allows +\fBnano\fR to write to named pipes: it will start with a blank buffer, +and will write to the pipe when the user saves the "file". This way +\fBnano\fR can be used as an editor in combination with for instance +\fBgpg\fR without having to write sensitive data to disk first. .TP -.B \-p (\-\-preserve) +.BR \-o\ \fIdirectory\fR ", " \-\-operatingdir= \fIdirectory +Set the operating directory. This makes \fBnano\fP set up something +similar to a chroot. +.TP +.BR \-p ", " \-\-preserve Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught by the terminal. .TP -.B \-q (\-\-quiet) -Do not report errors in the \fInanorc\fP file and ask them to be +.BR \-q ", " \-\-quiet +Do not report errors in the \fInanorc\fP files nor ask them to be acknowledged by pressing Enter at startup. .TP -.B \-r \fIcols\fP (\-\-fill=\fIcols\fP) -Wrap lines at column \fIcols\fP. If this value is 0 or less, wrapping -will occur at the width of the screen less \fIcols\fP columns, allowing +.BR \-r\ \fInumber\fR ", " \-\-fill= \fInumber +Hard-wrap lines at column \fInumber\fP. If this value is 0 or less, wrapping +will occur at the width of the screen less \fInumber\fP columns, allowing the wrap point to vary along with the width of the screen if the screen -is resized. The default value is \-8. +is resized. The default value is \-8. This option conflicts with +.B \-w +-- the last one given takes effect. .TP -.B \-s \fIprog\fP (\-\-speller=\fIprog\fP) -Enable alternative spell checker command. +.BR \-s\ \fIprogram\fR ", " \-\-speller= \fIprogram +Use this alternative spell checker command. .TP -.B \-t (\-\-tempfile) -Always save changed buffer without prompting. Same as Pico's \fB-t\fP +.BR \-t ", " \-\-tempfile +Always save a changed buffer without prompting. Same as Pico's \fB\-t\fP option. .TP -.B \-u (\-\-undo) -Enable experimental generic-purpose undo code. By default, the undo and redo -shortcuts are Meta-U and Meta-E, respectively. -.TP -.B \-v (\-\-view) -View file (read only) mode. +.BR \-v ", " \-\-view +View-file (read-only) mode. .TP -.B \-w (\-\-nowrap) -Disable wrapping of long lines. +.BR \-w ", " \-\-nowrap +Disable the hard-wrapping of long lines. This option conflicts with +.B \-r +-- the last one given takes effect. .TP -.B \-x (\-\-nohelp) -Disable help screen at bottom of editor. +.BR \-x ", " \-\-nohelp +Don't show the two help lines at the bottom of the screen. .TP -.B \-z (\-\-suspend) -Enable suspend ability. +.BR \-z ", " \-\-suspend +Enable the suspend ability. .TP -.B \-$ (\-\-softwrap) -Enable 'soft wrapping'. \fBnano\fP will attempt to display the entire -contents of a line, even if it is longer than the screen width. Since +.BR \-$ ", " \-\-softwrap +Enable 'soft wrapping'. This will make \fBnano\fP attempt to display the +entire contents of any line, even if it is longer than the screen width, by +continuing it over multiple screen lines. Since \&'$' normally refers to a variable in the Unix shell, you should specify -this option last when using other options (e.g. 'nano \-wS$') or pass it -separately (e.g. 'nano \-wS \-$'). +this option last when using other options (e.g.\& 'nano \-wS$') or pass it +separately (e.g.\& 'nano \-wS \-$'). .TP -.B \-a, \-b, \-e, \-f, \-g, \-j +.BR \-a ", " \-b ", " \-e ", " \-f ", " \-g ", " \-j Ignored, for compatibility with Pico. .SH INITIALIZATION FILE \fBnano\fP will read initialization files in the following order: -\fISYSCONFDIR/nanorc\fP, then \fI~/.nanorc\fP. Please see -\fBnanorc(5)\fP and the example file \fBnanorc.sample\fP, both of which -should be provided with \fBnano\fP. +the system's \fBnanorc\fP (if it exists), and then the user's +\fB~/.nanorc\fP (if it exists). Please see +.BR nanorc (5) +for more information on the possible contents of those files. .SH NOTES If no alternative spell checker command is specified on the command -line or in one of the \fInanorc\fP files, \fBnano\fP will check the +line nor in one of the \fInanorc\fP files, \fBnano\fP will check the \fBSPELL\fP environment variable for one. In some cases \fBnano\fP will try to dump the buffer into an emergency @@ -233,7 +243,7 @@ SIGTERM or runs out of memory. It will write the buffer into a file named \fInano.save\fP if the buffer didn't have a name already, or will add a ".save" suffix to the current filename. If an emergency file with that name already exists in the current directory, it will add ".save" -plus a number (e.g. ".save.1") to the current filename in order to make +plus a number (e.g.\& ".save.1") to the current filename in order to make it unique. In multibuffer mode, \fBnano\fP will write all the open buffers to their respective emergency files. @@ -256,7 +266,7 @@ http://www.nano-editor.org/ \fI/usr/share/doc/nano/\fP (or equivalent on your system) .SH AUTHOR -Chris Allegretta , et al (see \fIAUTHORS\fP and +Chris Allegretta , et al (see the files \fIAUTHORS\fP and \fITHANKS\fP for details). This manual page was originally written by Jordi Mallach , for the Debian system (but may be used by others). diff --git a/doc/man/nano.1.html b/doc/man/nano.1.html index cb1101e..bd7b43f 100644 --- a/doc/man/nano.1.html +++ b/doc/man/nano.1.html @@ -1,5 +1,5 @@ - - + + @@ -48,22 +48,20 @@ Nano’s ANOther editor, an enhanced free Pico clone

nano -[OPTIONS] [[+LINE,COLUMN] FILE]...

+[options] +[[+line,column] file]...

DESCRIPTION

-

This manual -page briefly documents the nano command.

-

nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine -package. Rather than just copying Pico’s look and -feel, nano also implements some missing (or disabled -by default) features in Pico, such as "search and +package. On top of copying Pico’s look and feel, +nano also implements some missing (or disabled by +default) features in Pico, such as "search and replace" and "go to line and column number".

@@ -73,32 +71,15 @@ number".

-

+LINE,COLUMN

- -

Places cursor at line number -LINE and column number COLUMN (at least one of -which must be specified) on startup, instead of the default -of line 1, column 1.

- - - - - - - - -
- - -

−?

 +

+line,column

+

Places the cursor on line +number line and at column number column (at +least one of which must be specified) on startup, instead of +the default line 1, column 1.

-

Same as -h (−−help).

 -
- -

−A -(−−smarthome)

+

−A, +−−smarthome

Make the Home key smarter. When Home is pressed anywhere but at the very beginning of @@ -107,277 +88,309 @@ that beginning (either forwards or backwards). If the cursor is already at that position, it will jump to the true beginning of the line.

-

−B -(−−backup)

+

−B, +−−backup

When saving a file, back up the previous version of it to the current filename suffixed with -a ~.

+a tilde (~).

+ -

−C dir -(−−backupdir=dir)

+

−C directory, +−−backupdir=directory

Set the directory where -nano puts unique backup files if file backups are +nano puts unique backup files, if file backups are enabled.

-

−D -(−−boldtext)

+

−D, +−−boldtext

Use bold text instead of reverse video text.

-

−E -(−−tabstospaces)

+

−E, +−−tabstospaces

Convert typed tabs to spaces.

-

−F -(−−multibuffer)

+

−F, +−−multibuffer

+ +

Enable multiple file buffers +(if support for them has been compiled in).

-

Enable multiple file buffers, -if available.

+

−G, +−−locking

-

−H -(−−historylog)

+

Enable vim-style file locking +when editing files.

+ +

−H, +−−historylog

Log search and replace strings -to ~/.nano_history, so they can be retrieved in later -sessions, if nanorc support is available.

+to ~/.nano/search_history, so they can be retrieved +in later sessions.

-

−I -(−−ignorercfiles)

+

−I, +−−ignorercfiles

-

Don’t look at -SYSCONFDIR/nanorc or ~/.nanorc, if -nanorc support is available.

+

Don’t look at the +system’s nanorc nor at ~/.nanorc.

-

−K -(−−rebindkeypad)

+

−K, +−−rebindkeypad

Interpret the numeric keypad keys so that they all work properly. You should only need to use this option if they don’t, as mouse support won’t work properly with this option enabled.

-

−L -(−−nonewlines)

+

−L, +−−nonewlines

Don’t add newlines to the ends of files.

-

−N -(−−noconvert)

+

−N, +−−noconvert

Disable automatic conversion of files from DOS/Mac format.

-

−O -(−−morespace)

+

−O, +−−morespace

Use the blank line below the titlebar as extra editing space.

-

−Q str -(−−quotestr=str)

+

−P, +−−poslog

+ +

Log and later read back the +location of the cursor and place it there again.

+ +

−Q +"characters", +−−quotestr="characters"

Set the quoting string for justifying. The default is -"^([ \t]*[#:>\|}])+" if extended +"^([ \t]*[#:>\|}])+" if extended regular expression support is available, or -"> " otherwise. Note that \t +"> " otherwise. Note that \t stands for a Tab.

-

−R -(−−restricted)

+

−R, +−−restricted

Restricted mode: don’t read or write to any file not specified on the command line; -read any nanorc files; allow suspending; allow a file -to be appended to, prepended to, or saved under a different -name if it already has one; or use backup files or spell -checking. Also accessible by invoking nano with any -name beginning with ’r’ (e.g. -"rnano").

+don’t read any nanorc files nor history files; +don’t allow suspending nor spell checking; don’t +allow a file to be appended to, prepended to, or saved under +a different name if it already has one; and don’t use +backup files. This restricted mode is also accessible by +invoking nano with any name beginning with +’r’ (e.g. "rnano").

-

−S -(−−smooth)

+

−S, +−−smooth

Enable smooth scrolling. Text will scroll line-by-line, instead of the usual chunk-by-chunk behavior.

-

−T cols -(−−tabsize=cols)

+ +

−T number, +−−tabsize=number

Set the size (width) of a tab -to cols columns. The value of cols must be +to number columns. The value of number must be greater than 0. The default value is 8.

-

−U -(−−quickblank)

+

−U, +−−quickblank

Do quick statusbar blanking. Statusbar messages will disappear after 1 keystroke instead -of 25. Note that -c overrides this.

+of 25. Note that −c overrides this.

-

−V -(−−version)

+

−V, +−−version

Show the current version number and exit.

-

−W -(−−wordbounds)

+

−W, +−−wordbounds

Detect word boundaries more accurately by treating punctuation characters as part of a word.

-

−Y str -(−−syntax=str)

-

Specify a specific syntax -highlighting from the nanorc to use, if -available.

+

−Y name, +−−syntax=name

+ +

Specify the name of the syntax +highlighting to use from among the ones defined in the +nanorc files.

-

−c -(−−const)

+

−c, +−−const

Constantly show the cursor -position. Note that this overrides -U.

+position. Note that this overrides −U.

-

−d -(−−rebinddelete)

+

−d, +−−rebinddelete

Interpret the Delete key differently so that both Backspace and Delete work properly. You should only need to use this option if Backspace acts like Delete on your system.

-

−h -(−−help)

+

−h, +−−help

-

Show a summary of command line -options and exit.

+

Show a summary of the available +command-line options and exit.

-

−i -(−−autoindent)

+

−i, +−−autoindent

Indent new lines to the previous line’s indentation. Useful when editing source code.

-

−k -(−−cut)

+

−k, +−−cut

-

Enable cut from cursor to end -of line.

+

Make the ’Cut Text’ +command (normally ^K) cut from the current cursor position +to the end of the line, instead of cutting the entire +line.

-

−l -(−−nofollow)

+

−l, +−−nofollow

If the file being edited is a symbolic link, replace the link with a new file instead of following it. Good for editing files in /tmp, perhaps?

-

−m -(−−mouse)

+

−m, +−−mouse

Enable mouse support, if available for your system. When enabled, mouse clicks can be used to place the cursor, set the mark (with a double click), and execute shortcuts. The mouse will work in the X -Window System, and on the console when gpm is running.

+Window System, and on the console when gpm is running. Text +can still be selected through dragging by holding down the +Shift key.

+ +

−n, +−−noread

+ +

Treat any name given on the +command line as a new file. This allows nano to write +to named pipes: it will start with a blank buffer, and will +write to the pipe when the user saves the "file". +This way nano can be used as an editor in combination +with for instance gpg without having to write +sensitive data to disk first.

-

−o dir -(−−operatingdir=dir)

-

Set operating directory. Makes -nano set up something similar to a chroot.

+

−o directory, +−−operatingdir=directory

-

−p -(−−preserve)

+

Set the operating directory. +This makes nano set up something similar to a +chroot.

+ +

−p, +−−preserve

Preserve the XON and XOFF sequences (^Q and ^S) so they will be caught by the terminal.

-

−q -(−−quiet)

+

−q, +−−quiet

Do not report errors in the -nanorc file and ask them to be acknowledged by +nanorc files nor ask them to be acknowledged by pressing Enter at startup.

-

−r cols -(−−fill=cols)

-

Wrap lines at column -cols. If this value is 0 or less, wrapping will occur -at the width of the screen less cols columns, +

−r number, +−−fill=number

+ +

Hard-wrap lines at column +number. If this value is 0 or less, wrapping will +occur at the width of the screen less number columns, allowing the wrap point to vary along with the width of the screen if the screen is resized. The default value is -−8.

+−8. This option conflicts with −w -- the +last one given takes effect.

+ -

−s prog -(−−speller=prog)

+

−s program, +−−speller=program

-

Enable alternative spell +

Use this alternative spell checker command.

-

−t -(−−tempfile)

+

−t, +−−tempfile

-

Always save changed buffer -without prompting. Same as Pico’s -t +

Always save a changed buffer +without prompting. Same as Pico’s −t option.

-

−u -(−−undo)

- -

Enable experimental -generic-purpose undo code. By default, the undo and redo -shortcuts are Meta-U and Meta-E, respectively.

- -

−v -(−−view)

+

−v, +−−view

-

View file (read only) mode.

+

View-file (read-only) mode.

-

−w -(−−nowrap)

+

−w, +−−nowrap

-

Disable wrapping of long -lines.

+

Disable the hard-wrapping of +long lines. This option conflicts with −r -- +the last one given takes effect.

-

−x -(−−nohelp)

+

−x, +−−nohelp

-

Disable help screen at bottom -of editor.

+

Don’t show the two help +lines at the bottom of the screen.

-

−z -(−−suspend)

+

−z, +−−suspend

-

Enable suspend ability.

+

Enable the suspend ability.

-

−$ -(−−softwrap)

+

−$, +−−softwrap

Enable ’soft -wrapping’. nano will attempt to display the -entire contents of a line, even if it is longer than the -screen width. Since ’$’ normally refers to a +wrapping’. This will make nano attempt to +display the entire contents of any line, even if it is +longer than the screen width, by continuing it over multiple +screen lines. Since ’$’ normally refers to a variable in the Unix shell, you should specify this option last when using other options (e.g. ’nano −wS$’) or pass it separately (e.g. ’nano −wS −$’).

-

−a, −b, -−e, −f, −g, −j

+

−a, +−b, −e, −f, +−g, −j

Ignored, for compatibility with Pico.

@@ -388,10 +401,11 @@ Pico.

nano -will read initialization files in the following order: -SYSCONFDIR/nanorc, then ~/.nanorc. Please see -nanorc(5) and the example file nanorc.sample, -both of which should be provided with nano.

+will read initialization files in the following order: the +system’s nanorc (if it exists), and then the +user’s ~/.nanorc (if it exists). Please see +nanorc(5) for more information on the possible +contents of those files.

NOTES @@ -400,7 +414,7 @@ both of which should be provided with nano.

If no alternative spell checker command is specified on the -command line or in one of the nanorc files, +command line nor in one of the nanorc files, nano will check the SPELL environment variable for one.

@@ -458,7 +472,7 @@ email to nano-devel-request@gnu.org with a subject of

Chris -Allegretta <chrisa@asty.org>, et al (see +Allegretta <chrisa@asty.org>, et al (see the files AUTHORS and THANKS for details). This manual page was originally written by Jordi Mallach <jordi@gnu.org>, for the Debian system (but may be diff --git a/doc/man/nanorc.5 b/doc/man/nanorc.5 index 3c69209..c2c802d 100644 --- a/doc/man/nanorc.5 +++ b/doc/man/nanorc.5 @@ -1,6 +1,8 @@ .\" Hey, EMACS: -*- nroff -*- -.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 -.\" Free Software Foundation, Inc. +.\" $Id: nanorc.5 5135 2015-03-08 15:59:15Z bens $ +.\" +.\" Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, +.\" 2013, 2014, 2015 Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: @@ -18,242 +20,296 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.\" $Id: nanorc.5 4508 2010-06-21 03:10:10Z astyanax $ -.TH NANORC 5 "version 2.0.0" "August 23, 2007" +.TH NANORC 5 "version 2.4.0" "March 2015" .\" Please adjust this date whenever revising the manpage. .\" .SH NAME nanorc \- GNU nano's rcfile .SH DESCRIPTION -This manual page briefly documents GNU \fBnano\fP's rcfile. -.PP -\fBnano\fP is a small, free and friendly editor which aims to replace -Pico, the default editor included in the non-free Pine package. Rather -than just copying Pico's look and feel, \fBnano\fP also implements some -missing (or disabled by default) features in Pico, such as "search and -replace" and "go to line and column number". -.PP -The \fInanorc\fP file contains the default settings for \fBnano\fP. It -should not be in DOS or Mac format. During startup, \fBnano\fP will -first read its system-wide settings from \fISYSCONFDIR/nanorc\fP, and -then user-specific settings from \fI~/.nanorc\fP. +The \fInanorc\fP file contains the default settings for \fBnano\fP, a +small and friendly editor. The file should be in Unix format, not in +DOS or Mac format. During startup, \fBnano\fP will first read the +system-wide settings, from \fB/etc/nanorc\fP (the exact path might be +different), and then the user-specific settings, from \fB~/.nanorc\fP. .SH OPTIONS The configuration file accepts a series of \fBset\fP and \fBunset\fP commands, which can be used to configure nano on startup without using -the command line options. Additionally, the \fBsyntax\fP, \fBcolor\fP, -and \fBicolor\fP keywords are used to define syntax highlighting rules -for different text patterns. \fBnano\fP will read one command per line. - +command-line options. Additionally, there are some commands to define +syntax highlighting and to rebind keys -- see the two separate sections +on those. \fBnano\fP reads one command per line. +.PP Options in \fInanorc\fP files take precedence over nano's defaults, and -command line options override \fInanorc\fP settings. Also, options are -unset by default, except for those that take arguments. - -Quotes inside string parameters don't have to be escaped with +command-line options override \fInanorc\fP settings. Also, options that +do not take an argument are unset by default. So using the \fBunset\fR +command is only needed when wanting to override a setting of the system's +\fInanorc\fR file in your own \fB~/.nanorc\fR. Options that take an +argument cannot be unset. +.PP +Below, the \fIstring\fR parameters need to be enclosed in double quotes. +Quotes inside these string parameters don't have to be escaped with backslashes. The last double quote in the string will be treated as its -end. For example, for the \fBbrackets\fP option, "\fI"')>]}\fP" will -match \fI"\fP, \fI'\fP, \fI)\fP, \fI>\fP, \fI]\fP, and \fI}\fP. - +end. For example, for the \fBbrackets\fP option, "\fB"')>]}\fP" will +match \fB"\fP, \fB'\fP, \fB)\fP, \fB>\fP, \fB]\fP, and \fB}\fP. +.PP The supported commands and arguments are: .TP 3 -.B set/unset allow_insecure_backup +.B set allow_insecure_backup When backing up files, allow the backup to succeed even if its permissions -can't be (re)set due to special OS considerations. You should +can't be (re)set due to special OS considerations. You should NOT enable this option unless you are sure you need it. .TP -.B set/unset autoindent +.B set autoindent Use auto-indentation. .TP -.B set/unset backup -Create backup files in \fIfilename~\fP. +.B set backup +Create backup files by adding a tilde (\fB~\fP) to each file's name. .TP .B set backupdir "\fIdirectory\fP" -Set the directory where \fBnano\fP puts unique backup files if file +Set the directory where \fBnano\fP puts unique backup files, if file backups are enabled. .TP -.B set/unset backwards +.B set backwards Do backwards searches by default. .TP -.B set/unset boldtext -Use bold text instead of reverse video text. +.B set boldtext +Use bold instead of reverse video for the titlebar, statusbar, key combos, +and selected text. This can be overridden for the first three by setting +the options \fBtitlecolor\fP, \fBstatuscolor\fP, and \fBkeycolor\fP. .TP .B set brackets "\fIstring\fP" Set the characters treated as closing brackets when justifying -paragraphs. They cannot contain blank characters. Only closing -punctuation, optionally followed by closing brackets, can end sentences. -The default value is "\fI"')>]}\fP". +paragraphs. This may not include blank characters. Only closing +punctuation (see \fBpunct\fP), optionally followed by the specified +closing brackets, can end sentences. The default value is "\fB"')>]}\fP". .TP -.B set/unset casesensitive -Do case sensitive searches by default. +.B set casesensitive +Do case-sensitive searches by default. .TP -.B set/unset const +.B set const Constantly display the cursor position in the status bar. .TP -.B set/unset cut -Use cut to end of line by default. +.B set cut +Use cut-to-end-of-line by default, instead of cutting the whole line. +.TP +.B set fill \fInumber\fR +Hard-wrap lines at column number \fInumber\fR. If \fInumber\fR is 0 or less, +the maximum line length will be the screen width less \fInumber\fP columns. +The default value is \fB\-8\fR. .TP -.B set fill \fIn\fP -Wrap lines at column number \fIn\fP. If \fIn\fP is 0 or less, the -maximum line length will be the screen width less \fIn\fP columns. The -default value is \-8. +.B set functioncolor \fIfgcolor\fR,\fIbgcolor\fR +Specify the color combination to use for the function descriptions +in the two help lines at the bottom of the screen. +See \fBset titlecolor\fR for more details. .TP -.B set/unset historylog -Enable \fI~/.nano_history\fP for saving and reading search/replace -strings. +.B set historylog +Enable the use of \fB~/.nano/search_history\fP for saving and reading +search/replace strings. +.TP +.B set keycolor \fIfgcolor\fR,\fIbgcolor\fR +Specify the color combination to use for the shortcut key combos +in the two help lines at the bottom of the screen. +See \fBset titlecolor\fR for more details. +.TP +.B set locking +Enable vim-style lock-files for when editing files. .TP .B set matchbrackets "\fIstring\fP" Set the opening and closing brackets that can be found by bracket -searches. They cannot contain blank characters. The former set must -come before the latter set, and both must be in the same order. The -default value is "\fI(<[{)>]}\fP". +searches. This may not include blank characters. The opening set must +come before the closing set, and the two sets must be in the same order. +The default value is "\fB(<[{)>]}\fP". .TP -.B set/unset morespace +.B set morespace Use the blank line below the titlebar as extra editing space. .TP -.B set/unset mouse +.B set mouse Enable mouse support, if available for your system. When enabled, mouse clicks can be used to place the cursor, set the mark (with a double click), and execute shortcuts. The mouse will work in the X Window -System, and on the console when gpm is running. +System, and on the console when gpm is running. Text can still be +selected through dragging by holding down the Shift key. .TP -.B set/unset multibuffer +.B set multibuffer Allow inserting files into their own buffers. .TP -.B set/unset noconvert +.B set noconvert Don't convert files from DOS/Mac format. .TP -.B set/unset nofollow +.B set nofollow Don't follow symlinks when writing files. .TP -.B set/unset nohelp -Don't display the help lists at the bottom of the screen. +.B set nohelp +Don't display the two help lines at the bottom of the screen. .TP -.B set/unset nonewlines -Don't add newlines to the ends of files. +.B set nonewlines +Don't automatically add a newline to the ends of files. .TP -.B set/unset nowrap -Don't wrap text at all. +.B set nowrap +Don't hard-wrap text at all. .TP .B set operatingdir "\fIdirectory\fP" \fBnano\fP will only read and write files inside \fIdirectory\fP and its subdirectories. Also, the current directory is changed to here, so -files are inserted from this diractory. By default, the operating +files are inserted from this directory. By default, the operating directory feature is turned off. .TP -.B set/unset preserve +.B set poslog +Save the cursor position of files between editing sessions. +.TP +.B set preserve Preserve the XON and XOFF keys (^Q and ^S). .TP .B set punct "\fIstring\fP" Set the characters treated as closing punctuation when justifying -paragraphs. They cannot contain blank characters. Only closing -punctuation, optionally followed by closing brackets, can end sentences. -The default value is "\fI!.?\fP". +paragraphs. This may not include blank characters. Only the +specfified closing punctuation, optionally followed by closing brackets +(see \fBbrackets\fP), can end sentences. The default value is "\fB!.?\fP". .TP -.B set/unset quiet -\fBnano\fP will not report errors in the \fInanorc\fP file and ask them -to be acknowledged by pressing enter at startup. If this is used it -should be placed at the top of the file to be fully effective. -.TP -.B set/unset quickblank +.B set quickblank Do quick statusbar blanking. Statusbar messages will disappear after 1 keystroke instead of 25. .TP +.B set quiet +\fBnano\fP will not report errors in the \fInanorc\fP file nor ask them +to be acknowledged by pressing Enter at startup. If this is used, it +should be placed at the top of the file to be fully effective. +.TP .B set quotestr "\fIstring\fP" The email-quote string, used to justify email-quoted paragraphs. This is an extended regular expression if your system supports them, otherwise a literal string. The default value is -"\fI^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression -support, or "\fI>\ \fP" otherwise. Note that '\\t' stands for a literal +"\fB^([\ \\t]*[#:>\\|}])+\fP" if you have extended regular expression +support, and "\fB>\ \fP" otherwise. Note that '\\t' stands for a literal Tab character. .TP -.B set/unset rebinddelete +.B set rebinddelete Interpret the Delete key differently so that both Backspace and Delete work properly. You should only need to use this option if Backspace acts like Delete on your system. .TP -.B set/unset rebindkeypad +.B set rebindkeypad Interpret the numeric keypad keys so that they all work properly. You should only need to use this option if they don't, as mouse support won't work properly with this option enabled. .TP -.B set/unset regexp +.B set regexp Do extended regular expression searches by default. .TP -.B set/unset smarthome +.B set smarthome Make the Home key smarter. When Home is pressed anywhere but at the very beginning of non-whitespace characters on a line, the cursor will jump to that beginning (either forwards or backwards). If the cursor is already at that position, it will jump to the true beginning of the line. .TP -.B set/unset smooth +.B set smooth Use smooth scrolling by default. .TP -.B set/unset softwrap -Enable soft line wrapping for easier viewing of very long lones. +.B set softwrap +Enable soft line wrapping for easier viewing of very long lines. .TP .B set speller "\fIspellprog\fP" Use spelling checker \fIspellprog\fP instead of the built-in one, which calls \fIspell\fP. .TP -.B set/unset suspend +.B set statuscolor \fIfgcolor\fR,\fIbgcolor\fR +Specify the color combination to use for the statusbar. +See \fBset titlecolor\fR for more details. +.TP +.B set suspend Allow \fBnano\fP to be suspended. .TP -.B set tabsize \fIn\fP -Use a tab size of \fIn\fP columns. The value of \fIn\fP must be greater -than 0. The default value is 8. +.B set tabsize \fInumber\fR +Use a tab size of \fInumber\fR columns. The value of \fInumber\fP must be +greater than 0. The default value is \fB8\fR. .TP -.B set/unset tabstospaces +.B set tabstospaces Convert typed tabs to spaces. .TP -.B set/unset tempfile +.B set tempfile Save automatically on exit, don't prompt. .TP -.B set/unset undo -Enable experimental generic-purpose undo code. +.B set titlecolor \fIfgcolor\fR,\fIbgcolor\fR +Specify the color combination to use for the titlebar. +Valid color names for foreground and background are: +.BR white , \ black , \ red , \ blue , \ green , \ yellow , \ magenta ", and " cyan . +And either "\fIfgcolor\fR" or ",\fIbgcolor\fR" may be left out. .TP -.B set/unset view +.B set view Disallow file modification. .TP -.B set/unset softwrap -Enable soft line wrapping for easier viewing of very long lones. -.TP .B set whitespace "\fIstring\fP" -Set the two characters used to display the first characters of tabs and +Set the two characters used to indicate the presence of tabs and spaces. They must be single-column characters. .TP -.B set/unset wordbounds +.B set wordbounds Detect word boundaries more accurately by treating punctuation characters as parts of words. -.TP -.B syntax "\fIstr\fP" ["\fIfileregex\fP" ... ] + +.SH SYNTAX HIGHLIGHTING +Coloring the different syntactic elements of a file +is done via regular expressions (see the \fBcolor\fR command below). +This is inherently imperfect, because regular expressions are not +powerful enough to fully parse a file. Nevertheless, regular +expressions can do a lot and are easy to make, so they are a +good fit for a small editor like \fBnano\fR. +.sp +A separate syntax can be defined for each kind of file +via the following commands: +.TP +.BR syntax " ""\fIstr\fR"" [""\fIfileregex\fR"" ...]" Defines a syntax named \fIstr\fP which can be activated via the -\-Y/\-\-syntax command line option, or will be automatically activated if +.BR \-Y / \-\-syntax +command-line option, or will be automatically activated if the current filename matches the extended regular expression \fIfileregex\fP. All following \fBcolor\fP and \fBicolor\fP statements -will apply to \fIsyntax\fP until a new syntax is defined. +will apply to this \fIstr\fP syntax until a new syntax is defined. -The \fInone\fP syntax is reserved; specifying it on the command line is -the same as not having a syntax at all. The \fIdefault\fP syntax is +The \fBnone\fP syntax is reserved; specifying it on the command line is +the same as not having a syntax at all. The \fBdefault\fP syntax is special: it takes no \fIfileregex\fP, and applies to files that don't match any other syntax's \fIfileregex\fP. .TP -.B color \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ... +.BI linter " program " \fR[ "arg " \fR...] +For the currently defined syntax, use the given \fIprogram\fR +to invoke the linter (this overrides the speller function when +defined). +.TP +.BI formatter " program " \fR[ "arg " \fR...] +For the currently defined syntax, use the given \fIprogram\fR +to automatically reformat text. Useful in certain programming +languages (e.g. go). +.TP +.BR header " \fIregex\fR " ... +For the currently defined syntax, add one or more regexes which will +be compared against the very first line of the file to be edited, +to determine whether this syntax should be used for that file. +.TP +.BR magic " \fIregex\fR " ... +For the currently defined syntax, add one or more regexes which +will be compared against the result of querying the \fBmagic\fP +database about the file to be edited, to determine whether this +syntax should be used for that file. This +functionality only works when \fBlibmagic\fP is installed on the +system and will be silently ignored otherwise. +.TP +.B color \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ... For the currently defined syntax, display all expressions matching the extended regular expression \fIregex\fP with foreground color \fIfgcolor\fP and background color \fIbgcolor\fP, at least one of which -must be specified. Legal colors for foreground and background color +must be specified. Valid colors for foreground and background are: white, black, red, blue, green, yellow, magenta, and cyan. You may -use the prefix "bright" to force a stronger color highlight for the +use the prefix "bright" to get a stronger color highlight for the foreground. If your terminal supports transparency, not specifying a \fIbgcolor\fP tells \fBnano\fP to attempt to use a transparent background. .TP -.B icolor \fIfgcolor\fP,\fIbgcolor\fP "\fIregex\fP" ... +.B icolor \fIfgcolor\fR,\fIbgcolor\fR """\fIregex\fR""" ... Same as above, except that the expression matching is case insensitive. .TP -.B color \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP" +.BR color " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR"" Display expressions which start with the extended regular expression \fIsr\fP and end with the extended regular expression \fIer\fP with foreground color \fIfgcolor\fP and background color \fIbgcolor\fP, @@ -262,244 +318,322 @@ highlighting to span multiple lines. Note that all subsequent instances of \fIsr\fP after an initial \fIsr\fP is found will be highlighted until the first instance of \fIer\fP. .TP -.B icolor \fIfgcolor\fP,\fIbgcolor\fP start="\fIsr\fP" end="\fIer\fP" +.BR icolor " \fIfgcolor\fR,\fIbgcolor\fR " start= """\fIsr\fR"" " end= """\fIer\fR"" Same as above, except that the expression matching is case insensitive. .TP -.B include "\fIsyntaxfile\fP" +.BR include " ""\fIsyntaxfile\fR""" Read in self-contained color syntaxes from \fIsyntaxfile\fP. Note that -\fIsyntaxfile\fP can only contain \fBsyntax\fP, \fBcolor\fP, and -\fBicolor\fP commands. -.SH KEY BINDINGS +\fIsyntaxfile\fP can only contain the above commands, from \fBsyntax\fP +to \fBicolor\fP. +.TP +.BI extendsyntax " str directive " \fR[ "arg " \fR...] +Extend the syntax previously defined as \fIstr\fP to include +new information. This allows you to add a new \fIcolor\fP, \fIicolor\fP, +\fImagic\fP, \fIheader\fP, or \fIlinter\fP directive to an already +defined syntax -- useful when you want to add to definitions from the +system-installed syntax definitions (which are normally not writable). + +.SH REBINDING KEYS Key bindings may be reassigned via the following commands: .TP -.B bind \fIkey\fP \fIfunction\fP \fImenu\fP +.BI bind " key function menu" Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the -context of menu \fImenu\fP. The format of \fIkey\fP should be one of: +context of menu \fImenu\fP (or in all menus where the function exists +by using \fBall\fP). .TP -.B ^ +.BI unbind " key menu" +Unbinds the key \fIkey\fP from the menu named \fImenu\fP (or from all +menus where it exists by using \fBall\fP). + +.TP +The format of \fIkey\fP should be one of: +.RS 3 +.TP 3 +.B ^ followed by an alpha character or the word "Space". Example: ^C .TP -.B M- +.B M- followed by a printable character or the word "Space". Example: M-C .TP -.B F +.B F followed by a numeric value from 1 to 16. Example: F10 +.RE + .TP -Valid function names to be bound include: -.TP 3 +Valid \fIfunction\fP names to be bound include: +.RS 3 +.TP 2 .B help -Invoke the help menu. +Invokes the help viewer. .TP .B cancel -Cancel the current command. +Cancels the current command. .TP .B exit -Exit from the program. +Exits from the program (or from the help viewer or the file browser). .TP .B writeout -Write the current buffer to disk. -.TP -.B justify -Justify the current text. +Writes the current buffer to disk. .TP .B insert -Insert a file into the current buffer (or into a new buffer when multibuffer +Inserts a file into the current buffer (or into a new buffer when multibuffer is enabled). .TP .B whereis -Search for text in the current buffer. +Searches for text in the current buffer -- or for filenames matching +a string in the current list in the file browser. .TP .B searchagain -Repeat the last search command. +Repeats the last search command. .TP -.B up -Move up in the editor or browser. -.TP -.B down -Move down in the editor or browser. -.TP -.B left -Move left in the editor or browser. -.TP -.B right -Move right in the editor or browser. +.B replace +Interactively replaces text within the current buffer. .TP .B cut -Cut the current line of text and store it. +Cuts and stores the current line (or the marked region). +.TP +.B copytext +Copies the current line (or the marked region) without deleting it. .TP .B uncut -Copy the currently stored text into the current buffer position. +Copies the currently stored text into the current buffer at the +current cursor position. .TP -.B curpos -Show the current line, column, word positions in the file. +.B mark +Sets the mark at the current position, to start selecting text. .TP -.B firstline -Move to the first line of the file. +.B cutrestoffile +Cuts all text from the cursor position till the end of the buffer. .TP -.B lastline -Move to the last line of the file. +.B curpos +Shows the current cursor position: the line, column, and character positions. .TP -.B gotoline -Move to a specific line (and column if specified). +.B wordcount +Counts the number of words, lines and characters in the current buffer. .TP -.B replace -Interactively replace text within the current buffer. +.B speller +Invokes a spell-checking program (or a linting program, if the current +syntax highlighting defines one). .TP -.B mark -Begin selecting text for cutting or pasting at the current position. +.B justify +Justifies the current paragraph. .TP -.B copytext -Copy the currently marked text without deleting it. +.B fulljustify +Justifies the entire current buffer. .TP .B indent -Indent the currently marked text (shift to the right). +Indents (shifts to the right) the currently marked text. .TP .B unindent -Un-indent the currently marked text (shift to the left). +Unindents (shifts to the left) the currently marked text. +.TP +.B left +Goes left one position (in the editor or browser). +.TP +.B right +Goes right one position (in the editor or browser). +.TP +.B up +Goes one line up (in the editor or browser). +.TP +.B down +Goes one line down (in the editor or browser). +.TP +.B scrollup +Scrolls up one line of text from the current position. +.TP +.B scrolldown +Scrolls down one line of text from the current position. .TP .B nextword -Move the cursor to the beginning of the next word. +Moves the cursor to the beginning of the next word. .TP .B prevword -Move the cursor to the beginning of the previous word. +Moves the cursor to the beginning of the previous word. .TP .B home -Move the cursor to the beginning of the current line. +Moves the cursor to the beginning of the current line. .TP .B end -Move the cursor to the end of the current line. +Moves the cursor to the end of the current line. .TP .B beginpara -Move the cursor to the beginning of the current paragraph. +Moves the cursor to the beginning of the current paragraph. .TP .B endpara -Move the cursor to the end of the current paragraph. +Moves the cursor to the end of the current paragraph. .TP -.B findbracket -Move the cursor to the matching bracket (brace, parenthesis, etc.) of the one -under the cursor. +.B prevpage +Goes up one screenful. .TP -.B scrollup -Scroll up one line of text from the current position. +.B nextpage +Goes down one screenful. .TP -.B scrolldown -Scroll down one line of text from the current position. +.B firstline +Goes to the first line of the file. +.TP +.B lastline +Goes to the last line of the file. +.TP +.B gotoline +Goes to a specific line (and column if specified). +.TP +.B gototext +Switches from targeting a line number to searching for text. +.TP +.B findbracket +Moves the cursor to the bracket (brace, parenthesis, etc.) that matches +(pairs) with the one under the cursor. .TP .B prevbuf -Switch to editing/viewing the previous buffer when using multibuffer mode. +Switches to editing/viewing the previous buffer when using multibuffer mode. .TP .B nextbuf -Switch to editing/viewing the next buffer when using multibuffer mode. +Switches to editing/viewing the next buffer when using multibuffer mode. .TP .B verbatim -Insert the next character verbatim into the file. +Inserts the next character verbatim into the file. .TP .B tab -Insert a tab at the current cursor location. +Inserts a tab at the current cursor location. .TP .B enter -Insert a new line below the current one. +Inserts a new line below the current one. .TP .B delete -Delete the character under the cursor. +Deletes the character under the cursor. .TP -.B fulljustify -Justify the entire current file. -.TP -.B wordcount -Count the number of words in the current buffer. -.TP -.B refresh -Refresh the screen. +.B backspace +Deletes the character before the cursor. .TP .B undo -Undo the text action peformed (add text, delete text, etc). +Undoes the last performed text action (add text, delete text, etc). .TP .B redo -Redo the last undone action (i.e., undo an undo). +Redoes the last undone action (i.e., it undoes an undo). +.TP +.B refresh +Refreshes the screen. .TP .B suspend -Suspend the editor (if the suspend function is enabled, see the +Suspends the editor (if the suspending function is enabled, see the "suspendenable" entry below). .TP .B casesens -Toggle case sensitivity in searching (search/replace menus only). +Toggles case sensitivity in searching (search/replace menus only). .TP .B regexp -Toggle whether searching/replacing is based on literal strings or regular expressions. +Toggles whether searching/replacing is based on literal strings or regular expressions. +.TP +.B backwards +Toggles whether searching/replacing goes forward or backward. .TP .B prevhistory -Show the previous history entry in the prompt menus (e.g. search). +Shows the previous history entry in the prompt menus (e.g. search). .TP .B nexthistory -Show the next history entry in the prompt menus (e.g. search). +Shows the next history entry in the prompt menus (e.g. search). .TP -.B dontreplace -Switch back to searching instead of replacing. +.B flipreplace +Toggles between searching for something and replacing something. .TP -.B gototext -Search for files matching a string in the file browser (reading or writing files). +.B flipexecute +Toggles between inserting a file and executing a command. +.TP +.B flipnewbuffer +Toggles between inserting into the current buffer and into a new +empty buffer. +.TP +.B tofiles +Starts the file browser, allowing to select a file from a list. +.TP +.B gotodir +Goes to a directory to be specified, allowing to browse anywhere +in the filesystem. .TP .B dosformat -When writing a file, switch to writing a DOS format (CR/LF). +When writing a file, switches to writing a DOS format (CR/LF). .TP .B macformat -When writing a file, switch to writing a Mac format. +When writing a file, switches to writing a Mac format. .TP .B append -When writing a file, append to the end instead of overwriting. +When writing a file, appends to the end instead of overwriting. .TP .B prepend -When writing a file, 'prepend' (write at the beginning) instead of overwriting. +When writing a file, 'prepends' (writes at the beginning) instead of overwriting. .TP .B backup -When writing a file, create a backup of the current file. +When writing a file, creates a backup of the current file. .TP .B firstfile -Move to the first file when using the file browser (reading or writing files). +Goes to the first file when using the file browser (reading or writing files). .TP .B lastfile -Move to the last file when using the file browser (reading or writing files). +Goes to the last file when using the file browser (reading or writing files). .TP .B nohelp -Toggle showing/hiding the two-line list of key bindings at the bottom of the screen. +Toggles the presence of the two-line list of key bindings at the bottom of the screen. .TP .B constupdate -Constantly display the current line, column, word positions. +Toggles the constant display of the current line, column, and character positions. .TP .B morespace -Toggle showing/hiding the blank line which 'separates' the 'title' from the file text. +Toggles the presence of the blank line which 'separates' the titlebar from the file text. .TP .B smoothscroll -Toggle smooth scrolling when moving via the arrow keys. +Toggles smooth scrolling (when moving around with the arrow keys). +.TP +.B softwrap +Toggles the displaying of overlong lines on multiple screen lines. .TP .B whitespacedisplay -Toggle whether whitespace is shown. +Toggles the showing of whitespace. +.TP +.B nosyntax +Toggles syntax highlighting. .TP .B smarthome -Toggle whether the smart home key function is enabled. +Toggles the smartness of the Home key. .TP .B autoindent -Toggle whether new lines will contain the same amount of whitespace as the line above. +Toggles whether new lines will contain the same amount of whitespace as the preceding line. .TP .B cuttoend -Toggle whether cutting text will cut the whole line or just from the current cursor +Toggles whether cutting text will cut the whole line or just from the current cursor position to the end of the line. .TP .B nowrap -Toggle whether long lines will be wrapped to the next line. +Toggles whether long lines will be hard-wrapped to the next line. .TP -.B suspendenable -Toggle whether the suspend sequence (normally ^Z) will suspend the editor window. +.B tabstospaces +Toggles whether typed tabs will be converted to spaces. +.TP +.B backupfile +Toggles whether a backup will be made of the file to be edited. +.TP +.B multibuffer +Toggles the use of multiple file buffers (if support for them has been compiled in). .TP +.B mouse +Toggles mouse support. +.TP +.B noconvert +Toggles automatic conversion of files from DOS/Mac format. +.TP +.B suspendenable +Toggles whether the suspend sequence (normally ^Z) will suspend the editor window. +.RE -Valid menu sections are: .TP +Valid \fImenu\fP sections are: +.RS 3 +.TP 2 .B main -The main editor window where text is entered. +The main editor window where text is entered and edited. .TP .B search The search menu (AKA whereis). @@ -520,14 +654,17 @@ The 'write file' menu. The 'insert file' menu. .TP .B extcmd -The menu for inserting output from an external comman, reached from the insert menu. +The menu for inserting output from an external command, reached from the insert menu. .TP .B help -The help menu. +The help-viewer menu. .TP .B spell The interactive spell checker Yes/no menu. .TP +.B linter +The linter menu. +.TP .B browser The file browser for inserting or writing a file. .TP @@ -535,26 +672,22 @@ The file browser for inserting or writing a file. The 'search for a file' menu in the file browser. .TP .B gotodir -The 'go to directory' menu. +The 'go to directory' menu in the file browser. .TP .B all -A special name meaning: apply to all menus where this function exists. +A special name that encompasses all menus. +For \fBbind\fR it means all menus where the specified \fIfunction\fR exists; +for \fBunbind\fR it means all menus where the specified \fIkey\fR exists. +.RE -.TP -.B unbind \fIkey\fP \fImenu\fP -Unbind the key \fIkey\fP from the menu named \fImenu\fP or from all -menus by using \fIall\fP. Same key syntax as for binding. -Rebinds the key \fIkey\fP to a new function named \fIfunction\fP in the -context of menu \fImenu\fP. The format of \fIkey\fP should be one of: .SH FILES .TP -.I SYSCONFDIR/nanorc -System-wide configuration file +.B /etc/nanorc +System-wide configuration file. .TP -.I ~/.nanorc -Per-user configuration file +.B ~/.nanorc +Per-user configuration file. .SH SEE ALSO -.PD 0 .TP \fBnano\fP(1) .PP diff --git a/doc/man/nanorc.5.html b/doc/man/nanorc.5.html index 94e2b6d..9f1ea5d 100644 --- a/doc/man/nanorc.5.html +++ b/doc/man/nanorc.5.html @@ -1,5 +1,5 @@ - - + + @@ -23,7 +23,8 @@ NAME
DESCRIPTION
OPTIONS
-KEY BINDINGS
+SYNTAX HIGHLIGHTING
+REBINDING KEYS
FILES
SEE ALSO
AUTHOR
@@ -44,24 +45,13 @@ GNU nano’s rcfile

-

This manual -page briefly documents GNU nano’s rcfile.

- -

nano is -a small, free and friendly editor which aims to replace -Pico, the default editor included in the non-free Pine -package. Rather than just copying Pico’s look and -feel, nano also implements some missing (or disabled -by default) features in Pico, such as "search and -replace" and "go to line and column -number".

-

The nanorc file contains the default settings for -nano. It should not be in DOS or Mac format. During -startup, nano will first read its system-wide -settings from SYSCONFDIR/nanorc, and then -user-specific settings from ~/.nanorc.

+nano, a small and friendly editor. The file should be +in Unix format, not in DOS or Mac format. During startup, +nano will first read the system-wide settings, from +/etc/nanorc (the exact path might be different), and +then the user-specific settings, from ~/.nanorc.

OPTIONS @@ -71,150 +61,182 @@ user-specific settings from ~/.nanorc.

The configuration file accepts a series of set and unset commands, which can be used to configure nano -on startup without using the command line options. -Additionally, the syntax, color, and -icolor keywords are used to define syntax -highlighting rules for different text patterns. nano -will read one command per line.

+on startup without using command-line options. Additionally, +there are some commands to define syntax highlighting and to +rebind keys -- see the two separate sections on those. +nano reads one command per line.

Options in nanorc files take precedence over nano’s -defaults, and command line options override nanorc -settings. Also, options are unset by default, except for -those that take arguments.

- -

Quotes inside -string parameters don’t have to be escaped with -backslashes. The last double quote in the string will be -treated as its end. For example, for the brackets -option, ""’)>]}" will match -", ’, ), >, -], and }.

+defaults, and command-line options override nanorc +settings. Also, options that do not take an argument are +unset by default. So using the unset command is only +needed when wanting to override a setting of the +system’s nanorc file in your own +~/.nanorc. Options that take an argument cannot be +unset.

+ +

Below, the +string parameters need to be enclosed in double +quotes. Quotes inside these string parameters don’t +have to be escaped with backslashes. The last double quote +in the string will be treated as its end. For example, for +the brackets option, +""’)>]}" will match +", ’, ), >, +], and }.

The supported commands and arguments are:
-set/unset allow_insecure_backup

+set allow_insecure_backup

When backing up files, allow the backup to succeed even if its permissions can’t be (re)set due to special OS considerations. You should NOT enable this option unless you are sure you need it.

-

set/unset autoindent

+

set autoindent

Use auto-indentation.

-

set/unset backup

+

set backup

-

Create backup files in -filename~.

+

Create backup files by adding a +tilde (~) to each file’s name.

set backupdir directory

Set the directory where -nano puts unique backup files if file backups are +nano puts unique backup files, if file backups are enabled.

-

set/unset backwards

+

set backwards

Do backwards searches by default.

-

set/unset boldtext

+

set boldtext

-

Use bold text instead of -reverse video text.

+

Use bold instead of reverse +video for the titlebar, statusbar, key combos, and selected +text. This can be overridden for the first three by setting +the options titlecolor, statuscolor, and +keycolor.

set brackets string

Set the characters treated as -closing brackets when justifying paragraphs. They cannot -contain blank characters. Only closing punctuation, -optionally followed by closing brackets, can end sentences. -The default value is -""’)>]}".

+closing brackets when justifying paragraphs. This may not +include blank characters. Only closing punctuation (see +punct), optionally followed by the specified closing +brackets, can end sentences. The default value is +""’)>]}".

-

set/unset -casesensitive

+

set casesensitive

-

Do case sensitive searches by +

Do case-sensitive searches by default.

-

set/unset const

+

set const

Constantly display the cursor position in the status bar.

-

set/unset cut

+

set cut

-

Use cut to end of line by -default.

+

Use cut-to-end-of-line by +default, instead of cutting the whole line.

+ +

set fill +number

+ +

Hard-wrap lines at column +number number. If number is 0 or less, the +maximum line length will be the screen width less +number columns. The default value is +−8.

+ +

set functioncolor +fgcolor,bgcolor

+ +

Specify the color combination +to use for the function descriptions in the two help lines +at the bottom of the screen. See set titlecolor for +more details.

+ +

set historylog

-

set fill n

+

Enable the use of +~/.nano/search_history for saving and reading +search/replace strings.

-

Wrap lines at column number -n. If n is 0 or less, the maximum line length -will be the screen width less n columns. The default -value is −8.

+

set keycolor +fgcolor,bgcolor

-

set/unset historylog

+

Specify the color combination +to use for the shortcut key combos in the two help lines at +the bottom of the screen. See set titlecolor for more +details.

-

Enable ~/.nano_history -for saving and reading search/replace strings.

+

set locking

+ +

Enable vim-style lock-files for +when editing files.

set matchbrackets string

Set the opening and closing -brackets that can be found by bracket searches. They cannot -contain blank characters. The former set must come before -the latter set, and both must be in the same order. The -default value is "(<[{)>]}".

+brackets that can be found by bracket searches. This may not +include blank characters. The opening set must come before +the closing set, and the two sets must be in the same order. +The default value is "(<[{)>]}".

-

set/unset morespace

+

set morespace

Use the blank line below the titlebar as extra editing space.

-

set/unset mouse

+

set mouse

Enable mouse support, if available for your system. When enabled, mouse clicks can be used to place the cursor, set the mark (with a double click), and execute shortcuts. The mouse will work in the X -Window System, and on the console when gpm is running.

+Window System, and on the console when gpm is running. Text +can still be selected through dragging by holding down the +Shift key.

-

set/unset -multibuffer

+

set multibuffer

Allow inserting files into their own buffers.

-

set/unset noconvert

+

set noconvert

Don’t convert files from DOS/Mac format.

-

set/unset nofollow

+

set nofollow

Don’t follow symlinks when writing files.

-

set/unset nohelp

+

set nohelp

-

Don’t display the help -lists at the bottom of the screen.

+

Don’t display the two +help lines at the bottom of the screen.

-

set/unset nonewlines

+

set nonewlines

-

Don’t add newlines to the -ends of files.

+

Don’t automatically add a +newline to the ends of files.

-

set/unset nowrap

+

set nowrap

-

Don’t wrap text at +

Don’t hard-wrap text at all.

set operatingdir @@ -223,10 +245,15 @@ all.

nano will only read and write files inside directory and its subdirectories. Also, the current directory is changed to here, so files are -inserted from this diractory. By default, the operating +inserted from this directory. By default, the operating directory feature is turned off.

-

set/unset preserve

+

set poslog

+ +

Save the cursor position of +files between editing sessions.

+ +

set preserve

Preserve the XON and XOFF keys (^Q and ^S).

@@ -235,25 +262,26 @@ directory feature is turned off.

string

Set the characters treated as -closing punctuation when justifying paragraphs. They cannot -contain blank characters. Only closing punctuation, -optionally followed by closing brackets, can end sentences. -The default value is "!.?".

- -

set/unset quiet

- -

nano will not report -errors in the nanorc file and ask them to be -acknowledged by pressing enter at startup. If this is used -it should be placed at the top of the file to be fully -effective.

+closing punctuation when justifying paragraphs. This may not +include blank characters. Only the specfified closing +punctuation, optionally followed by closing brackets (see +brackets), can end sentences. The default value is +"!.?".

-

set/unset quickblank

+

set quickblank

Do quick statusbar blanking. Statusbar messages will disappear after 1 keystroke instead of 25.

+

set quiet

+ +

nano will not report +errors in the nanorc file nor ask them to be +acknowledged by pressing Enter at startup. If this is used, +it should be placed at the top of the file to be fully +effective.

+

set quotestr string

@@ -261,33 +289,31 @@ of 25.

justify email-quoted paragraphs. This is an extended regular expression if your system supports them, otherwise a literal string. The default value is -"^([ \t]*[#:>\|}])+" if you have -extended regular expression support, or -"> " otherwise. Note that +"^([ \t]*[#:>\|}])+" if you have +extended regular expression support, and +"> " otherwise. Note that ’\t’ stands for a literal Tab character.

-

set/unset -rebinddelete

+

set rebinddelete

Interpret the Delete key differently so that both Backspace and Delete work properly. You should only need to use this option if Backspace acts like Delete on your system.

-

set/unset -rebindkeypad

+

set rebindkeypad

Interpret the numeric keypad keys so that they all work properly. You should only need to use this option if they don’t, as mouse support won’t work properly with this option enabled.

-

set/unset regexp

+

set regexp

Do extended regular expression searches by default.

-

set/unset smarthome

+

set smarthome

Make the Home key smarter. When Home is pressed anywhere but at the very beginning of @@ -296,15 +322,15 @@ that beginning (either forwards or backwards). If the cursor is already at that position, it will jump to the true beginning of the line.

-

set/unset smooth

+

set smooth

Use smooth scrolling by default.

-

set/unset softwrap

+

set softwrap

Enable soft line wrapping for -easier viewing of very long lones.

+easier viewing of very long lines.

set speller spellprog

@@ -313,100 +339,161 @@ easier viewing of very long lones.

spellprog instead of the built-in one, which calls spell.

-

set/unset suspend

+

set statuscolor +fgcolor,bgcolor

+ +

Specify the color combination +to use for the statusbar. See set titlecolor for more +details.

+ +

set suspend

Allow nano to be suspended.

-

set tabsize n

+

set tabsize +number

-

Use a tab size of n -columns. The value of n must be greater than 0. The -default value is 8.

+

Use a tab size of number +columns. The value of number must be greater than 0. +The default value is 8.

-

set/unset -tabstospaces

+

set tabstospaces

Convert typed tabs to spaces.

-

set/unset tempfile

+

set tempfile

Save automatically on exit, don’t prompt.

-

set/unset undo

+

set titlecolor +fgcolor,bgcolor

-

Enable experimental -generic-purpose undo code.

+

Specify the color combination +to use for the titlebar. Valid color names for foreground +and background are: +white, black, red, blue, green, yellow, magenta, +and cyan. And either "fgcolor" or +",bgcolor" may be left out.

-

set/unset view

+

set view

Disallow file modification.

-

set/unset softwrap

- -

Enable soft line wrapping for -easier viewing of very long lones.

-

set whitespace string

Set the two characters used to -display the first characters of tabs and spaces. They must -be single-column characters.

+indicate the presence of tabs and spaces. They must be +single-column characters.

-

set/unset wordbounds

+

set wordbounds

Detect word boundaries more accurately by treating punctuation characters as parts of words.

-

syntax str -["fileregex" ... ]

+

SYNTAX HIGHLIGHTING + +

-

Defines a syntax named -str which can be activated via the -−Y/−−syntax command line option, or will -be automatically activated if the current filename matches -the extended regular expression fileregex. All -following color and icolor statements will -apply to syntax until a new syntax is defined.

-

The none +

Coloring the +different syntactic elements of a file is done via regular +expressions (see the color command below). This is +inherently imperfect, because regular expressions are not +powerful enough to fully parse a file. Nevertheless, regular +expressions can do a lot and are easy to make, so they are a +good fit for a small editor like nano.

+ +

A separate +syntax can be defined for each kind of file via the +following commands:
+syntax "str" +["fileregex" ...]

+ +

Defines a syntax named +str which can be activated via the +−Y/−−syntax command-line +option, or will be automatically activated if the current +filename matches the extended regular expression +fileregex. All following color and +icolor statements will apply to this str +syntax until a new syntax is defined.

+ +

The none syntax is reserved; specifying it on the command line is the -same as not having a syntax at all. The default +same as not having a syntax at all. The default syntax is special: it takes no fileregex, and applies to files that don’t match any other syntax’s fileregex.

+

linter program +[arg ...]

+ +

For the currently defined +syntax, use the given program to invoke the linter +(this overrides the speller function when defined).

+ +

formatter program +[arg ...]

+ +

For the currently defined +syntax, use the given program to automatically +reformat text. Useful in certain programming languages (e.g. +go).

+ +

header regex +...

+ +

For the currently defined +syntax, add one or more regexes which will be compared +against the very first line of the file to be edited, to +determine whether this syntax should be used for that +file.

+ +

magic regex +...

+ +

For the currently defined +syntax, add one or more regexes which will be compared +against the result of querying the magic database +about the file to be edited, to determine whether this +syntax should be used for that file. This functionality only +works when libmagic is installed on the system and +will be silently ignored otherwise.

+

color -fgcolor,bgcolor regex ...

+fgcolor,bgcolor "regex" +...

-

For the currently defined +

For the currently defined syntax, display all expressions matching the extended regular expression regex with foreground color fgcolor and background color bgcolor, at least -one of which must be specified. Legal colors for foreground -and background color are: white, black, red, blue, green, -yellow, magenta, and cyan. You may use the prefix -"bright" to force a stronger color highlight for -the foreground. If your terminal supports transparency, not -specifying a bgcolor tells nano to attempt to -use a transparent background.

+one of which must be specified. Valid colors for foreground +and background are: white, black, red, blue, green, yellow, +magenta, and cyan. You may use the prefix "bright" +to get a stronger color highlight for the foreground. If +your terminal supports transparency, not specifying a +bgcolor tells nano to attempt to use a +transparent background.

icolor -fgcolor,bgcolor regex ...

+fgcolor,bgcolor "regex" +...

-

Same as above, except that the +

Same as above, except that the expression matching is case insensitive.

color -fgcolor,bgcolor -start="sr" -end="er"

+fgcolor,bgcolor +start="sr" +end="er"

-

Display expressions which start +

Display expressions which start with the extended regular expression sr and end with the extended regular expression er with foreground color fgcolor and background color bgcolor, at @@ -417,23 +504,34 @@ is found will be highlighted until the first instance of er.

icolor -fgcolor,bgcolor -start="sr" -end="er"

+fgcolor,bgcolor +start="sr" +end="er"

-

Same as above, except that the +

Same as above, except that the expression matching is case insensitive.

include -syntaxfile

+"syntaxfile"

-

Read in self-contained color +

Read in self-contained color syntaxes from syntaxfile. Note that syntaxfile -can only contain syntax, color, and -icolor commands.

- -

KEY BINDINGS - +can only contain the above commands, from syntax to +icolor.

+ +

extendsyntax str +directive [arg ...]

+ +

Extend the syntax previously +defined as str to include new information. This +allows you to add a new color, icolor, +magic, header, or linter directive to +an already defined syntax -- useful when you want to add to +definitions from the system-installed syntax definitions +(which are normally not writable).

+ +

REBINDING KEYS +

@@ -443,481 +541,568 @@ bind key function menu

Rebinds the key key to a new function named function in the context of menu -menu. The format of key should be one of:

+menu (or in all menus where the function exists by +using all).

+ +

unbind key +menu

+ +

Unbinds the key key from +the menu named menu (or from all menus where it +exists by using all).

+ +

The format of key should +be one of:

- + - - + - + - - + - + - - +

^

 +

followed by an alpha character or the word "Space". Example: ^C

M-

 +

followed by a printable character or the word "Space". Example: M-C

F

 +

followed by a numeric value from 1 to 16. Example: F10

-

Valid function names to be -bound include:
-help

- -

Invoke the help menu.

+

Valid function names to +be bound include:

-

cancel

+

help

-

Cancel the current command.

+

Invokes the help viewer.

-

exit

+

cancel

-

Exit from the program.

+

Cancels the current +command.

-

writeout

+

exit

-

Write the current buffer to -disk.

+

Exits from the program (or from +the help viewer or the file browser).

-

justify

+

writeout

-

Justify the current text.

+

Writes the current buffer to +disk.

-

insert

+

insert

-

Insert a file into the current +

Inserts a file into the current buffer (or into a new buffer when multibuffer is enabled).

-

whereis

+

whereis

-

Search for text in the current -buffer.

+

Searches for text in the +current buffer -- or for filenames matching a string in the +current list in the file browser.

-

searchagain

+

searchagain

-

Repeat the last search +

Repeats the last search command.

- - - - - - - -
+

replace

+

Interactively replaces text +within the current buffer.

-

up

 +

cut

+

Cuts and stores the current +line (or the marked region).

-

Move up in the editor or browser.

 -
+

copytext

-

down

+

Copies the current line (or the +marked region) without deleting it.

-

Move down in the editor or -browser.

+

uncut

-

left

+

Copies the currently stored +text into the current buffer at the current cursor +position.

-

Move left in the editor or -browser.

+

mark

-

right

+

Sets the mark at the current +position, to start selecting text.

-

Move right in the editor or -browser.

+

cutrestoffile

-

cut

+

Cuts all text from the cursor +position till the end of the buffer.

-

Cut the current line of text -and store it.

+

curpos

-

uncut

+

Shows the current cursor +position: the line, column, and character positions.

-

Copy the currently stored text -into the current buffer position.

+

wordcount

-

curpos

+

Counts the number of words, +lines and characters in the current buffer.

-

Show the current line, column, -word positions in the file.

+

speller

-

firstline

+

Invokes a spell-checking +program (or a linting program, if the current syntax +highlighting defines one).

-

Move to the first line of the -file.

+

justify

-

lastline

+

Justifies the current +paragraph.

-

Move to the last line of the -file.

+

fulljustify

-

gotoline

+

Justifies the entire current +buffer.

-

Move to a specific line (and -column if specified).

+

indent

-

replace

+

Indents (shifts to the right) +the currently marked text.

-

Interactively replace text -within the current buffer.

+

unindent

+ +

Unindents (shifts to the left) +the currently marked text.

+ +

left

-

mark

+

Goes left one position (in the +editor or browser).

-

Begin selecting text for -cutting or pasting at the current position.

+

right

-

copytext

+

Goes right one position (in the +editor or browser).

-

Copy the currently marked text -without deleting it.

+

up

-

indent

+

Goes one line up (in the editor +or browser).

-

Indent the currently marked -text (shift to the right).

+

down

-

unindent

+

Goes one line down (in the +editor or browser).

-

Un-indent the currently marked -text (shift to the left).

+

scrollup

-

nextword

+

Scrolls up one line of text +from the current position.

+ +

scrolldown

+ +

Scrolls down one line of text +from the current position.

-

Move the cursor to the +

nextword

+ +

Moves the cursor to the beginning of the next word.

-

prevword

+

prevword

-

Move the cursor to the +

Moves the cursor to the beginning of the previous word.

-

home

+

home

-

Move the cursor to the +

Moves the cursor to the beginning of the current line.

-

end

+

end

-

Move the cursor to the end of +

Moves the cursor to the end of the current line.

-

beginpara

+

beginpara

-

Move the cursor to the +

Moves the cursor to the beginning of the current paragraph.

-

endpara

+

endpara

-

Move the cursor to the end of +

Moves the cursor to the end of the current paragraph.

-

findbracket

+

prevpage

-

Move the cursor to the matching -bracket (brace, parenthesis, etc.) of the one under the -cursor.

+

Goes up one screenful.

-

scrollup

+

nextpage

-

Scroll up one line of text from -the current position.

+

Goes down one screenful.

-

scrolldown

+

firstline

-

Scroll down one line of text -from the current position.

+

Goes to the first line of the +file.

+ +

lastline

+ +

Goes to the last line of the +file.

-

prevbuf

+

gotoline

-

Switch to editing/viewing the +

Goes to a specific line (and +column if specified).

+ +

gototext

+ +

Switches from targeting a line +number to searching for text.

+ +

findbracket

+ +

Moves the cursor to the bracket +(brace, parenthesis, etc.) that matches (pairs) with the one +under the cursor.

+ +

prevbuf

+ +

Switches to editing/viewing the previous buffer when using multibuffer mode.

-

nextbuf

+

nextbuf

-

Switch to editing/viewing the +

Switches to editing/viewing the next buffer when using multibuffer mode.

-

verbatim

+

verbatim

-

Insert the next character +

Inserts the next character verbatim into the file.

-

tab

+

tab

-

Insert a tab at the current +

Inserts a tab at the current cursor location.

-

enter

+

enter

-

Insert a new line below the +

Inserts a new line below the current one.

-

delete

+

delete

-

Delete the character under the +

Deletes the character under the cursor.

-

fulljustify

+

backspace

-

Justify the entire current -file.

+

Deletes the character before +the cursor.

-

wordcount

+

undo

-

Count the number of words in -the current buffer.

+

Undoes the last performed text +action (add text, delete text, etc).

-

refresh

+

redo

-

Refresh the screen.

+

Redoes the last undone action +(i.e., it undoes an undo).

-

undo

+

refresh

-

Undo the text action peformed -(add text, delete text, etc).

+

Refreshes the screen.

-

redo

+

suspend

-

Redo the last undone action -(i.e., undo an undo).

- -

suspend

- -

Suspend the editor (if the -suspend function is enabled, see the +

Suspends the editor (if the +suspending function is enabled, see the "suspendenable" entry below).

-

casesens

+

casesens

-

Toggle case sensitivity in +

Toggles case sensitivity in searching (search/replace menus only).

-

regexp

+

regexp

-

Toggle whether +

Toggles whether searching/replacing is based on literal strings or regular expressions.

-

prevhistory

+

backwards

+ +

Toggles whether +searching/replacing goes forward or backward.

+ +

prevhistory

-

Show the previous history entry -in the prompt menus (e.g. search).

+

Shows the previous history +entry in the prompt menus (e.g. search).

-

nexthistory

+

nexthistory

-

Show the next history entry in +

Shows the next history entry in the prompt menus (e.g. search).

-

dontreplace

+

flipreplace

+ +

Toggles between searching for +something and replacing something.

+ +

flipexecute

+ +

Toggles between inserting a +file and executing a command.

-

Switch back to searching -instead of replacing.

+

flipnewbuffer

-

gototext

+

Toggles between inserting into +the current buffer and into a new empty buffer.

-

Search for files matching a -string in the file browser (reading or writing files).

+

tofiles

-

dosformat

+

Starts the file browser, +allowing to select a file from a list.

-

When writing a file, switch to -writing a DOS format (CR/LF).

+

gotodir

-

macformat

+

Goes to a directory to be +specified, allowing to browse anywhere in the +filesystem.

-

When writing a file, switch to -writing a Mac format.

+

dosformat

-

append

+

When writing a file, switches +to writing a DOS format (CR/LF).

-

When writing a file, append to +

macformat

+ +

When writing a file, switches +to writing a Mac format.

+ +

append

+ +

When writing a file, appends to the end instead of overwriting.

-

prepend

+

prepend

-

When writing a file, -’prepend’ (write at the beginning) instead of +

When writing a file, +’prepends’ (writes at the beginning) instead of overwriting.

-

backup

+

backup

-

When writing a file, create a +

When writing a file, creates a backup of the current file.

-

firstfile

+

firstfile

-

Move to the first file when +

Goes to the first file when using the file browser (reading or writing files).

-

lastfile

+

lastfile

-

Move to the last file when +

Goes to the last file when using the file browser (reading or writing files).

-

nohelp

+

nohelp

-

Toggle showing/hiding the +

Toggles the presence of the two-line list of key bindings at the bottom of the screen.

-

constupdate

+

constupdate

+ +

Toggles the constant display of +the current line, column, and character positions.

-

Constantly display the current -line, column, word positions.

+

morespace

-

morespace

+

Toggles the presence of the +blank line which ’separates’ the titlebar from +the file text.

-

Toggle showing/hiding the blank -line which ’separates’ the ’title’ -from the file text.

+

smoothscroll

-

smoothscroll

+

Toggles smooth scrolling (when +moving around with the arrow keys).

-

Toggle smooth scrolling when -moving via the arrow keys.

+

softwrap

-

whitespacedisplay

+

Toggles the displaying of +overlong lines on multiple screen lines.

-

Toggle whether whitespace is -shown.

+

whitespacedisplay

-

smarthome

+

Toggles the showing of +whitespace.

-

Toggle whether the smart home -key function is enabled.

+

nosyntax

-

autoindent

+

Toggles syntax +highlighting.

-

Toggle whether new lines will -contain the same amount of whitespace as the line above.

+

smarthome

-

cuttoend

+

Toggles the smartness of the +Home key.

-

Toggle whether cutting text +

autoindent

+ +

Toggles whether new lines will +contain the same amount of whitespace as the preceding +line.

+ +

cuttoend

+ +

Toggles whether cutting text will cut the whole line or just from the current cursor position to the end of the line.

-

nowrap

+

nowrap

+ +

Toggles whether long lines will +be hard-wrapped to the next line.

+ +

tabstospaces

+ +

Toggles whether typed tabs will +be converted to spaces.

+ +

backupfile

+ +

Toggles whether a backup will +be made of the file to be edited.

+ +

multibuffer

+ +

Toggles the use of multiple +file buffers (if support for them has been compiled in).

+ +

mouse

-

Toggle whether long lines will -be wrapped to the next line.

+

Toggles mouse support.

-

suspendenable

+

noconvert

-

Toggle whether the suspend +

Toggles automatic conversion of +files from DOS/Mac format.

+ +

suspendenable

+ +

Toggles whether the suspend sequence (normally ^Z) will suspend the editor window.

-

Valid menu -sections are:
-main

+

Valid menu sections +are:

-

The main editor window where -text is entered.

+

main

-

search

+

The main editor window where +text is entered and edited.

-

The search menu (AKA +

search

+ +

The search menu (AKA whereis).

-

replace

+

replace

-

The ’search to +

The ’search to replace’ menu.

-

replacewith

+

replacewith

-

The ’replace with’ +

The ’replace with’ menu, which comes up after ’search to replace’.

-

gotoline

+

gotoline

-

The ’goto line (and +

The ’goto line (and column)’ menu.

-

writeout

+

writeout

-

The ’write file’ +

The ’write file’ menu.

-

insert

+

insert

-

The ’insert file’ +

The ’insert file’ menu.

-

extcmd

+

extcmd

-

The menu for inserting output -from an external comman, reached from the insert menu.

+

The menu for inserting output +from an external command, reached from the insert menu.

-

help

+

help

-

The help menu.

+

The help-viewer menu.

-

spell

+

spell

-

The interactive spell checker +

The interactive spell checker Yes/no menu.

-

browser

+

linter

+ +

The linter menu.

-

The file browser for inserting +

browser

+ +

The file browser for inserting or writing a file.

-

whereisfile

+

whereisfile

-

The ’search for a +

The ’search for a file’ menu in the file browser.

-

gotodir

- -

The ’go to -directory’ menu.

+

gotodir

-

all

+

The ’go to +directory’ menu in the file browser.

-

A special name meaning: apply -to all menus where this function exists.

+

all

-

unbind key -menu

- -

Unbind the key key from -the menu named menu or from all menus by using -all. Same key syntax as for binding. Rebinds the key -key to a new function named function in the -context of menu menu. The format of key should -be one of:

+

A special name that encompasses +all menus. For bind it means all menus where the +specified function exists; for unbind it means +all menus where the specified key exists.

FILES @@ -925,35 +1110,39 @@ be one of:

-

SYSCONFDIR/nanorc

+

/etc/nanorc

System-wide configuration -file

+file.

-

~/.nanorc

+

~/.nanorc

-

Per-user configuration file

+

Per-user configuration +file.

SEE ALSO

-

nano(1) -
-/usr/share/doc/nano/examples/nanorc.sample (or -equivalent on your system)

+ +

nano(1)

+ + +

/usr/share/doc/nano/examples/nanorc.sample +(or equivalent on your system)

AUTHOR

-

Chris Allegretta -<chrisa@asty.org>, et al (see AUTHORS and -THANKS for details). This manual page was originally -written by Jordi Mallach <jordi@gnu.org>, for the -Debian system (but may be used by others).

+

Chris +Allegretta <chrisa@asty.org>, et al (see +AUTHORS and THANKS for details). This manual +page was originally written by Jordi Mallach +<jordi@gnu.org>, for the Debian system (but may be +used by others).

diff --git a/doc/man/rnano.1 b/doc/man/rnano.1 index 6b8a9b8..24851b2 100644 --- a/doc/man/rnano.1 +++ b/doc/man/rnano.1 @@ -1,7 +1,7 @@ .\" Hey, EMACS: -*- nroff -*- -.\" Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. -.\" Skeleton based on nano-tiny.1: -.\" Copyright (C) 2002 Free Software Foundation, Inc. +.\" $Id: rnano.1 5135 2015-03-08 15:59:15Z bens $ +.\" +.\" Copyright (C) 2002, 2005, 2006, 2007, 2014 Free Software Foundation, Inc. .\" .\" This document is dual-licensed. You may distribute and/or modify it .\" under the terms of either of the following licenses: @@ -19,8 +19,7 @@ .\" Documentation License along with this program. If not, see .\" . .\" -.\" $Id: rnano.1 4188 2007-12-08 04:27:44Z dolorous $ -.TH RNANO 1 "version 2.0.0" "August 23, 2007" +.TH RNANO 1 "version 2.4.0" "March 2015" .\" Please adjust this date whenever revising the manpage. .\" .SH NAME @@ -29,18 +28,12 @@ Pico clone .SH SYNOPSIS .B rnano -.I [OPTIONS]\ [[\+LINE,COLUMN]\ FILE]... -.br +.RI [ options "] [[+" line , column "]\ " file "]..." .SH DESCRIPTION -This manual page briefly documents the \fBrnano\fP command. -.PP -.\" TeX users may be more comfortable with the \fB\fP and -.\" \fI\fP escape sequences to invoke bold face and italics, -.\" respectively. \fBnano\fP is a small, free and friendly editor which aims to replace -Pico, the default editor included in the non-free Pine package. Rather -than just copying Pico's look and feel, \fBnano\fP also implements some +Pico, the default editor included in the non-free Pine package. On +top of copying Pico's look and feel, \fBnano\fP also implements some missing (or disabled by default) features in Pico, such as "search and replace" and "go to line and column number". .PP @@ -48,7 +41,7 @@ replace" and "go to line and column number". specific files and doesn't allow the user access to the filesystem or a command shell. .PP -In restricted mode, \fBnano\fP will \fInot\fP: +In restricted mode, \fBnano\fP will \fInot\/\fP: .IP \[bu] 2 read or write to any file not specified on the command line; .IP \[bu] @@ -63,22 +56,13 @@ use backup files or spell checking. .SH OPTIONS .TP -.B \+\fILINE\fP,\fICOLUMN\fP -Places cursor at line number \fILINE\fP and column number \fICOLUMN\fP -(at least one of which must be specified) on startup, instead of the -default of line 1, column 1. -.TP -.B \-? -Same as \fB-h (\-\-help)\fP. -.TP -.B \-h (\-\-help) -Show a summary of command line options and exit. +.BR \-h ", " \-\-help +Show a summary of command-line options and exit. .TP -.B \-V (\-\-version) +.BR \-V ", " \-\-version Show the current version number and exit. .PP -See the \fBnano\fP(1) manpage for the complete documentation of -\fBnano\fP. +See the \fBnano\fP(1) manpage for all of the possible options. .SH BUGS Please send any comments or bug reports to \fBnano@nano-editor.org\fP. @@ -92,7 +76,7 @@ of "subscribe". http://www.nano-editor.org/ .SH AUTHOR -Chris Allegretta , et al (see AUTHORS for details). +Chris Allegretta , et al (see the file AUTHORS for details). This manual page was originally written by Thijs Kinkhorst , for the Debian system (but may be used by others). diff --git a/doc/man/rnano.1.html b/doc/man/rnano.1.html index 5fc5991..0dd2db0 100644 --- a/doc/man/rnano.1.html +++ b/doc/man/rnano.1.html @@ -1,5 +1,5 @@ - - + + @@ -46,22 +46,20 @@ free Pico clone

rnano -[OPTIONS] [[+LINE,COLUMN] FILE]...

+[options] +[[+line,column] file]...

DESCRIPTION

-

This manual -page briefly documents the rnano command.

-

nano is a small, free and friendly editor which aims to replace Pico, the default editor included in the non-free Pine -package. Rather than just copying Pico’s look and -feel, nano also implements some missing (or disabled -by default) features in Pico, such as "search and +package. On top of copying Pico’s look and feel, +nano also implements some missing (or disabled by +default) features in Pico, such as "search and replace" and "go to line and column number".

@@ -140,45 +138,20 @@ under a different name;

-

+LINE,COLUMN

- -

Places cursor at line number -LINE and column number COLUMN (at least one of -which must be specified) on startup, instead of the default -of line 1, column 1.

- - - - - - - - -
- - -

−?

 - - -

Same as -h (−−help).

 -
- -

−h -(−−help)

+

−h, +−−help

-

Show a summary of command line +

Show a summary of command-line options and exit.

-

−V -(−−version)

+

−V, +−−version

Show the current version number and exit.

See the -nano(1) manpage for the complete documentation of -nano.

+nano(1) manpage for all of the possible options.

BUGS @@ -210,10 +183,10 @@ email to nano-devel-request@gnu.org with a subject of

Chris -Allegretta <chrisa@asty.org>, et al (see AUTHORS for -details). This manual page was originally written by Thijs -Kinkhorst <thijs@kinkhorst.com>, for the Debian system -(but may be used by others).

+Allegretta <chrisa@asty.org>, et al (see the file +AUTHORS for details). This manual page was originally +written by Thijs Kinkhorst <thijs@kinkhorst.com>, for +the Debian system (but may be used by others).

diff --git a/doc/nanorc.sample.in b/doc/nanorc.sample.in index f164c26..911f2b9 100644 --- a/doc/nanorc.sample.in +++ b/doc/nanorc.sample.in @@ -5,7 +5,7 @@ ## DOS or Mac format, and that characters specially interpreted by the ## shell should not be escaped here. ## -## To make sure a value is disabled, use "unset