----------------------------------------------------------------------------- MANIFEST | 243 - Makefile | 47 aclocal.m4 | 697 ++- config.guess | 252 - config.sub | 137 configure | 5752 ++++++++++++++++++----------- configure.in | 217 - doc/CHANGES | 232 + doc/INSTALL | 77 doc/TODO | 173 doc/WHATSNEW | 7 doc/config-anomalies | 1 doc/keymap.sample | 2 doc/l10n/de.add | 2 doc/l10n/de.po | 8973 ++++++++++++++++++++++++--------------------- doc/l10n/de/tin.1 | 944 ++-- doc/l10n/de/tin.5 | 472 +- doc/l10n/en_GB.po | 9271 +++++++++++++++++++++++++---------------------- doc/l10n/en_GB/tin.1 | 620 ++- doc/l10n/en_GB/tin.5 | 400 +- doc/l10n/po4a.conf | 17 doc/l10n/tin-man.pot | 8245 ++++++++++++++++++++++------------------- doc/mbox.5 | 50 doc/mmdf.5 | 48 doc/opt-case.1 | 2 doc/rcvars.txt | 15 doc/tin.1 | 589 ++ doc/tin.5 | 411 +- doc/tin.defaults | 7 doc/tinews.1 | 194 doc/url_handler.1 | 80 doc/w2r.1 | 274 - include/autoconf.hin | 52 include/bool.h | 6 include/bugrep.h | 2 include/debug.h | 2 include/extern.h | 62 include/keymap.h | 2 include/newsrc.h | 2 include/nntplib.h | 12 include/policy.h | 68 include/proto.h | 56 include/rfc2046.h | 4 include/stpwatch.h | 2 include/tcurses.h | 2 include/tin.h | 270 - include/tinrc.h | 41 include/tnntp.h | 2 include/trace.h | 2 include/version.h | 14 libcanlock/Makefile.in | 6 pcre/Makefile.in | 4 pcre/config.h | 4 po/da.gmo |binary po/da.po | 4051 ++++++++++---------- po/de.gmo |binary po/de.po | 4802 ++++++++++++------------ po/en_GB.gmo |binary po/en_GB.po | 3232 ++++++++-------- po/et.gmo |binary po/et.po | 5378 +++++++++++++-------------- po/fr.gmo |binary po/fr.po | 5525 ++++++++++++++-------------- po/ru.gmo |binary po/ru.po | 3287 ++++++++-------- po/sv.gmo |binary po/sv.po | 3228 ++++++++-------- po/tin.pot | 3215 ++++++++-------- po/tr.gmo |binary po/tr.po | 3301 ++++++++-------- po/zh_TW.gmo |binary po/zh_TW.po | 8091 +++++++++++++++++++++++++++++++++++++++++ po4a.conf | 15 src/Makefile.in | 30 src/active.c | 133 src/art.c | 408 +- src/attrib.c | 97 src/auth.c | 87 src/charset.c | 9 src/color.c | 4 src/config.c | 128 src/cook.c | 11 src/curses.c | 20 src/debug.c | 66 src/envarg.c | 2 src/feed.c | 14 src/filter.c | 48 src/getline.c | 3 src/global.c | 2 src/group.c | 418 -- src/hashstr.c | 2 src/header.c | 16 src/heapsort.c | 188 src/help.c | 11 src/inews.c | 39 src/init.c | 64 src/joinpath.c | 2 src/keymap.c | 12 src/lang.c | 236 - src/list.c | 2 src/lock.c | 14 src/mail.c | 73 src/main.c | 33 src/makecfg.c | 28 src/memory.c | 34 src/mimetypes.c | 2 src/misc.c | 384 + src/my_tmpfile.c | 30 src/newsrc.c | 147 src/nntplib.c | 65 src/nrctbl.c | 2 src/options_menu.c | 280 + src/page.c | 27 src/pgp.c | 40 src/post.c | 309 - src/prompt.c | 14 src/read.c | 5 src/refs.c | 11 src/regex.c | 4 src/rfc1524.c | 17 src/rfc2045.c | 2 src/rfc2046.c | 16 src/rfc2047.c | 8 src/save.c | 31 src/screen.c | 86 src/search.c | 12 src/select.c | 340 - src/sigfile.c | 46 src/signal.c | 12 src/strftime.c | 2 src/string.c | 509 ++ src/tags.c | 2 src/tcurses.c | 8 src/thread.c | 343 - src/tincfg.tbl | 213 - src/trace.c | 2 src/version.c | 16 src/wildmat.c | 4 src/xface.c | 23 src/xref.c | 42 tin.spec | 2 tools/opt-case.pl | 12 tools/tinews.pl | 135 tools/tinlock | 2 tools/url_handler.pl | 17 145 files changed, 52415 insertions(+), 36232 deletions(-) ----------------------------------------------------------------------------- diff -Nurp '--exclude=.bzr*' tin-2.0.1/MANIFEST tin-2.2.0/MANIFEST --- tin-2.0.1/MANIFEST 2011-12-24 15:54:35.000000000 +0100 +++ tin-2.2.0/MANIFEST 2013-12-24 00:33:38.596632586 +0100 @@ -1,163 +1,165 @@ -MANIFEST for tin-2.0.1 (Sat Dec 24 15:54:34 CET 2011) +MANIFEST for tin-2.2.0 (Tue Dec 24 00:33:37 CET 2013) ---------------------------------------------------- - 14066 ./Makefile - 8059 ./MANIFEST + 14465 ./Makefile + 8123 ./MANIFEST 1441 ./README 745 ./README.MAC 976 ./README.WIN - 178280 ./aclocal.m4 + 188211 ./aclocal.m4 882 ./conf-tin - 45149 ./config.guess - 35431 ./config.sub - 636841 ./configure - 31970 ./configure.in + 46433 ./config.guess + 35595 ./config.sub + 675241 ./configure + 35887 ./configure.in 7123 ./install-sh + 318 ./po4a.conf 1488 ./tin.spec 18847 ./doc/ABOUT-NLS - 1051 ./doc/CHANGES + 11015 ./doc/CHANGES 278101 ./doc/CHANGES.old 5041 ./doc/CREDITS 1305 ./doc/DEBUG_REFS - 30405 ./doc/INSTALL - 40816 ./doc/TODO - 120 ./doc/WHATSNEW + 30994 ./doc/INSTALL + 44012 ./doc/TODO + 529 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1701 ./doc/article.txt 4373 ./doc/auth.txt - 3859 ./doc/config-anomalies + 3828 ./doc/config-anomalies 11269 ./doc/filtering 35305 ./doc/good-netkeeping-seal 3803 ./doc/internals.txt 23621 ./doc/iso2asc.txt - 3904 ./doc/keymap.sample + 3888 ./doc/keymap.sample 633 ./doc/mailcap.sample - 5870 ./doc/mbox.5 + 5922 ./doc/mbox.5 3365 ./doc/mime.types - 4168 ./doc/mmdf.5 + 4221 ./doc/mmdf.5 2128 ./doc/newsoverview.5 1541 ./doc/nov_tests 5155 ./doc/opt-case.1 6964 ./doc/plp_snprintf.3 3964 ./doc/pgp.txt - 2817 ./doc/rcvars.txt + 2987 ./doc/rcvars.txt 1525 ./doc/reading-mail.txt 4947 ./doc/umlaute.txt 4246 ./doc/umlauts.txt - 6723 ./doc/url_handler.1 - 128362 ./doc/tin.1 - 78325 ./doc/tin.5 - 4952 ./doc/tin.defaults - 13099 ./doc/tinews.1 + 6957 ./doc/url_handler.1 + 135963 ./doc/tin.1 + 80533 ./doc/tin.5 + 5065 ./doc/tin.defaults + 15470 ./doc/tinews.1 2418 ./doc/tools.txt - 4733 ./doc/w2r.1 + 4345 ./doc/w2r.1 2196 ./doc/wildmat.3 344 ./tools/expiretover 3815 ./tools/metamutt - 2788 ./tools/opt-case.pl - 1410 ./tools/tinlock - 32699 ./tools/tinews.pl - 3643 ./tools/url_handler.pl + 2789 ./tools/opt-case.pl + 1413 ./tools/tinlock + 35625 ./tools/tinews.pl + 3786 ./tools/url_handler.pl 1657 ./tools/url_handler.sh 3347 ./tools/w2r.pl 1661 ./tools/expand_aliases.tgz - 2586 ./include/bool.h + 2595 ./include/bool.h 1947 ./include/bugrep.h 2210 ./include/debug.h - 66643 ./include/extern.h + 67655 ./include/extern.h 14068 ./include/keymap.h 6333 ./include/newsrc.h - 8685 ./include/nntplib.h + 8430 ./include/nntplib.h 664 ./include/plp_snprintf.h - 14528 ./include/policy.h - 32319 ./include/proto.h - 5374 ./include/rfc2046.h + 15364 ./include/policy.h + 32954 ./include/proto.h + 5319 ./include/rfc2046.h 3377 ./include/stpwatch.h 5898 ./include/tcurses.h - 68484 ./include/tin.h - 16390 ./include/tinrc.h + 71814 ./include/tin.h + 17000 ./include/tinrc.h 4346 ./include/tnntp.h 2264 ./include/trace.h - 2352 ./include/version.h - 34225 ./src/active.c - 71178 ./src/art.c - 75000 ./src/attrib.c - 14980 ./src/auth.c - 12555 ./src/charset.c - 8551 ./src/color.c - 62398 ./src/config.c - 27541 ./src/cook.c - 27152 ./src/curses.c - 9917 ./src/debug.c + 2353 ./include/version.h + 35173 ./src/active.c + 75131 ./src/art.c + 76443 ./src/attrib.c + 16369 ./src/auth.c + 12933 ./src/charset.c + 8552 ./src/color.c + 64395 ./src/config.c + 27458 ./src/cook.c + 27368 ./src/curses.c + 10854 ./src/debug.c 3408 ./src/envarg.c - 30327 ./src/feed.c - 56135 ./src/filter.c - 18126 ./src/getline.c + 30318 ./src/feed.c + 56610 ./src/filter.c + 18148 ./src/getline.c 9070 ./src/global.c - 47049 ./src/group.c + 44948 ./src/group.c 3900 ./src/hashstr.c - 8215 ./src/header.c - 43731 ./src/help.c - 14005 ./src/inews.c - 37255 ./src/init.c + 8263 ./src/header.c + 6253 ./src/heapsort.c + 43745 ./src/help.c + 13942 ./src/inews.c + 37819 ./src/init.c 2435 ./src/joinpath.c - 101520 ./src/keymap.c - 133769 ./src/lang.c + 101560 ./src/keymap.c + 136665 ./src/lang.c 4486 ./src/langinfo.c 7728 ./src/list.c - 6673 ./src/lock.c - 16611 ./src/mail.c - 25458 ./src/main.c - 10879 ./src/makecfg.c - 13232 ./src/memory.c + 6664 ./src/lock.c + 16987 ./src/mail.c + 25937 ./src/main.c + 10715 ./src/makecfg.c + 13601 ./src/memory.c 5283 ./src/mimetypes.c - 91686 ./src/misc.c - 38541 ./src/newsrc.c - 53403 ./src/nntplib.c + 94744 ./src/misc.c + 39445 ./src/newsrc.c + 53544 ./src/nntplib.c 7502 ./src/nrctbl.c - 99267 ./src/options_menu.c - 65812 ./src/page.c + 103533 ./src/options_menu.c + 65961 ./src/page.c 24138 ./src/parsdate.y 17057 ./src/plp_snprintf.c - 13003 ./src/pgp.c - 150469 ./src/post.c - 18837 ./src/prompt.c - 10384 ./src/read.c - 27319 ./src/refs.c + 13212 ./src/pgp.c + 151692 ./src/post.c + 18904 ./src/prompt.c + 10408 ./src/read.c + 27387 ./src/refs.c 5481 ./src/regex.c - 14483 ./src/rfc1524.c + 14526 ./src/rfc1524.c 15069 ./src/rfc2045.c - 32043 ./src/rfc2046.c - 36199 ./src/rfc2047.c - 57186 ./src/save.c - 11233 ./src/screen.c - 18173 ./src/search.c - 32757 ./src/select.c - 7805 ./src/sigfile.c - 14154 ./src/signal.c + 32087 ./src/rfc2046.c + 36225 ./src/rfc2047.c + 57027 ./src/save.c + 12530 ./src/screen.c + 18246 ./src/search.c + 33394 ./src/select.c + 7749 ./src/sigfile.c + 14366 ./src/signal.c 7215 ./src/strftime.c - 27448 ./src/string.c + 37546 ./src/string.c 13345 ./src/tags.c - 17436 ./src/tcurses.c + 17487 ./src/tcurses.c 3070 ./src/tmpfile.c - 3706 ./src/my_tmpfile.c - 41352 ./src/thread.c + 3423 ./src/my_tmpfile.c + 41325 ./src/thread.c 2472 ./src/trace.c - 4315 ./src/version.c + 4430 ./src/version.c 5453 ./src/wildmat.c - 7335 ./src/xface.c - 12499 ./src/xref.c + 7647 ./src/xface.c + 12747 ./src/xref.c 422 ./pcre/AUTHORS 2515 ./pcre/COPYING 118928 ./pcre/ChangeLog 8049 ./pcre/INSTALL 2515 ./pcre/LICENCE - 3118 ./pcre/Makefile.in + 3172 ./pcre/Makefile.in 26802 ./pcre/Makefile.in-old 12409 ./pcre/NEWS 11121 ./pcre/NON-UNIX-USE 24136 ./pcre/README 6161 ./pcre/RunTest.in - 225 ./pcre/config.h + 278 ./pcre/config.h 8703 ./pcre/configure.in 395 ./pcre/version.sh 6369 ./pcre/dftables.c @@ -213,13 +215,13 @@ MANIFEST for tin-2.0.1 (Sat Dec 24 15:54 108966 ./pcre/testdata/testoutput7 53056 ./pcre/testdata/testoutput8 28769 ./pcre/testdata/testoutput9 - 20380 ./include/autoconf.hin - 21511 ./src/Makefile.in - 10997 ./src/tincfg.tbl + 21250 ./include/autoconf.hin + 22126 ./src/Makefile.in + 10031 ./src/tincfg.tbl 1929 ./libcanlock/CHANGES 2464 ./libcanlock/HOWTO 1259 ./libcanlock/README - 1331 ./libcanlock/Makefile.in + 1389 ./libcanlock/Makefile.in 3712 ./libcanlock/src/base64.c 5271 ./libcanlock/src/canlock.c 3794 ./libcanlock/src/hmac_sha1.c @@ -265,30 +267,31 @@ MANIFEST for tin-2.0.1 (Sat Dec 24 15:54 41 ./intl/VERSION 5068 ./po/Makefile.inn 847 ./po/POTFILES.in - 140959 ./po/tin.pot - 60091 ./po/da.gmo - 167811 ./po/da.po - 177001 ./po/de.gmo - 222699 ./po/de.po - 8420 ./po/en_GB.gmo - 144469 ./po/en_GB.po - 180510 ./po/et.gmo - 217610 ./po/et.po - 188490 ./po/fr.gmo - 225987 ./po/fr.po - 124584 ./po/ru.gmo - 202982 ./po/ru.po - 22907 ./po/sv.gmo - 151316 ./po/sv.po - 4671 ./po/tr.gmo - 214860 ./po/tr.po - 133461 ./doc/l10n/de/tin.1 - 81222 ./doc/l10n/de/tin.5 - 129 ./doc/l10n/de.add - 324376 ./doc/l10n/de.po - 132016 ./doc/l10n/en_GB/tin.1 - 80830 ./doc/l10n/en_GB/tin.5 - 451251 ./doc/l10n/en_GB.po - 346 ./doc/l10n/po4a.conf - 282546 ./doc/l10n/tin-man.pot -10166932 total + 143643 ./po/tin.pot + 90278 ./po/da.gmo + 182040 ./po/da.po + 191909 ./po/de.gmo + 233232 ./po/de.po + 8367 ./po/en_GB.gmo + 147209 ./po/en_GB.po + 183858 ./po/et.gmo + 224237 ./po/et.po + 194678 ./po/fr.gmo + 232848 ./po/fr.po + 123544 ./po/ru.gmo + 205784 ./po/ru.po + 22742 ./po/sv.gmo + 154141 ./po/sv.po + 4684 ./po/tr.gmo + 217686 ./po/tr.po + 220579 ./po/zh_TW.po + 179592 ./po/zh_TW.gmo + 142765 ./doc/l10n/de/tin.1 + 83981 ./doc/l10n/de/tin.5 + 130 ./doc/l10n/de.add + 354786 ./doc/l10n/de.po + 139386 ./doc/l10n/en_GB/tin.1 + 83071 ./doc/l10n/en_GB/tin.5 + 478978 ./doc/l10n/en_GB.po + 300678 ./doc/l10n/tin-man.pot +10904205 total diff -Nurp '--exclude=.bzr*' tin-2.0.1/Makefile tin-2.2.0/Makefile --- tin-2.0.1/Makefile 2011-12-24 15:54:34.000000000 +0100 +++ tin-2.2.0/Makefile 2013-12-24 00:33:36.736352053 +0100 @@ -1,15 +1,15 @@ # Top level Makefile for tin # - for configuration options read the doc/INSTALL file. # -# Updated: 2011-04-17 +# Updated: 2013-01-09 # PROJECT = tin LVER = 2 -PVER = 0 -SVER = 1 +PVER = 2 +SVER = 0 VER = $(LVER).$(PVER).$(SVER) -DVER = 20111224 +DVER = 20131224 EXE = tin # directory structure @@ -64,6 +64,7 @@ CFILES = \ $(SRCDIR)/group.c \ $(SRCDIR)/hashstr.c \ $(SRCDIR)/header.c \ + $(SRCDIR)/heapsort.c \ $(SRCDIR)/help.c\ $(SRCDIR)/inews.c \ $(SRCDIR)/init.c \ @@ -179,6 +180,7 @@ TOP = \ $(TOPDIR)/configure \ $(TOPDIR)/configure.in \ $(TOPDIR)/install-sh \ + $(TOPDIR)/po4a.conf \ $(TOPDIR)/tin.spec PCRE = \ @@ -325,7 +327,9 @@ POFILES = \ $(PODIR)/sv.gmo \ $(PODIR)/sv.po \ $(PODIR)/tr.gmo \ - $(PODIR)/tr.po + $(PODIR)/tr.po \ + $(PODIR)/zh_TW.po \ + $(PODIR)/zh_TW.gmo L10NFILES = \ $(L10NDIR)/de/tin.1 \ @@ -335,12 +339,11 @@ L10NFILES = \ $(L10NDIR)/en_GB/tin.1 \ $(L10NDIR)/en_GB/tin.5 \ $(L10NDIR)/en_GB.po \ - $(L10NDIR)/po4a.conf \ $(L10NDIR)/tin-man.pot ALL_FILES = $(TOP) $(DOC) $(TOL) $(HFILES) $(CFILES) $(PCRE) $(MISC) $(CAN) $(INTLFILES) $(POFILES) $(L10NFILES) -ALL_DIRS = $(TOPDIR) $(DOCDIR) $(SRCDIR) $(INCDIR) $(PCREDIR) $(PCREDIR)/doc $(PCREDIR)/testdata $(CANDIR) $(INTLDIR) $(PODIR) $(L10NDIR) $(L10NDIR)/de +ALL_DIRS = $(TOPDIR) $(DOCDIR) $(SRCDIR) $(INCDIR) $(PCREDIR) $(PCREDIR)/doc $(PCREDIR)/testdata $(CANDIR) $(INTLDIR) $(PODIR) $(L10NDIR) $(L10NDIR)/de $(L10NDIR)/en_GB # standard commands CD = cd @@ -356,12 +359,12 @@ SHELL = /bin/sh TAR = tar GZIP = gzip BZIP2 = bzip2 -LZMA = lzma +XZ = xz WC = wc SED = sed TR = tr TEST = test - +PO4A = po4a all: @$(ECHO) "Top level Makefile for the $(PROJECT) v$(VER) Usenet newsreader." @@ -467,17 +470,17 @@ bzip2: @$(CHMOD) 644 $(PROJECT)-$(VER).tar.bz2 @$(LS) -l $(PROJECT)-$(VER).tar.bz2 -lzma: - @$(ECHO) "Generating lzma compressd tar file..." - @-$(RM) -f $(PROJECT)-$(VER).tar.lzma +xz: + @$(ECHO) "Generating xz compressd tar file..." + @-$(RM) -f $(PROJECT)-$(VER).tar.xz @$(TAR) cvf $(PROJECT)-$(VER).tar -C ../ \ `$(ECHO) $(ALL_FILES) \ | $(TR) -s '[[:space:]]' "[\012*]" \ | $(SED) 's,^\./,$(PROJECT)-$(VER)/,' \ | $(TR) "[\012]" " "` - @$(LZMA) -9 $(PROJECT)-$(VER).tar - @$(CHMOD) 644 $(PROJECT)-$(VER).tar.lzma - @$(LS) -l $(PROJECT)-$(VER).tar.lzma + @$(XZ) -z -F xz -9e $(PROJECT)-$(VER).tar + @$(CHMOD) 644 $(PROJECT)-$(VER).tar.xz + @$(LS) -l $(PROJECT)-$(VER).tar.xz # # I know it's ugly, but it works @@ -504,7 +507,7 @@ dist: @$(MAKE) chmod @$(MAKE) tar @$(MAKE) bzip2 - @$(MAKE) lzma + @$(MAKE) xz version: @$(ECHO) "$(PROJECT)-$(VER)" @@ -520,6 +523,7 @@ distclean: $(TOPDIR)/config.log \ $(TOPDIR)/config.status \ $(TOPDIR)/td-conf.out \ + $(TOPDIR)/CPPCHECK \ $(INCDIR)/autoconf.h \ $(SRCDIR)/Makefile \ $(PCREDIR)/Makefile \ @@ -527,7 +531,8 @@ distclean: $(INTLDIR)/po2tbl.sed \ $(PROJECT)-$(VER).tar.gz \ $(PROJECT)-$(VER).tar.bz2 \ - $(PROJECT)-$(VER).tar.lzma + $(PROJECT)-$(VER).tar.xz \ + $(PODIR)/messages.mo configure: configure.in aclocal.m4 autoconf @@ -536,4 +541,10 @@ config.status: configure $(TOPDIR)/config.status --recheck po4a: - @$(CD) $(L10NDIR) && po4a --no-backups --rm-backups po4a.conf + @$(PO4A) po4a.conf + +cppcheck: FORCE + @-if $(TEST) ! -r $(SRCDIR)/options_menu.h -o ! -r $(SRCDIR)/tincfg.h ; then $(MAKE) build ; fi + @-if $(TEST) -r $(SRCDIR)/options_menu.h -a -r $(SRCDIR)/tincfg.h ; then cppcheck -f -v -I $(INCDIR) -I $(CANDIR) -I $(PCREDIR) -I $(SRCDIR) $(SRCDIR) 1>/dev/null 2>$(TOPDIR)/CPPCHECK ; fi + +FORCE: diff -Nurp '--exclude=.bzr*' tin-2.0.1/aclocal.m4 tin-2.2.0/aclocal.m4 --- tin-2.0.1/aclocal.m4 2011-06-08 13:12:02.000000000 +0200 +++ tin-2.2.0/aclocal.m4 2013-12-07 01:12:41.331914176 +0100 @@ -2,10 +2,10 @@ dnl Project : tin - a Usenet reader dnl Module : aclocal.m4 dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2011-06-08 +dnl Updated : 2013-12-06 dnl Notes : dnl -dnl Copyright (c) 1995-2011 Thomas E. Dickey +dnl Copyright (c) 1995-2014 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -61,23 +61,21 @@ AC_DEFUN([AC_ISC_POSIX], ] ) dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11 +dnl AM_GNU_GETTEXT version: 13 updated: 2012/11/09 05:47:26 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl AC_REQUIRE([AC_C_INLINE])dnl AC_REQUIRE([AC_TYPE_OFF_T])dnl AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_FUNC_MMAP])dnl AC_REQUIRE([jm_GLIBC21])dnl + AC_REQUIRE([CF_PROG_CC])dnl AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h]) @@ -294,7 +292,7 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], /* (void) iswupper((wint_t) wcb[0]); */ /* (void) towlower((wint_t) wcb[0]); */ /* (void) iswlower((wint_t) wcb[0]); */ - /* (void) iswalpha((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); /* (void) iswblank((wint_t) wcb[0]); */ /* (void) iswpunct((wint_t) wcb[0]); */ /* (void) iswxdigit((wint_t) wcb[0]); */ @@ -336,7 +334,7 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], /* (void) iswupper((wint_t) wcb[0]); */ /* (void) towlower((wint_t) wcb[0]); */ /* (void) iswlower((wint_t) wcb[0]); */ - /* (void) iswalpha((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); /* (void) iswblank((wint_t) wcb[0]); */ /* (void) iswpunct((wint_t) wcb[0]); */ /* (void) iswxdigit((wint_t) wcb[0]); */ @@ -427,7 +425,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28 +dnl AM_WITH_NLS version: 25 updated: 2012/10/06 08:57:51 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -530,7 +528,7 @@ AC_DEFUN([AM_WITH_NLS], LIBS="$cf_save_LIBS_1" if test "$cf_cv_func_gettext" = yes ; then - AC_DEFINE(HAVE_LIBINTL_H) + AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h]) dnl If an already present or preinstalled GNU gettext() is found, dnl use it. But if this macro is used in GNU gettext, and GNU @@ -737,6 +735,32 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 +dnl ------------------ +dnl Conditionally generate script according to whether we're using a given autoconf. +dnl +dnl $1 = version to compare against +dnl $2 = code to use if AC_ACVERSION is at least as high as $1. +dnl $3 = code to use if AC_ACVERSION is older than $1. +define([CF_ACVERSION_CHECK], +[ +ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl +ifdef([m4_version_compare], +[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], +[CF_ACVERSION_COMPARE( +AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), +AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl +dnl --------------------------------------------------------------------------- +dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 +dnl -------------------- +dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1, +dnl MAJOR2, MINOR2, TERNARY2, +dnl PRINTABLE2, not FOUND, FOUND) +define([CF_ACVERSION_COMPARE], +[ifelse(builtin([eval], [$2 < $5]), 1, +[ifelse([$8], , ,[$8])], +[ifelse([$9], , ,[$9])])])dnl +dnl --------------------------------------------------------------------------- dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS @@ -934,7 +958,7 @@ dnl $1 = libraries to add, with the "-l" dnl $2 = variable to update (default $LIBS) AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIB_AFTER version: 2 updated: 2010/11/08 20:33:46 +dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22 dnl ---------------- dnl Add a given library after another, e.g., following the one it satisfies a dnl dependency for. @@ -943,7 +967,7 @@ dnl $1 = the first library dnl $2 = its dependency AC_DEFUN([CF_ADD_LIB_AFTER],[ CF_VERBOSE(...before $LIBS) -LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s,$1 ,$1 $2 ," -e 's/ / /g'` +LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ ]]*/ /g" -e "s%$1 %$1 $2 %" -e 's% % %g'` CF_VERBOSE(...after $LIBS) ])dnl dnl --------------------------------------------------------------------------- @@ -996,7 +1020,7 @@ $2]) done ]) dnl --------------------------------------------------------------------------- -dnl CF_ADD_SUBDIR_PATH version: 3 updated: 2010/07/03 20:58:12 +dnl CF_ADD_SUBDIR_PATH version: 4 updated: 2013/10/08 17:47:05 dnl ------------------ dnl Append to a search-list for a nonstandard header/lib-file dnl $1 = the variable to return as result @@ -1006,9 +1030,9 @@ dnl $4 = the directory under which we wi dnl $5 = a directory that we do not want $4 to match AC_DEFUN([CF_ADD_SUBDIR_PATH], [ -test "$4" != "$5" && \ +test "x$4" != "x$5" && \ test -d "$4" && \ -ifelse([$5],NONE,,[(test $5 = NONE || test "$4" != "$5") &&]) { +ifelse([$5],NONE,,[(test -z "$5" || test x$5 = xNONE || test "x$4" != "x$5") &&]) { test -n "$verbose" && echo " ... testing for $3-directories under $4" test -d $4/$3 && $1="[$]$1 $4/$3" test -d $4/$3/$2 && $1="[$]$1 $4/$3/$2" @@ -1018,12 +1042,14 @@ ifelse([$5],NONE,,[(test $5 = NONE || te } ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ANSI_CC_CHECK version: 10 updated: 2010/10/23 15:52:32 +dnl CF_ANSI_CC_CHECK version: 13 updated: 2012/10/06 11:17:15 dnl ---------------- -dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' -dnl in the sharutils 4.2 distribution. +dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and +dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution. AC_DEFUN([CF_ANSI_CC_CHECK], [ +CF_CC_ENV_FLAGS + AC_CACHE_CHECK(for ${CC:-cc} option to accept ANSI C, cf_cv_ansi_cc,[ cf_cv_ansi_cc=no cf_save_CFLAGS="$CFLAGS" @@ -1065,7 +1091,7 @@ if test "$cf_cv_ansi_cc" != "no"; then if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then CF_ADD_CFLAGS($cf_cv_ansi_cc) else - AC_DEFINE(CC_HAS_PROTOS) + AC_DEFINE(CC_HAS_PROTOS,1,[Define to 1 if C compiler supports prototypes]) fi fi ])dnl @@ -1200,7 +1226,7 @@ fi AC_SUBST(ARFLAGS) ]) dnl --------------------------------------------------------------------------- -dnl CF_BUILD_CC version: 6 updated: 2006/10/14 15:23:15 +dnl CF_BUILD_CC version: 7 updated: 2012/10/06 15:31:55 dnl ----------- dnl If we're cross-compiling, allow the user to override the tools and their dnl options. The configure script is oriented toward identifying the host @@ -1210,7 +1236,8 @@ dnl dnl $1 = default for $CPPFLAGS dnl $2 = default for $LIBS AC_DEFUN([CF_BUILD_CC],[ -AC_REQUIRE([CF_PROG_EXT]) +CF_ACVERSION_CHECK(2.52,, + [AC_REQUIRE([CF_PROG_EXT])]) if test "$cross_compiling" = yes ; then # defaults that we might want to override @@ -1291,7 +1318,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05 +dnl CF_BUNDLED_INTL version: 17 updated: 2012/10/06 08:57:51 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of dnl the intl and po directories for gettext. @@ -1348,7 +1375,7 @@ if test "$USE_NLS" = yes ; then [ --with-textdomain=PKG NLS text-domain (default is package name)], [NLS_TEXTDOMAIN=$withval], [NLS_TEXTDOMAIN=$PACKAGE]) - AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN") + AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN",[Define to the nls textdomain value]) AC_SUBST(NLS_TEXTDOMAIN) fi @@ -1368,7 +1395,7 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; INTLDIR_MAKE="#" fi if test -z "$INTLDIR_MAKE"; then - AC_DEFINE(HAVE_LIBGETTEXT_H) + AC_DEFINE(HAVE_LIBGETTEXT_H,1,[Define to 1 if we have libgettext.h]) for cf_makefile in \ $srcdir/intl/Makefile.in \ $srcdir/intl/makefile.in @@ -1411,12 +1438,12 @@ dnl own code, except ENABLE_NLS, which i if test "$USE_INCLUDED_LIBINTL" = yes ; then if test "$nls_cv_force_use_gnu_gettext" = yes ; then - AC_DEFINE(HAVE_GETTEXT) + AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function]) elif test "$nls_cv_use_gnu_gettext" = yes ; then - AC_DEFINE(HAVE_GETTEXT) + AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function]) fi if test -n "$nls_cv_header_intl" ; then - AC_DEFINE(HAVE_LIBINTL_H) + AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have header-file for libintl]) fi fi ])dnl @@ -1458,6 +1485,32 @@ AC_SUBST(PCREDIR_LIBS) AC_SUBST(PCREDIR_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49 +dnl --------------- +dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content +dnl into CC. This will not help with broken scripts that wrap the compiler with +dnl options, but eliminates a more common category of user confusion. +AC_DEFUN([CF_CC_ENV_FLAGS], +[ +# This should have been defined by AC_PROG_CC +: ${CC:=cc} + +AC_MSG_CHECKING(\$CC variable) +case "$CC" in #(vi +*[[\ \ ]]-[[IUD]]*) + AC_MSG_RESULT(broken) + AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) + # humor him... + cf_flags=`echo "$CC" | sed -e 's/^[[^ ]]*[[ ]]//'` + CC=`echo "$CC" | sed -e 's/[[ ]].*//'` + CF_ADD_CFLAGS($cf_flags) + ;; +*) + AC_MSG_RESULT(ok) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CHECK_1_DECL version: 5 updated: 2001/07/22 21:09:16 dnl --------------- dnl Check for missing declarations in the system headers (adapted from vile). @@ -1500,7 +1553,7 @@ AC_MSG_RESULT($cf_result) test $cf_result = yes && AC_DEFINE_UNQUOTED(DECL_$2) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59 +dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03 dnl -------------- dnl Check if we're accidentally using a cache from a different machine. dnl Derive the system name, as a check for reusing the autoconf cache. @@ -1523,7 +1576,7 @@ else system_name="`(hostname) 2>/dev/null`" fi fi -test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name") +test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.]) AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"]) test -z "$system_name" && system_name="$cf_cv_system_name" @@ -1687,7 +1740,40 @@ AC_MSG_RESULT($cf_cv_nested_params) test $cf_cv_nested_params = yes && AC_DEFINE(HAVE_NESTED_PARAMS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_COLOR_CURSES version: 7 updated: 2010/10/23 15:54:49 +dnl CF_CLANG_COMPILER version: 2 updated: 2013/11/19 19:23:35 +dnl ----------------- +dnl Check if the given compiler is really clang. clang's C driver defines +dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does +dnl not ignore some gcc options. +dnl +dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to +dnl ensure that it is not mistaken for gcc/g++. It is normally invoked from +dnl the wrappers for gcc and g++ warnings. +dnl +dnl $1 = GCC (default) or GXX +dnl $2 = CLANG_COMPILER (default) +dnl $3 = CFLAGS (default) or CXXFLAGS +AC_DEFUN([CF_CLANG_COMPILER],[ +ifelse([$2],,CLANG_COMPILER,[$2])=no + +if test "$ifelse([$1],,[$1],GCC)" = yes ; then + AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler) + cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" + ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments" + AC_TRY_COMPILE([],[ +#ifdef __clang__ +#else +make an error +#endif +],[ifelse([$2],,CLANG_COMPILER,[$2])=yes +cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" +],[]) + ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" + AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2])) +fi +]) +dnl --------------------------------------------------------------------------- +dnl CF_COLOR_CURSES version: 8 updated: 2012/11/08 20:57:52 dnl --------------- dnl Check if curses supports color. (Note that while SVr3 curses supports dnl color, it does this differently from SVr4 curses; more work would be needed @@ -1712,8 +1798,8 @@ AC_CACHE_VAL(cf_cv_color_curses,[ ]) AC_MSG_RESULT($cf_cv_color_curses) if test $cf_cv_color_curses = yes ; then - AC_DEFINE(COLOR_CURSES) - test ".$cf_cv_ncurses_broken" != .yes && AC_DEFINE(HAVE_GETBKGD) + AC_DEFINE(COLOR_CURSES,1,[Define to 1 if if curses supports color attributes]) + test ".$cf_cv_ncurses_broken" != .yes && AC_DEFINE(HAVE_GETBKGD,1,[Define to 1 if curses has getbkgd function]) fi ])dnl dnl --------------------------------------------------------------------------- @@ -1872,7 +1958,7 @@ CF_CURSES_HEADER CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16 +dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -1882,7 +1968,7 @@ AC_DEFUN([CF_CURSES_HEADER],[ AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ cf_cv_ncurses_header=none for cf_header in ifelse($1,,,[ \ - $1/ncurses.h \ + $1/ncurses.h \ $1/curses.h]) \ ncurses.h \ curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) @@ -1901,7 +1987,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08 +dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1938,7 +2024,7 @@ hpux10.*) #(vi ac_cv_func_initscr=yes ])]) fi - ;; + ;; linux*) case `arch 2>/dev/null` in x86_64) @@ -1953,7 +2039,7 @@ linux*) CF_ADD_LIBDIR(/lib) ;; esac - ;; + ;; sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then @@ -1967,65 +2053,69 @@ sunos3*|sunos4*) esac if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" + cf_save_LIBS="$LIBS" - if test ".${cf_cv_ncurses_version:-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ - for cf_term_lib in $cf_check_list termcap termlib unknown - do - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) - done - ]) + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[ + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + AC_CHECK_LIB($cf_term_lib,tgoto,[break]) + done + ]) + fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown - do - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) - done - test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + AC_CHECK_LIB($cf_curs_lib,initscr,[break]) + done + fi + test $cf_curs_lib = unknown && AC_MSG_ERROR(no curses library found) - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=no]) - AC_MSG_RESULT($cf_result) - test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); tgoto((char *)0, 0, 0);], - [cf_result=no], - [ - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr()], - [cf_result=yes], - [cf_result=error]) - ]) - AC_MSG_RESULT($cf_result) - fi + LIBS="-l$cf_curs_lib $cf_save_LIBS" + if test "$cf_term_lib" = unknown ; then + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=no]) + AC_MSG_RESULT($cf_result) + test $cf_result = no && AC_MSG_ERROR(Cannot link curses library) + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + : + elif test "$cf_term_lib" != predefined ; then + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries) + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); tgoto((char *)0, 0, 0);], + [cf_result=no], + [ + LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr()], + [cf_result=yes], + [cf_result=error]) + ]) + AC_MSG_RESULT($cf_result) + fi fi fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERMCAP version: 10 updated: 2002/01/13 16:02:19 +dnl CF_CURSES_TERMCAP version: 11 updated: 2012/10/06 11:17:15 dnl ----------------- dnl Check if we should include to pick up prototypes for termcap dnl functions. On terminfo systems, these are normally declared in , @@ -2093,23 +2183,23 @@ fi case $cf_cv_need_curses_h in both) #(vi - AC_DEFINE_UNQUOTED(NEED_CURSES_H) - AC_DEFINE_UNQUOTED(NEED_TERMCAP_H) + AC_DEFINE_UNQUOTED(NEED_CURSES_H,1,[Define to 1 if we must include curses.h]) + AC_DEFINE_UNQUOTED(NEED_TERMCAP_H,1,[Define to 1 if we must include termcap.h]) ;; curses.h) #(vi - AC_DEFINE_UNQUOTED(NEED_CURSES_H) + AC_DEFINE_UNQUOTED(NEED_CURSES_H,1,[Define to 1 if we must include curses.h]) ;; term.h) #(vi - AC_DEFINE_UNQUOTED(NEED_TERM_H) + AC_DEFINE_UNQUOTED(NEED_TERM_H,1,[Define to 1 if we must include term.h]) ;; termcap.h) #(vi - AC_DEFINE_UNQUOTED(NEED_TERMCAP_H) + AC_DEFINE_UNQUOTED(NEED_TERMCAP_H,1,[Define to 1 if we must include termcap.h]) ;; esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55 +dnl CF_CURSES_TERM_H version: 10 updated: 2012/10/06 08:57:51 dnl ---------------- dnl SVr4 curses should have term.h as well (where it puts the definitions of dnl the low-level interface). This may not be true in old/broken implementations, @@ -2168,13 +2258,13 @@ esac case $cf_cv_term_header in #(vi term.h) #(vi - AC_DEFINE(HAVE_TERM_H) + AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h]) ;; ncurses/term.h) #(vi - AC_DEFINE(HAVE_NCURSES_TERM_H) + AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h]) ;; ncursesw/term.h) - AC_DEFINE(HAVE_NCURSESW_TERM_H) + AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h]) ;; esac ])dnl @@ -2279,7 +2369,7 @@ dnl ---------- dnl "dirname" is not portable, so we fake it with a shell script. AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57 +dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28 dnl --------------- dnl You can always use "make -n" to see the actual options, but it's hard to dnl pick out/analyze warning messages when the compile-line is long. @@ -2294,7 +2384,7 @@ dnl AC_DEFUN([CF_DISABLE_ECHO],[ AC_MSG_CHECKING(if you want to see long compiling messages) CF_ARG_DISABLE(echo, - [ --disable-echo display "compiling" commands], + [ --disable-echo do not display "compiling" commands], [ ECHO_LT='--silent' ECHO_LD='@echo linking [$]@;' @@ -2755,7 +2845,7 @@ AC_MSG_RESULT($cf_cv_func_fork) test $cf_cv_func_fork = yes && AC_DEFINE(HAVE_FORK) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_GETADDRINFO version: 7 updated: 2010/10/23 15:52:32 +dnl CF_FUNC_GETADDRINFO version: 8 updated: 2012/11/08 20:57:52 dnl ------------------- dnl Look for a working version of getaddrinfo(), for IPV6 support. AC_DEFUN([CF_FUNC_GETADDRINFO],[ @@ -2841,12 +2931,12 @@ int main() [cf_cv_getaddrinfo=unknown]) ]) if test "$cf_cv_getaddrinfo" = yes ; then - AC_DEFINE(HAVE_GAI_STRERROR) - AC_DEFINE(HAVE_GETADDRINFO) + AC_DEFINE(HAVE_GAI_STRERROR,1,[Define to 1 if we have gai_strerror function]) + AC_DEFINE(HAVE_GETADDRINFO,1,[Define to 1 if we have getaddrinfo function]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FUNC_MEMMOVE version: 7 updated: 2006/12/16 12:33:30 +dnl CF_FUNC_MEMMOVE version: 8 updated: 2012/10/04 20:12:20 dnl --------------- dnl Check for memmove, or a bcopy that can handle overlapping copy. If neither dnl is found, add our own version of memmove to the list of objects. @@ -2871,9 +2961,9 @@ int main() { ]) ],[cf_cv_good_bcopy=no]) if test "$cf_cv_good_bcopy" = yes ; then - AC_DEFINE(USE_OK_BCOPY) + AC_DEFINE(USE_OK_BCOPY,1,[Define to 1 to use bcopy when memmove is unavailable]) else - AC_DEFINE(USE_MY_MEMMOVE) + AC_DEFINE(USE_MY_MEMMOVE,1,[Define to 1 to use replacement function when memmove is unavailable]) fi ])])dnl dnl --------------------------------------------------------------------------- @@ -2928,7 +3018,7 @@ AC_MSG_RESULT($cf_cv_system_status) test $cf_cv_system_status = no && AC_DEFINE(USE_SYSTEM_STATUS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31 +dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33 dnl -------------- dnl Find version of gcc AC_DEFUN([CF_GCC_VERSION],[ @@ -2936,13 +3026,13 @@ AC_REQUIRE([AC_PROG_CC]) GCC_VERSION=none if test "$GCC" = yes ; then AC_MSG_CHECKING(version of $CC) - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" test -z "$GCC_VERSION" && GCC_VERSION=unknown AC_MSG_RESULT($GCC_VERSION) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32 +dnl CF_GCC_WARNINGS version: 31 updated: 2013/11/19 19:23:35 dnl --------------- dnl Check if the compiler supports useful warning options. There's a few that dnl we don't use, simply because they're too noisy: @@ -2965,6 +3055,7 @@ AC_DEFUN([CF_GCC_WARNINGS], [ AC_REQUIRE([CF_GCC_VERSION]) CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS) +CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS) cat > conftest.$ac_ext <&AC_FD_CC ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_BROKEN version: 7 updated: 2010/10/23 15:54:49 +dnl CF_NCURSES_BROKEN version: 8 updated: 2012/11/08 20:57:52 dnl ----------------- dnl Check for pre-1.9.9g ncurses (among other problems, the most obvious is dnl that color combinations don't work). @@ -3367,7 +3470,7 @@ AC_TRY_COMPILE([ AC_MSG_RESULT($cf_cv_ncurses_broken) if test "$cf_cv_ncurses_broken" = yes ; then AC_MSG_WARN(hmm... you should get an up-to-date version of ncurses) - AC_DEFINE(NCURSES_BROKEN) + AC_DEFINE(NCURSES_BROKEN,1,[Define to 1 if you have an obsolete version of ncurses]) fi fi ])dnl @@ -3405,7 +3508,7 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 8 updated: 2010/07/08 05:17:30 +dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51 dnl ----------------- dnl Tie together the configure-script macros for ncurses. dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. @@ -3417,7 +3520,10 @@ AC_DEFUN([CF_NCURSES_CONFIG], cf_ncuconfig_root=ifelse($1,,ncurses,$1) echo "Looking for ${cf_ncuconfig_root}-config" -AC_PATH_PROGS(NCURSES_CONFIG,${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config,none) + +CF_ACVERSION_CHECK(2.52, + [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], + [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) if test "$NCURSES_CONFIG" != none ; then @@ -3428,7 +3534,7 @@ CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) dnl like CF_NCURSES_CPPFLAGS -AC_DEFINE(NCURSES) +AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) dnl like CF_NCURSES_LIBS CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) @@ -3445,7 +3551,7 @@ CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CPPFLAGS version: 20 updated: 2010/11/20 17:02:38 +dnl CF_NCURSES_CPPFLAGS version: 21 updated: 2012/10/06 08:57:51 dnl ------------------- dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting dnl the CPPFLAGS variable so we can include its header. @@ -3491,12 +3597,12 @@ CF_NCURSES_HEADER CF_TERM_HEADER # some applications need this, but should check for NCURSES_VERSION -AC_DEFINE(NCURSES) +AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) CF_NCURSES_VERSION ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_HEADER version: 2 updated: 2008/03/23 14:48:54 +dnl CF_NCURSES_HEADER version: 3 updated: 2012/10/06 08:57:51 dnl ----------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -3547,16 +3653,16 @@ fi case $cf_cv_ncurses_header in # (vi *ncurses.h) - AC_DEFINE(HAVE_NCURSES_H) + AC_DEFINE(HAVE_NCURSES_H,1,[Define to 1 if we have ncurses.h]) ;; esac case $cf_cv_ncurses_header in # (vi ncurses/curses.h|ncurses/ncurses.h) - AC_DEFINE(HAVE_NCURSES_NCURSES_H) + AC_DEFINE(HAVE_NCURSES_NCURSES_H,1,[Define to 1 if we have ncurses/ncurses.h]) ;; ncursesw/curses.h|ncursesw/ncurses.h) - AC_DEFINE(HAVE_NCURSESW_NCURSES_H) + AC_DEFINE(HAVE_NCURSESW_NCURSES_H,1,[Define to 1 if we have ncursesw/ncurses.h]) ;; esac @@ -3630,7 +3736,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncul AC_DEFINE_UNQUOTED($cf_nculib_ROOT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_VERSION version: 13 updated: 2010/10/23 15:54:49 +dnl CF_NCURSES_VERSION version: 14 updated: 2012/10/06 08:57:51 dnl ------------------ dnl Check for the version of ncurses, to aid in reporting bugs, etc. dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use @@ -3689,10 +3795,10 @@ EOF ]) rm -f $cf_tempfile ]) -test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES) +test "$cf_cv_ncurses_version" = no || AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NETLIBS version: 7 updated: 2010/06/20 09:24:28 +dnl CF_NETLIBS version: 10 updated: 2013/10/08 17:47:05 dnl ---------- dnl After checking for functions in the default $LIBS, make a further check dnl for the functions that are netlib-related (these aren't always in the @@ -3716,7 +3822,7 @@ cf_cv_netlibs="" cf_test_netlibs=yes case $host_os in #(vi -mingw32) # (vi +mingw*) # (vi AC_CHECK_HEADERS( windows.h winsock.h winsock2.h ) if test "$ac_cv_header_winsock2_h" = "yes" ; then @@ -3765,6 +3871,9 @@ mingw32) # (vi AC_CHECK_FUNCS(gethostbyname,,[ CF_RECHECK_FUNC(gethostbyname,nsl,cf_cv_netlibs)]) + AC_CHECK_FUNCS(inet_ntoa,,[ + CF_RECHECK_FUNC(inet_ntoa,nsl,cf_cv_netlibs)]) + AC_CHECK_FUNCS(gethostbyname,,[ CF_RECHECK_FUNC(gethostbyname,network,cf_cv_netlibs)]) @@ -3776,7 +3885,7 @@ esac case $cf_cv_netlibs in #(vi *ws2_32*) - AC_DEFINE(USE_WINSOCK2_H) + AC_DEFINE(USE_WINSOCK2_H,1,[Define to 1 if we should include winsock2.h]) ;; esac @@ -3784,14 +3893,14 @@ CF_ADD_LIBS($cf_cv_netlibs) test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&AC_FD_MSG ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NO_LEAKS_OPTION version: 4 updated: 2006/12/16 14:24:05 +dnl CF_NO_LEAKS_OPTION version: 5 updated: 2012/10/02 20:55:03 dnl ------------------ dnl see CF_WITH_NO_LEAKS AC_DEFUN([CF_NO_LEAKS_OPTION],[ AC_MSG_CHECKING(if you want to use $1 for testing) AC_ARG_WITH($1, [$2], - [AC_DEFINE($3)ifelse([$4],,[ + [AC_DEFINE_UNQUOTED($3,1,"Define to 1 if you want to use $1 for testing.")ifelse([$4],,[ $4 ]) : ${with_cflags:=-g} @@ -3850,17 +3959,20 @@ AC_SUBST(MSG_DIR_MAKE) AC_SUBST(SUB_MAKEFILE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATHSEP version: 5 updated: 2010/05/26 05:38:42 +dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12 dnl ---------- -dnl Provide a value for the $PATH and similar separator +dnl Provide a value for the $PATH and similar separator (or amend the value +dnl as provided in autoconf 2.5x). AC_DEFUN([CF_PATHSEP], [ + AC_MSG_CHECKING(for PATH separator) case $cf_cv_system_name in os2*) PATH_SEPARATOR=';' ;; - *) PATH_SEPARATOR=':' ;; + *) ${PATH_SEPARATOR:=':'} ;; esac ifelse([$1],,,[$1=$PATH_SEPARATOR]) AC_SUBST(PATH_SEPARATOR) + AC_MSG_RESULT($PATH_SEPARATOR) ])dnl dnl --------------------------------------------------------------------------- dnl CF_PATH_EDITOR version: 5 updated: 2000/07/20 00:41:18 @@ -3943,7 +4055,7 @@ fi AC_MSG_RESULT($DEFAULT_MAILER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 13 updated: 2010/05/26 05:38:42 +dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54 dnl -------------- dnl Check the argument to see that it looks like a pathname. Rewrite it if it dnl begins with one of the prefix/exec_prefix variables, and then again if the @@ -3963,7 +4075,7 @@ case ".[$]$1" in #(vi ;; .[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX ;; -.\[$]{*prefix}*) #(vi +.\[$]{*prefix}*|.\[$]{*dir}*) #(vi eval $1="[$]$1" case ".[$]$1" in #(vi .NONE/*) @@ -3980,13 +4092,15 @@ case ".[$]$1" in #(vi esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PDCURSES_X11 version: 11 updated: 2011/01/15 18:45:38 +dnl CF_PDCURSES_X11 version: 13 updated: 2012/10/06 16:39:58 dnl --------------- dnl Configure for PDCurses' X11 library AC_DEFUN([CF_PDCURSES_X11],[ AC_REQUIRE([CF_X_ATHENA]) -AC_PATH_PROGS(XCURSES_CONFIG,xcurses-config,none) +CF_ACVERSION_CHECK(2.52, + [AC_CHECK_TOOLS(XCURSES_CONFIG, xcurses-config, none)], + [AC_PATH_PROGS(XCURSES_CONFIG, xcurses-config, none)]) if test "$XCURSES_CONFIG" != none ; then @@ -4015,15 +4129,15 @@ char *XCursesProgramName = "test"; fi if test $cf_cv_lib_XCurses = yes ; then - AC_DEFINE(UNIX) - AC_DEFINE(XCURSES) - AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES)) + AC_DEFINE(UNIX,1,[Define to 1 if using PDCurses on Unix]) + AC_DEFINE(XCURSES,1,[Define to 1 if using PDCurses on Unix]) + AC_CHECK_HEADER(xcurses.h, AC_DEFINE(HAVE_XCURSES,1,[Define to 1 if using PDCurses on Unix])) else AC_MSG_ERROR(Cannot link with XCurses) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 6 updated: 2011/04/17 06:36:21 +dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. AC_DEFUN([CF_PKG_CONFIG], @@ -4040,7 +4154,9 @@ no) #(vi PKG_CONFIG=none ;; yes) #(vi - AC_PATH_PROG(PKG_CONFIG, pkg-config, none) + CF_ACVERSION_CHECK(2.52, + [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], + [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) ;; *) PKG_CONFIG=$withval @@ -4176,6 +4292,19 @@ AC_DEFUN([CF_PROG_AR],[ AC_CHECK_TOOL(AR, ar, ar) ]) dnl --------------------------------------------------------------------------- +dnl CF_PROG_CC version: 3 updated: 2012/10/06 15:31:55 +dnl ---------- +dnl standard check for CC, plus followup sanity checks +dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name +AC_DEFUN([CF_PROG_CC],[ +ifelse($1,,[AC_PROG_CC],[AC_PROG_CC($1)]) +CF_GCC_VERSION +CF_ACVERSION_CHECK(2.52, + [AC_PROG_CC_STDC], + [CF_ANSI_CC_REQD]) +CF_CC_ENV_FLAGS +])dnl +dnl --------------------------------------------------------------------------- dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30 dnl -------------- dnl Check if C (preprocessor) -U and -D options are processed in the order @@ -4201,7 +4330,7 @@ make a defined-error ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_EXT version: 10 updated: 2004/01/03 19:28:18 +dnl CF_PROG_EXT version: 11 updated: 2012/10/06 08:57:51 dnl ----------- dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX. AC_DEFUN([CF_PROG_EXT], @@ -4223,7 +4352,7 @@ AC_OBJEXT PROG_EXT="$EXEEXT" AC_SUBST(PROG_EXT) -test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT") +test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_PROG_SUM_R version: 2 updated: 1997/08/28 23:57:55 @@ -4510,7 +4639,7 @@ AC_MSG_RESULT($cf_cv_sig_const) test "$cf_cv_sig_const" = yes && AC_DEFINE(DECL_SIG_CONST) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16 +dnl CF_SIZECHANGE version: 9 updated: 2012/10/06 11:17:15 dnl ------------- dnl Check for definitions & structures needed for window size-changing dnl FIXME: check that this works with "snake" (HP-UX 10.x) @@ -4571,7 +4700,7 @@ do done ]) if test "$cf_cv_sizechange" != no ; then - AC_DEFINE(HAVE_SIZECHANGE) + AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided]) case $cf_cv_sizechange in #(vi NEED*) AC_DEFINE_UNQUOTED($cf_cv_sizechange ) @@ -4580,7 +4709,7 @@ if test "$cf_cv_sizechange" != no ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SOCKS version: 8 updated: 2010/05/05 20:27:55 +dnl CF_SOCKS version: 9 updated: 2012/11/08 20:57:52 dnl -------- dnl Check for socks library dnl $1 = the [optional] directory in which the library may be found @@ -4594,22 +4723,22 @@ AC_DEFUN([CF_SOCKS],[ socks) if test "x$cf_cv_find_linkage_socks" = "xyes" ; then - AC_DEFINE(SOCKS) + AC_DEFINE(SOCKS,1,[Define to 1 if we are using socks library]) - AC_DEFINE(accept,Raccept) - AC_DEFINE(bind,Rbind) - AC_DEFINE(connect,Rconnect) - AC_DEFINE(getpeername,Rgetpeername) - AC_DEFINE(getsockname,Rgetsockname) - AC_DEFINE(listen,Rlisten) - AC_DEFINE(recvfrom,Rrecvfrom) - AC_DEFINE(select,Rselect) + AC_DEFINE(accept,Raccept,[Define to override function name if using socks library]) + AC_DEFINE(bind,Rbind,[Define to override function name if using socks library]) + AC_DEFINE(connect,Rconnect,[Define to override function name if using socks library]) + AC_DEFINE(getpeername,Rgetpeername,[Define to override function name if using socks library]) + AC_DEFINE(getsockname,Rgetsockname,[Define to override function name if using socks library]) + AC_DEFINE(listen,Rlisten,[Define to override function name if using socks library]) + AC_DEFINE(recvfrom,Rrecvfrom,[Define to override function name if using socks library]) + AC_DEFINE(select,Rselect,[Define to override function name if using socks library]) else AC_MSG_ERROR(cannot link with socks library) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SOCKS5 version: 11 updated: 2010/06/20 09:24:28 +dnl CF_SOCKS5 version: 12 updated: 2012/11/08 20:57:52 dnl --------- dnl Check for socks5 configuration dnl $1 = the [optional] directory in which the library may be found @@ -4618,15 +4747,15 @@ AC_DEFUN([CF_SOCKS5],[ CF_ADD_LIBS(-lsocks5) -AC_DEFINE(USE_SOCKS5) -AC_DEFINE(SOCKS) +AC_DEFINE(USE_SOCKS5,1,[Define to 1 if we are using socks5 library]) +AC_DEFINE(SOCKS,1,[Define to 1 if we are using socks library]) AC_MSG_CHECKING(if the socks library uses socks4 prefix) cf_use_socks4=error AC_TRY_LINK([ #include ],[ Rinit((char *)0)], - [AC_DEFINE(USE_SOCKS4_PREFIX) + [AC_DEFINE(USE_SOCKS4_PREFIX,1,[Define to 1 if socks library uses socks4 prefix]) cf_use_socks4=yes], [AC_TRY_LINK([#include ], [SOCKSinit((char *)0)], @@ -4659,7 +4788,7 @@ AC_TRY_COMPILE([ [cf_use_socks5p_h=no]) AC_MSG_RESULT($cf_use_socks5p_h) -test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES) +test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES,1,[Define to 1 if needed to declare prototypes in socks headers]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_STRERROR version: 2 updated: 2001/07/11 09:34:49 @@ -4670,7 +4799,7 @@ AC_DEFUN([CF_STRERROR],[ AC_CHECK_FUNCS(strerror, AC_DEFINE(HAVE_STRERROR),[CF_SYS_ERRLIST]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 6 updated: 2011/04/16 11:52:53 +dnl CF_STRUCT_TERMIOS version: 7 updated: 2012/10/06 17:56:13 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. AC_DEFUN([CF_STRUCT_TERMIOS],[ @@ -4701,7 +4830,7 @@ if test "$ac_cv_header_termios_h" = yes #include ], [struct termios foo; int x = foo.c_iflag], termios_bad=unknown, - termios_bad=yes AC_DEFINE(_POSIX_SOURCE)) + termios_bad=yes AC_DEFINE(_POSIX_SOURCE,1,[Define to 1 if we must define _POSIX_SOURCE])) ]) AC_MSG_RESULT($termios_bad) fi @@ -4813,7 +4942,7 @@ AC_MSG_RESULT($cf_cv_sys_select_timeval) test $cf_cv_sys_select_timeval = yes && AC_DEFINE(NEED_TIMEVAL_FIX) ]) dnl --------------------------------------------------------------------------- -dnl CF_TERMCAP_LIBS version: 12 updated: 2010/06/20 09:24:28 +dnl CF_TERMCAP_LIBS version: 14 updated: 2012/07/07 21:02:48 dnl --------------- dnl Look for termcap libraries, or the equivalent in terminfo. dnl @@ -4840,23 +4969,23 @@ if test "$cf_cv_termlib" = none; then # FreeBSD's linker gives bogus results for AC_CHECK_LIB, saying that # tgetstr lives in -lcurses when it is only an unsatisfied extern. cf_save_LIBS="$LIBS" - for cf_lib in curses ncurses termlib termcap + for cf_lib in tinfo curses ncurses termlib termcap do - LIBS="-l$cf_lib $cf_save_LIBS" - for cf_func in tigetstr tgetstr - do - AC_MSG_CHECKING(for $cf_func in -l$cf_lib) - AC_TRY_LINK([],[int x=$cf_func("")],[cf_result=yes],[cf_result=no]) - AC_MSG_RESULT($cf_result) - if test "$cf_result" = yes ; then - if test "$cf_func" = tigetstr ; then - cf_cv_termlib=terminfo - else - cf_cv_termlib=termcap + LIBS="-l$cf_lib $cf_save_LIBS" + for cf_func in tigetstr tgetstr + do + AC_MSG_CHECKING(for $cf_func in -l$cf_lib) + AC_TRY_LINK([],[int x=$cf_func("")],[cf_result=yes],[cf_result=no]) + AC_MSG_RESULT($cf_result) + if test "$cf_result" = yes ; then + if test "$cf_func" = tigetstr ; then + cf_cv_termlib=terminfo + else + cf_cv_termlib=termcap + fi + break fi - break - fi - done + done test "$cf_result" = yes && break done test "$cf_result" = no && LIBS="$cf_save_LIBS" @@ -4906,7 +5035,7 @@ if test $cf_cv_use_termios_h = yes; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TERM_HEADER version: 2 updated: 2010/10/23 15:54:49 +dnl CF_TERM_HEADER version: 3 updated: 2012/10/06 08:57:51 dnl -------------- dnl Look for term.h, which is part of X/Open curses. It defines the interface dnl to terminfo database. Usually it is in the same include-path as curses.h, @@ -4939,16 +5068,16 @@ done case $cf_cv_term_header in # (vi *term.h) - AC_DEFINE(HAVE_TERM_H) + AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h]) ;; esac case $cf_cv_term_header in # (vi ncurses/term.h) #(vi - AC_DEFINE(HAVE_NCURSES_TERM_H) + AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h]) ;; ncursesw/term.h) - AC_DEFINE(HAVE_NCURSESW_TERM_H) + AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h]) ;; esac ])dnl @@ -5001,7 +5130,7 @@ AC_MSG_RESULT($cf_cv_use_tiocgwinsz) test $cf_cv_use_tiocgwinsz != yes && AC_DEFINE(DONT_HAVE_SIGWINCH) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TM_GMTOFF version: 2 updated: 1997/08/28 23:57:55 +dnl CF_TM_GMTOFF version: 3 updated: 2012/11/08 20:57:52 dnl ------------ dnl Check if the tm-struct defines the '.tm_gmtoff' member (useful in decoding dnl dates). @@ -5026,10 +5155,26 @@ AC_CACHE_VAL(cf_cv_tm_gmtoff,[ [cf_cv_tm_gmtoff=yes], [cf_cv_tm_gmtoff=no])]) AC_MSG_RESULT($cf_cv_tm_gmtoff) -test $cf_cv_tm_gmtoff = no && AC_DEFINE(DONT_HAVE_TM_GMTOFF) +test $cf_cv_tm_gmtoff = no && AC_DEFINE(DONT_HAVE_TM_GMTOFF,1,[Define to 1 if the tm-struct defines .tm_gmtoff member]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TRY_PKG_CONFIG version: 4 updated: 2010/06/14 17:42:30 +dnl CF_TRIM_X_LIBS version: 2 updated: 2013/07/09 21:27:22 +dnl -------------- +dnl Trim extra base X libraries added as a workaround for inconsistent library +dnl dependencies returned by "new" pkg-config files. +AC_DEFUN([CF_TRIM_X_LIBS],[ + for cf_trim_lib in Xmu Xt X11 + do + case "$LIBS" in + *-l$cf_trim_lib\ *-l$cf_trim_lib*) + LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` + CF_VERBOSE(..trimmed $LIBS) + ;; + esac + done +]) +dnl --------------------------------------------------------------------------- +dnl CF_TRY_PKG_CONFIG version: 5 updated: 2013/07/06 21:27:06 dnl ----------------- dnl This is a simple wrapper to use for pkg-config, for libraries which may be dnl available in that form. @@ -5050,11 +5195,52 @@ if test "$PKG_CONFIG" != none && "$PKG_C CF_ADD_LIBS($cf_pkgconfig_libs) ifelse([$2],,:,[$2]) else + cf_pkgconfig_incs= + cf_pkgconfig_libs= ifelse([$3],,:,[$3]) fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TYPE_OUTCHAR version: 13 updated: 2002/10/09 20:00:37 +dnl CF_TRY_XOPEN_SOURCE version: 1 updated: 2011/10/30 17:09:50 +dnl ------------------- +dnl If _XOPEN_SOURCE is not defined in the compile environment, check if we +dnl can define it successfully. +AC_DEFUN([CF_TRY_XOPEN_SOURCE],[ +AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ + AC_TRY_COMPILE([ +#include +#include +#include +],[ +#ifndef _XOPEN_SOURCE +make an error +#endif], + [cf_cv_xopen_source=no], + [cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + AC_TRY_COMPILE([ +#include +#include +#include +],[ +#ifdef _XOPEN_SOURCE +make an error +#endif], + [cf_cv_xopen_source=no], + [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) + CPPFLAGS="$cf_save" + ]) +]) + +if test "$cf_cv_xopen_source" != no ; then + CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) + CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + CF_ADD_CFLAGS($cf_temp_xopen_source) +fi +]) +dnl --------------------------------------------------------------------------- +dnl CF_TYPE_OUTCHAR version: 14 updated: 2012/10/06 11:17:15 dnl --------------- dnl Check for return and param type of 3rd -- OutChar() -- param of tputs(). dnl @@ -5119,19 +5305,19 @@ done case $cf_cv_type_outchar in int*) - AC_DEFINE(OUTC_RETURN) + AC_DEFINE(OUTC_RETURN,1,[Define to 1 if tputs outc function returns a value]) ;; esac case $cf_cv_type_outchar in *char*) - AC_DEFINE(OUTC_ARGS,char c) + AC_DEFINE(OUTC_ARGS,char c,[Define to actual type to override tputs outc parameter type]) ;; esac CPPFLAGS="$cf_save_CPPFLAGS" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TYPE_SIGACTION version: 3 updated: 2000/08/12 23:18:52 +dnl CF_TYPE_SIGACTION version: 4 updated: 2012/10/06 17:56:13 dnl ----------------- dnl AC_DEFUN([CF_TYPE_SIGACTION], @@ -5144,10 +5330,10 @@ AC_CACHE_VAL(cf_cv_type_sigaction,[ [cf_cv_type_sigaction=yes], [cf_cv_type_sigaction=no])]) AC_MSG_RESULT($cf_cv_type_sigaction) -test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION) +test "$cf_cv_type_sigaction" = yes && AC_DEFINE(HAVE_TYPE_SIGACTION,1,[Define to 1 if we have the sigaction_t type]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_UNION_WAIT version: 5 updated: 1997/11/23 14:49:44 +dnl CF_UNION_WAIT version: 6 updated: 2012/10/06 08:57:51 dnl ------------- dnl Check to see if the BSD-style union wait is declared. Some platforms may dnl use this, though it is deprecated in favor of the 'int' type in Posix. @@ -5190,7 +5376,7 @@ AC_CACHE_VAL(cf_cv_type_unionwait,[ ], [cf_cv_type_unionwait=no])])]) AC_MSG_RESULT($cf_cv_type_unionwait) -test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT) +test $cf_cv_type_unionwait = yes && AC_DEFINE(HAVE_TYPE_UNIONWAIT,1,[Define to 1 if type unionwait is declared]) ])dnl dnl --------------------------------------------------------------------------- dnl CF_UPPER version: 5 updated: 2001/01/29 23:40:59 @@ -5315,7 +5501,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_PATH version: 10 updated: 2010/10/23 15:44:18 +dnl CF_WITH_PATH version: 11 updated: 2012/09/29 15:04:19 dnl ------------ dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just dnl defaulting to yes/no. @@ -5332,7 +5518,7 @@ ifelse([$4],,[withval="${$3}"],[withval= if ifelse([$5],,true,[test -n "$5"]) ; then CF_PATH_SYNTAX(withval) fi -$3="$withval" +eval $3="$withval" AC_SUBST($3)dnl ])dnl dnl --------------------------------------------------------------------------- @@ -5426,7 +5612,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 +dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -5436,16 +5622,17 @@ dnl Parameters: dnl $1 is the nominal value for _XOPEN_SOURCE dnl $2 is the nominal value for _POSIX_C_SOURCE AC_DEFUN([CF_XOPEN_SOURCE],[ +AC_REQUIRE([AC_CANONICAL_HOST]) cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) cf_xopen_source= case $host_os in #(vi -aix[[456]]*) #(vi +aix[[4-7]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin) #(vi +cygwin|msys) #(vi cf_XOPEN_SOURCE=600 ;; darwin[[0-8]].*) #(vi @@ -5453,6 +5640,7 @@ darwin[[0-8]].*) #(vi ;; darwin*) #(vi cf_xopen_source="-D_DARWIN_C_SOURCE" + cf_XOPEN_SOURCE= ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -5470,15 +5658,23 @@ hpux*) #(vi ;; irix[[56]].*) #(vi cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi CF_GNU_SOURCE ;; mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types + cf_XOPEN_SOURCE= + CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + ;; +openbsd[[4-9]]*) #(vi + # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=600 ;; openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw @@ -5492,36 +5688,11 @@ nto-qnx*) #(vi sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.1[[0-9]]) #(vi - cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -solaris2.[[1-9]]) #(vi +solaris2.*) #(vi cf_xopen_source="-D__EXTENSIONS__" ;; *) - AC_CACHE_CHECK(if we should define _XOPEN_SOURCE,cf_cv_xopen_source,[ - AC_TRY_COMPILE([#include ],[ -#ifndef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - AC_TRY_COMPILE([#include ],[ -#ifdef _XOPEN_SOURCE -make an error -#endif], - [cf_cv_xopen_source=no], - [cf_cv_xopen_source=$cf_XOPEN_SOURCE]) - CPPFLAGS="$cf_save" - ]) -]) - if test "$cf_cv_xopen_source" != no ; then - CF_REMOVE_DEFINE(CFLAGS,$CFLAGS,_XOPEN_SOURCE) - CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,_XOPEN_SOURCE) - cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - CF_ADD_CFLAGS($cf_temp_xopen_source) - fi + CF_TRY_XOPEN_SOURCE CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac @@ -5529,9 +5700,38 @@ esac if test -n "$cf_xopen_source" ; then CF_ADD_CFLAGS($cf_xopen_source) fi + +dnl In anything but the default case, we may have system-specific setting +dnl which is still not guaranteed to provide all of the entrypoints that +dnl _XOPEN_SOURCE would yield. +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then + AC_MSG_CHECKING(if _XOPEN_SOURCE really is set) + AC_TRY_COMPILE([#include ],[ +#ifndef _XOPEN_SOURCE +make an error +#endif], + [cf_XOPEN_SOURCE_set=yes], + [cf_XOPEN_SOURCE_set=no]) + AC_MSG_RESULT($cf_XOPEN_SOURCE_set) + if test $cf_XOPEN_SOURCE_set = yes + then + AC_TRY_COMPILE([#include ],[ +#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE +make an error +#endif], + [cf_XOPEN_SOURCE_set_ok=yes], + [cf_XOPEN_SOURCE_set_ok=no]) + if test $cf_XOPEN_SOURCE_set_ok = no + then + AC_MSG_WARN(_XOPEN_SOURCE is lower than requested) + fi + else + CF_TRY_XOPEN_SOURCE + fi +fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 20 updated: 2010/11/09 05:18:02 +dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06 dnl ----------- dnl Check for Xaw (Athena) libraries dnl @@ -5590,6 +5790,8 @@ if test "$PKG_CONFIG" != none ; then CF_UPPER(cf_x_athena_LIBS,HAVE_LIB_$cf_x_athena) AC_DEFINE_UNQUOTED($cf_x_athena_LIBS) + CF_TRIM_X_LIBS + AC_CACHE_CHECK(for usable $cf_x_athena/Xmu package,cf_cv_xaw_compat,[ AC_TRY_LINK([ #include @@ -5605,7 +5807,15 @@ int check = XmuCompareISOLatin1("big", " ;; *) CF_VERBOSE(work around broken package) - CF_TRY_PKG_CONFIG(xmu,,[CF_ADD_LIB_AFTER(-lXt,-lXmu)]) + cf_save_xmu="$LIBS" + cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^[ ][ ]*//' -e 's/ .*//'` + CF_TRY_PKG_CONFIG(xmu,[ + LIBS="$cf_save_xmu" + CF_ADD_LIB_AFTER($cf_first_lib,$cf_pkgconfig_libs) + ],[ + CF_ADD_LIB_AFTER($cf_first_lib,-lXmu) + ]) + CF_TRIM_X_LIBS ;; esac fi @@ -5669,7 +5879,7 @@ elif test "$cf_x_athena_inc" != default fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33 +dnl CF_X_ATHENA_LIBS version: 12 updated: 2011/07/17 19:55:02 dnl ---------------- dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw. @@ -5685,19 +5895,24 @@ for cf_path in default \ /usr/local do for cf_lib in \ - "-l$cf_x_athena_root -lXmu" \ - "-l$cf_x_athena_root -lXpm -lXmu" \ - "-l${cf_x_athena_root}_s -lXmu_s" + ${cf_x_athena_root} \ + ${cf_x_athena_root}7 \ + ${cf_x_athena_root}6 + do + for cf_libs in \ + "-l$cf_lib -lXmu" \ + "-l$cf_lib -lXpm -lXmu" \ + "-l${cf_lib}_s -lXmu_s" do if test -z "$cf_x_athena_lib" ; then cf_save="$LIBS" cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then - CF_ADD_LIBS(-L$cf_path/lib $cf_lib) - AC_MSG_CHECKING(for $cf_lib in $cf_path) + CF_ADD_LIBS(-L$cf_path/lib $cf_libs) + AC_MSG_CHECKING(for $cf_libs in $cf_path) else - CF_ADD_LIBS($cf_lib) - AC_MSG_CHECKING(for $cf_test in $cf_lib) + CF_ADD_LIBS($cf_libs) + AC_MSG_CHECKING(for $cf_test in $cf_libs) fi AC_TRY_LINK([ #include @@ -5708,12 +5923,14 @@ $cf_test((XtAppContext) 0)], [cf_result=no]) AC_MSG_RESULT($cf_result) if test "$cf_result" = yes ; then - cf_x_athena_lib="$cf_lib" + cf_x_athena_lib="$cf_libs" break fi LIBS="$cf_save" fi - done + done # cf_libs + test -n "$cf_x_athena_lib" && break + done # cf_lib done if test -z "$cf_x_athena_lib" ; then @@ -5733,7 +5950,7 @@ CF_TRY_PKG_CONFIG(Xext,,[ [CF_ADD_LIB(Xext)])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 20 updated: 2010/11/19 05:43:04 +dnl CF_X_TOOLKIT version: 21 updated: 2012/10/04 06:57:36 dnl ------------ dnl Check for X Toolkit libraries dnl @@ -5807,7 +6024,7 @@ AC_TRY_LINK([ AC_CHECK_FUNC(XtAppInitialize,,[ AC_CHECK_LIB(Xt, XtAppInitialize, - [AC_DEFINE(HAVE_LIBXT) + [AC_DEFINE(HAVE_LIBXT,1,[Define to 1 if we can compile with the Xt library]) cf_have_X_LIBS=Xt LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"],, [$X_PRE_LIBS $LIBS $X_EXTRA_LIBS])]) diff -Nurp '--exclude=.bzr*' tin-2.0.1/config.guess tin-2.2.0/config.guess --- tin-2.0.1/config.guess 2011-11-12 21:34:20.000000000 +0100 +++ tin-2.2.0/config.guess 2013-11-28 08:53:05.914458164 +0100 @@ -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, 2010, -# 2911 Free Software Foundation, Inc. +# Copyright 1992-2013 Free Software Foundation, Inc. -timestamp='2011-11-11' +timestamp='2013-11-28' # 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='2011-11-11' # 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,9 +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, 2009, 2010, 2011 -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." @@ -140,12 +132,33 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` | 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 @@ -202,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # 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} @@ -304,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ 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:*:*) @@ -803,6 +820,9 @@ EOF i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin exit ;; + *:MINGW64*:*) + echo ${UNAME_MACHINE}-pc-mingw64 + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -854,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 ;; @@ -874,59 +901,54 @@ EOF EV68*) UNAME_MACHINE=alphaev68 ;; 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__ + 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 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo ${UNAME_MACHINE}-unknown-linux-gnueabi + echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi else - echo ${UNAME_MACHINE}-unknown-linux-gnueabihf + 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 hexagon-unknown-linux-gnu + 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 @@ -945,54 +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-gnu + 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. @@ -1031,9 +1062,9 @@ EOF i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi exit ;; i*86:*:5:[678]*) @@ -1047,20 +1078,20 @@ EOF exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL + UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` + (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + && UNAME_MACHINE=i586 + (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 + echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else - echo ${UNAME_MACHINE}-pc-sysv32 + echo ${UNAME_MACHINE}-pc-sysv32 fi exit ;; pc:*:*:*) @@ -1080,9 +1111,9 @@ EOF exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 + echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 + echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) @@ -1144,10 +1175,10 @@ EOF exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 + UNAME_MACHINE=`(uname -p) 2>/dev/null` + echo ${UNAME_MACHINE}-sni-sysv4 else - echo ns32k-sni-sysv + echo ns32k-sni-sysv fi exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort @@ -1179,9 +1210,9 @@ 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 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. @@ -1196,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 ;; @@ -1222,19 +1256,31 @@ 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 test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + 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 + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 + fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) @@ -1251,7 +1297,7 @@ EOF NEO-?:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk${UNAME_RELEASE} exit ;; - NSE-?:NONSTOP_KERNEL:*:*) + NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; NSR-?:NONSTOP_KERNEL:*:*) @@ -1320,11 +1366,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 <. # # 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,9 +68,7 @@ Report bugs and patches to > confdefs.h <&6 -echo "configure:676: checking host system type" >&5 +echo "configure:681: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -720,12 +725,15 @@ fi + echo $ac_n "checking for PATH separator""... $ac_c" 1>&6 +echo "configure:730: checking for PATH separator" >&5 case $cf_cv_system_name in os2*) PATH_SEPARATOR=';' ;; - *) PATH_SEPARATOR=':' ;; + *) ${PATH_SEPARATOR:=':'} ;; esac + echo "$ac_t""$PATH_SEPARATOR" 1>&6 # Check whether --with-install-prefix or --without-install-prefix was given. @@ -750,7 +758,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -767,7 +775,7 @@ case ".$withval" in #(vi esac fi -DESTDIR="$withval" +eval DESTDIR="$withval" case ".$DESTDIR" in # (vi ./) DESTDIR= @@ -804,7 +812,7 @@ case "$host_os" in # Extract the first word of "xlc", so it can be a program name with args. set dummy xlc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:808: checking for $ac_word" >&5 +echo "configure:816: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XLC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -847,234 +855,692 @@ fi esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru sv tr" +ALL_LINGUAS="da de en_GB et fr ru sv tr zh_TW" ### Checks for programs save_CFLAGS="$CFLAGS" -# Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:858: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:888: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# -gt 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" - fi -fi -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:939: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -CC="$ac_cv_prog_CC" -if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - ;; - esac - fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } -fi +# This should have been defined by AC_PROG_CC +: ${CC:=cc} -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:971: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo $ac_n "checking \$CC variable""... $ac_c" 1>&6 +echo "configure:869: checking \$CC variable" >&5 +case "$CC" in #(vi +*[\ \ ]-[IUD]*) + echo "$ac_t""broken" 1>&6 + echo "configure: warning: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" 1>&2 + # humor him... + cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` + CC=`echo "$CC" | sed -e 's/[ ].*//'` + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +for cf_add_cflags in $cf_flags +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` -cat > conftest.$ac_ext << EOF + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes -#line 982 "configure" -#include "confdefs.h" + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` -main(){return(0);} -EOF -if { (eval echo configure:987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no - else - ac_cv_prog_cc_cross=yes - fi -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no -fi -rm -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1013: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1018: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes -else - ac_cv_prog_gcc=no +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 -if test $ac_cv_prog_gcc = yes; then - GCC=yes -else - GCC= -fi -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1046: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + + ;; +*) + echo "$ac_t""ok" 1>&6 + ;; +esac + + +echo $ac_n "checking for ${CC:-cc} option to accept ANSI C""... $ac_c" 1>&6 +echo "configure:967: checking for ${CC:-cc} option to accept ANSI C" >&5 +if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cf_cv_ansi_cc=no +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX -Aa -D_HPUX_SOURCE +# SVR4 -Xc +# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) +for cf_arg in "-DCC_HAS_PROTOS" \ + "" \ + -qlanglvl=ansi \ + -std1 \ + -Ae \ + "-Aa -D_HPUX_SOURCE" \ + -Xc +do + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_arg +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_ansi_cc="$cf_arg"; break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* +done +CFLAGS="$cf_save_CFLAGS" +CPPFLAGS="$cf_save_CPPFLAGS" + +fi + +echo "$ac_t""$cf_cv_ansi_cc" 1>&6 + +if test "$cf_cv_ansi_cc" != "no"; then +if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_cv_ansi_cc +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + +else + cat >> confdefs.h <<\EOF +#define CC_HAS_PROTOS 1 +EOF + +fi +fi + + +# Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1201: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1231: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_prog_rejected=no + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1282: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1314: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext << EOF + +#line 1325 "configure" +#include "confdefs.h" + +main(){return(0);} +EOF +if { (eval echo configure:1330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + ac_cv_prog_cc_works=yes + # If we can't run a trivial program, we are probably using a cross compiler. + if (./conftest; exit) 2>/dev/null; then + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +if test $ac_cv_prog_cc_works = no; then + { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +fi +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 +echo "configure:1356: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 +cross_compiling=$ac_cv_prog_cc_cross + +echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 +echo "configure:1361: checking whether we are using GNU C" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:1389: checking whether ${CC-cc} accepts -g" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then ac_cv_prog_cc_g=yes else ac_cv_prog_cc_g=no fi -rm -f conftest* +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi +else + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi + + + +GCC_VERSION=none +if test "$GCC" = yes ; then + echo $ac_n "checking version of $CC""... $ac_c" 1>&6 +echo "configure:1425: checking version of $CC" >&5 + GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" + test -z "$GCC_VERSION" && GCC_VERSION=unknown + echo "$ac_t""$GCC_VERSION" 1>&6 +fi + + + +if test "$cf_cv_ansi_cc" = "no"; then + { echo "configure: error: Your compiler does not appear to recognize prototypes. +You have the following choices: + a. adjust your compiler options + b. get an up-to-date compiler + c. use a wrapper such as unproto" 1>&2; exit 1; } +fi + + +# This should have been defined by AC_PROG_CC +: ${CC:=cc} + +echo $ac_n "checking \$CC variable""... $ac_c" 1>&6 +echo "configure:1446: checking \$CC variable" >&5 +case "$CC" in #(vi +*[\ \ ]-[IUD]*) + echo "$ac_t""broken" 1>&6 + echo "configure: warning: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" 1>&2 + # humor him... + cf_flags=`echo "$CC" | sed -e 's/^[^ ]*[ ]//'` + CC=`echo "$CC" | sed -e 's/[ ].*//'` + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_flags +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" fi -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi + + + + ;; +*) + echo "$ac_t""ok" 1>&6 + ;; +esac + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1078: checking how to run the C preprocessor" >&5 +echo "configure:1544: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1089,13 +1555,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1106,13 +1572,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1123,13 +1589,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1133: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1155,13 +1621,13 @@ echo "$ac_t""$CPP" 1>&6 if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:1159: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1625: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -1179,7 +1645,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1201,7 +1667,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional fi echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1205: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1671: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1239,7 +1705,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1243: checking for a BSD compatible install" >&5 +echo "configure:1709: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1316,14 +1782,14 @@ EOF do rm -f y.tab.ch echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1320: checking for $cf_prog" >&5 +echo "configure:1786: checking for $cf_prog" >&5 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1323: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo configure:1789: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then mv y.tab.c conftest.c rm -f y.tab.h if test "$cf_prog" = 'bison -y' ; then - if { (eval echo configure:1327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo configure:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then cf_result=yes fi else @@ -1347,7 +1813,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1351: checking for $ac_word" >&5 +echo "configure:1817: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LINT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1377,29 +1843,6 @@ test -n "$LINT" && break done test -n "$LINT" || LINT=":" -echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1382: checking for AIX" >&5 -cat > conftest.$ac_ext <&5 | - egrep "yes" >/dev/null 2>&1; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF -#define _ALL_SOURCE 1 -EOF - -else - rm -rf conftest* - echo "$ac_t""no" 1>&6 -fi -rm -f conftest* - @@ -1408,10 +1851,10 @@ cf_POSIX_C_SOURCE=199506L cf_xopen_source= case $host_os in #(vi -aix[456]*) #(vi +aix[4-7]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin) #(vi +cygwin|msys) #(vi cf_XOPEN_SOURCE=600 ;; darwin[0-8].*) #(vi @@ -1419,6 +1862,7 @@ darwin[0-8].*) #(vi ;; darwin*) #(vi cf_xopen_source="-D_DARWIN_C_SOURCE" + cf_XOPEN_SOURCE= ;; freebsd*|dragonfly*) #(vi # 5.x headers associate @@ -1436,17 +1880,18 @@ hpux*) #(vi ;; irix[56].*) #(vi cf_xopen_source="-D_SGI_SOURCE" + cf_XOPEN_SOURCE= ;; linux*|gnu*|mint*|k*bsd*-gnu) #(vi echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1444: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1889: checking if we must define _GNU_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -1456,7 +1901,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1466,7 +1911,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1476,7 +1921,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1493,15 +1938,226 @@ rm -f conftest* fi -echo "$ac_t""$cf_cv_gnu_source" 1>&6 -test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" +echo "$ac_t""$cf_cv_gnu_source" 1>&6 +test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" + + ;; +mirbsd*) #(vi + # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types + cf_XOPEN_SOURCE= + +cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE + +cf_save_CFLAGS="$CFLAGS" +cf_save_CPPFLAGS="$CPPFLAGS" + + +cf_trim_CFLAGS=`echo "$cf_save_CFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + + +cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \ + sed -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_POSIX_C_SOURCE"'\(=[^ ]*\)\?$//g'` + + +echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 +echo "configure:1967: checking if we should define _POSIX_C_SOURCE" >&5 +if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + +echo "${as_me:-configure}:1973: testing if the symbol is already defined go no further ..." 1>&5 + + cat > conftest.$ac_ext < +int main() { + +#ifndef _POSIX_C_SOURCE +make an error +#endif +; return 0; } +EOF +if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_posix_c_source=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_want_posix_source=no + case .$cf_POSIX_C_SOURCE in #(vi + .[12]??*) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + ;; + .2) #(vi + cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" + cf_want_posix_source=yes + ;; + .*) + cf_want_posix_source=yes + ;; + esac + if test "$cf_want_posix_source" = yes ; then + cat > conftest.$ac_ext < +int main() { + +#ifdef _POSIX_SOURCE +make an error +#endif +; return 0; } +EOF +if { (eval echo configure:2018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_posix_c_source="$cf_cv_posix_c_source -D_POSIX_SOURCE" +fi +rm -f conftest* + fi + +echo "${as_me:-configure}:2029: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 + + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" + +echo "${as_me:-configure}:2034: testing if the second compile does not leave our definition intact error ..." 1>&5 + + cat > conftest.$ac_ext < +int main() { + +#ifndef _POSIX_C_SOURCE +make an error +#endif +; return 0; } +EOF +if { (eval echo configure:2047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_posix_c_source=no +fi +rm -f conftest* + CFLAGS="$cf_save_CFLAGS" + CPPFLAGS="$cf_save_CPPFLAGS" + +fi +rm -f conftest* + +fi + +echo "$ac_t""$cf_cv_posix_c_source" 1>&6 + +if test "$cf_cv_posix_c_source" != no ; then + CFLAGS="$cf_trim_CFLAGS" + CPPFLAGS="$cf_trim_CPPFLAGS" + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_cv_posix_c_source +do +case $cf_fix_cppflags in +no) + case $cf_add_cflags in #(vi + -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi + case $cf_add_cflags in + -D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=yes + + if test $cf_fix_cppflags = yes ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + elif test "${cf_tst_cflags}" = "\"'" ; then + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + continue + fi + ;; + esac + case "$CPPFLAGS" in + *$cf_add_cflags) #(vi + ;; + *) #(vi + case $cf_add_cflags in #(vi + -D*) + cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` + + ;; + esac + cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" + ;; + esac + ;; + *) + cf_new_cflags="$cf_new_cflags $cf_add_cflags" + ;; + esac + ;; +yes) + cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" + + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` + + test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + && test -z "${cf_tst_cflags}" \ + && cf_fix_cppflags=no + ;; +esac +done + +if test -n "$cf_new_cflags" ; then + + CFLAGS="$CFLAGS $cf_new_cflags" +fi + +if test -n "$cf_new_cppflags" ; then + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" +fi + +if test -n "$cf_new_extra_cppflags" ; then + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" +fi + + + + +fi + ;; -mirbsd*) #(vi - # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks - ;; netbsd*) #(vi - # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + cf_xopen_source="-D_NETBSD_SOURCE" # setting _XOPEN_SOURCE breaks IPv6 for lynx on NetBSD 1.6, breaks xterm, is not needed for ncursesw + ;; +openbsd[4-9]*) #(vi + # setting _XOPEN_SOURCE lower than 500 breaks g++ compile with wchar.h, needed for ncursesw + cf_xopen_source="-D_BSD_SOURCE" + cf_XOPEN_SOURCE=600 ;; openbsd*) #(vi # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw @@ -1515,23 +2171,25 @@ nto-qnx*) #(vi sco*) #(vi # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.1[0-9]) #(vi - cf_xopen_source="-D__EXTENSIONS__ -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" - ;; -solaris2.[1-9]) #(vi +solaris2.*) #(vi cf_xopen_source="-D__EXTENSIONS__" ;; *) - echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 -echo "configure:1527: checking if we should define _XOPEN_SOURCE" >&5 + +echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 +echo "configure:2181: checking if we should define _XOPEN_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include #include + int main() { #ifndef _XOPEN_SOURCE @@ -1539,7 +2197,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -1549,9 +2207,13 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat > conftest.$ac_ext < +#include #include + int main() { #ifdef _XOPEN_SOURCE @@ -1559,7 +2221,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1563: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -1577,19 +2239,20 @@ rm -f conftest* fi echo "$ac_t""$cf_cv_xopen_source" 1>&6 - if test "$cf_cv_xopen_source" != no ; then - + +if test "$cf_cv_xopen_source" != no ; then + CFLAGS=`echo "$CFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` - + CPPFLAGS=`echo "$CPPFLAGS" | \ sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` - cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" - + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" + cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= @@ -1671,7 +2334,8 @@ fi - fi +fi + cf_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE @@ -1690,16 +2354,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAG echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6 -echo "configure:1694: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:2358: checking if we should define _POSIX_C_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:1700: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2364: testing if the symbol is already defined go no further ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1709,7 +2373,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_posix_c_source=no else @@ -1731,7 +2395,7 @@ else esac if test "$cf_want_posix_source" = yes ; then cat > conftest.$ac_ext < int main() { @@ -1741,7 +2405,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1752,15 +2416,15 @@ fi rm -f conftest* fi -echo "${as_me:-configure}:1756: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:2420: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 CFLAGS="$cf_trim_CFLAGS" CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source" -echo "${as_me:-configure}:1761: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:2425: testing if the second compile does not leave our definition intact error ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1770,7 +2434,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1774: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -1965,306 +2629,143 @@ fi fi - -echo $ac_n "checking if SIGWINCH is defined""... $ac_c" 1>&6 -echo "configure:1971: checking if SIGWINCH is defined" >&5 -if eval "test \"`echo '$''{'cf_cv_define_sigwinch'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - +if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then + echo $ac_n "checking if _XOPEN_SOURCE really is set""... $ac_c" 1>&6 +echo "configure:2635: checking if _XOPEN_SOURCE really is set" >&5 cat > conftest.$ac_ext < -#include - +#include int main() { -int x = SIGWINCH + +#ifndef _XOPEN_SOURCE +make an error +#endif ; return 0; } EOF -if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cf_cv_define_sigwinch=yes + cf_XOPEN_SOURCE_set=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - cat > conftest.$ac_ext <&6 + if test $cf_XOPEN_SOURCE_set = yes + then + cat > conftest.$ac_ext < -#include - +#include int main() { -int x = SIGWINCH + +#if (_XOPEN_SOURCE - 0) < $cf_XOPEN_SOURCE +make an error +#endif ; return 0; } EOF -if { (eval echo configure:2008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cf_cv_define_sigwinch=maybe + cf_XOPEN_SOURCE_set_ok=yes else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - cf_cv_define_sigwinch=no -fi -rm -f conftest* - + cf_XOPEN_SOURCE_set_ok=no fi rm -f conftest* - -fi - -echo "$ac_t""$cf_cv_define_sigwinch" 1>&6 - -if test "$cf_cv_define_sigwinch" = maybe ; then -echo $ac_n "checking for actual SIGWINCH definition""... $ac_c" 1>&6 -echo "configure:2028: checking for actual SIGWINCH definition" >&5 -if eval "test \"`echo '$''{'cf_cv_fixup_sigwinch'+set}'`\" = set"; then + if test $cf_XOPEN_SOURCE_set_ok = no + then + echo "configure: warning: _XOPEN_SOURCE is lower than requested" 1>&2 + fi + else + +echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6 +echo "configure:2688: checking if we should define _XOPEN_SOURCE" >&5 +if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -cf_cv_fixup_sigwinch=unknown -cf_sigwinch=32 -while test $cf_sigwinch != 1 -do cat > conftest.$ac_ext < +#include #include -#include int main() { -#if SIGWINCH != $cf_sigwinch +#ifndef _XOPEN_SOURCE make an error #endif -int x = SIGWINCH -; return 0; } -EOF -if { (eval echo configure:2055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - cf_cv_fixup_sigwinch=$cf_sigwinch - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* - -cf_sigwinch=`expr $cf_sigwinch - 1` -done - -fi - -echo "$ac_t""$cf_cv_fixup_sigwinch" 1>&6 - - if test "$cf_cv_fixup_sigwinch" != unknown ; then - CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" - fi -fi - - - echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:2079: checking for strerror in -lcposix" >&5 -ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lcposix $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lcposix" -else - echo "$ac_t""no" 1>&6 -fi - - - - -echo $ac_n "checking for ${CC:-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:2122: checking for ${CC:-cc} option to accept ANSI C" >&5 -if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - -cf_cv_ansi_cc=no -cf_save_CFLAGS="$CFLAGS" -cf_save_CPPFLAGS="$CPPFLAGS" -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX -Aa -D_HPUX_SOURCE -# SVR4 -Xc -# UnixWare 1.2 (cannot use -Xc, since ANSI/POSIX clashes) -for cf_arg in "-DCC_HAS_PROTOS" \ - "" \ - -qlanglvl=ansi \ - -std1 \ - -Ae \ - "-Aa -D_HPUX_SOURCE" \ - -Xc -do - -cf_fix_cppflags=no -cf_new_cflags= -cf_new_cppflags= -cf_new_extra_cppflags= - -for cf_add_cflags in $cf_arg -do -case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi - case $cf_add_cflags in - -D*) - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=yes - - if test $cf_fix_cppflags = yes ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - elif test "${cf_tst_cflags}" = "\"'" ; then - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - continue - fi - ;; - esac - case "$CPPFLAGS" in - *$cf_add_cflags) #(vi - ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) - cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` - -CPPFLAGS=`echo "$CPPFLAGS" | \ - sed -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?[ ]/ /g' \ - -e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ ]*\)\?$//g'` - - ;; - esac - cf_new_cppflags="$cf_new_cppflags $cf_add_cflags" - ;; - esac - ;; - *) - cf_new_cflags="$cf_new_cflags $cf_add_cflags" - ;; - esac - ;; -yes) - cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags" - - cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ - && test -z "${cf_tst_cflags}" \ - && cf_fix_cppflags=no - ;; -esac -done - -if test -n "$cf_new_cflags" ; then - - CFLAGS="$CFLAGS $cf_new_cflags" -fi - -if test -n "$cf_new_cppflags" ; then - - CPPFLAGS="$CPPFLAGS $cf_new_cppflags" -fi - -if test -n "$cf_new_extra_cppflags" ; then - - EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" -fi - - - - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_xopen_source=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" + cat > conftest.$ac_ext < +#include +#include int main() { - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; +#ifdef _XOPEN_SOURCE +make an error +#endif ; return 0; } EOF -if { (eval echo configure:2244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cf_cv_ansi_cc="$cf_arg"; break + cf_cv_xopen_source=no else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_xopen_source=$cf_XOPEN_SOURCE +fi +rm -f conftest* + CPPFLAGS="$cf_save" + fi rm -f conftest* -done -CFLAGS="$cf_save_CFLAGS" -CPPFLAGS="$cf_save_CPPFLAGS" fi -echo "$ac_t""$cf_cv_ansi_cc" 1>&6 +echo "$ac_t""$cf_cv_xopen_source" 1>&6 -if test "$cf_cv_ansi_cc" != "no"; then -if test ".$cf_cv_ansi_cc" != ".-DCC_HAS_PROTOS"; then +if test "$cf_cv_xopen_source" != no ; then + +CFLAGS=`echo "$CFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + + +CPPFLAGS=`echo "$CPPFLAGS" | \ + sed -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?[ ]/ /g' \ + -e 's/-[UD]'"_XOPEN_SOURCE"'\(=[^ ]*\)\?$//g'` + + cf_temp_xopen_source="-D_XOPEN_SOURCE=$cf_cv_xopen_source" cf_fix_cppflags=no cf_new_cflags= cf_new_cppflags= cf_new_extra_cppflags= -for cf_add_cflags in $cf_cv_ansi_cc +for cf_add_cflags in $cf_temp_xopen_source do case $cf_fix_cppflags in no) @@ -2340,30 +2841,126 @@ fi +fi + + fi +fi + + +echo $ac_n "checking if SIGWINCH is defined""... $ac_c" 1>&6 +echo "configure:2852: checking if SIGWINCH is defined" >&5 +if eval "test \"`echo '$''{'cf_cv_define_sigwinch'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - cat >> confdefs.h <<\EOF -#define CC_HAS_PROTOS 1 + + cat > conftest.$ac_ext < +#include + +int main() { +int x = SIGWINCH +; return 0; } +EOF +if { (eval echo configure:2868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_define_sigwinch=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cat > conftest.$ac_ext < +#include + +int main() { +int x = SIGWINCH +; return 0; } EOF +if { (eval echo configure:2889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_define_sigwinch=maybe +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_cv_define_sigwinch=no +fi +rm -f conftest* fi +rm -f conftest* + fi +echo "$ac_t""$cf_cv_define_sigwinch" 1>&6 -if test "$cf_cv_ansi_cc" = "no"; then - { echo "configure: error: Your compiler does not appear to recognize prototypes. -You have the following choices: - a. adjust your compiler options - b. get an up-to-date compiler - c. use a wrapper such as unproto" 1>&2; exit 1; } +if test "$cf_cv_define_sigwinch" = maybe ; then +echo $ac_n "checking for actual SIGWINCH definition""... $ac_c" 1>&6 +echo "configure:2909: checking for actual SIGWINCH definition" >&5 +if eval "test \"`echo '$''{'cf_cv_fixup_sigwinch'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + +cf_cv_fixup_sigwinch=unknown +cf_sigwinch=32 +while test $cf_sigwinch != 1 +do + cat > conftest.$ac_ext < +#include + +int main() { + +#if SIGWINCH != $cf_sigwinch +make an error +#endif +int x = SIGWINCH +; return 0; } +EOF +if { (eval echo configure:2936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + cf_cv_fixup_sigwinch=$cf_sigwinch + break +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + +cf_sigwinch=`expr $cf_sigwinch - 1` +done + +fi + +echo "$ac_t""$cf_cv_fixup_sigwinch" 1>&6 + + if test "$cf_cv_fixup_sigwinch" != unknown ; then + CPPFLAGS="$CPPFLAGS -DSIGWINCH=$cf_cv_fixup_sigwinch" + fi fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2362: checking for Cygwin environment" >&5 +echo "configure:2959: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2391,19 +2988,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:2395: checking for mingw32 environment" >&5 +echo "configure:2992: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -2435,7 +3032,7 @@ esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2439: checking for executable suffix" >&5 +echo "configure:3036: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2445,7 +3042,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do if test -f $file ; then case $file in @@ -2469,13 +3066,13 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2473: checking for object suffix" >&5 +echo "configure:3070: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do if test -f $ac_file ; then case $ac_file in @@ -2515,7 +3112,7 @@ LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2519: checking whether ln -s works" >&5 +echo "configure:3116: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2538,6 +3135,7 @@ fi + if test "$cross_compiling" = yes ; then # defaults that we might want to override @@ -2559,7 +3157,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2563: checking for $ac_word" >&5 +echo "configure:3161: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BUILD_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2591,11 +3189,11 @@ done fi echo $ac_n "checking for native build C compiler""... $ac_c" 1>&6 -echo "configure:2595: checking for native build C compiler" >&5 +echo "configure:3193: checking for native build C compiler" >&5 echo "$ac_t""$BUILD_CC" 1>&6 echo $ac_n "checking for native build C preprocessor""... $ac_c" 1>&6 -echo "configure:2599: checking for native build C preprocessor" >&5 +echo "configure:3197: checking for native build C preprocessor" >&5 # Check whether --with-build-cpp or --without-build-cpp was given. if test "${with_build_cpp+set}" = set; then @@ -2608,7 +3206,7 @@ fi echo "$ac_t""$BUILD_CPP" 1>&6 echo $ac_n "checking for native build C flags""... $ac_c" 1>&6 -echo "configure:2612: checking for native build C flags" >&5 +echo "configure:3210: checking for native build C flags" >&5 # Check whether --with-build-cflags or --without-build-cflags was given. if test "${with_build_cflags+set}" = set; then @@ -2619,7 +3217,7 @@ fi echo "$ac_t""$BUILD_CFLAGS" 1>&6 echo $ac_n "checking for native build C preprocessor-flags""... $ac_c" 1>&6 -echo "configure:2623: checking for native build C preprocessor-flags" >&5 +echo "configure:3221: checking for native build C preprocessor-flags" >&5 # Check whether --with-build-cppflags or --without-build-cppflags was given. if test "${with_build_cppflags+set}" = set; then @@ -2630,7 +3228,7 @@ fi echo "$ac_t""$BUILD_CPPFLAGS" 1>&6 echo $ac_n "checking for native build linker-flags""... $ac_c" 1>&6 -echo "configure:2634: checking for native build linker-flags" >&5 +echo "configure:3232: checking for native build linker-flags" >&5 # Check whether --with-build-ldflags or --without-build-ldflags was given. if test "${with_build_ldflags+set}" = set; then @@ -2641,7 +3239,7 @@ fi echo "$ac_t""$BUILD_LDFLAGS" 1>&6 echo $ac_n "checking for native build linker-libraries""... $ac_c" 1>&6 -echo "configure:2645: checking for native build linker-libraries" >&5 +echo "configure:3243: checking for native build linker-libraries" >&5 # Check whether --with-build-libs or --without-build-libs was given. if test "${with_build_libs+set}" = set; then @@ -2684,7 +3282,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:2688: checking build system type" >&5 +echo "configure:3286: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -2710,7 +3308,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2714: checking for $ac_word" >&5 +echo "configure:3312: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2742,7 +3340,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2746: checking for $ac_word" >&5 +echo "configure:3344: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2777,7 +3375,7 @@ fi # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args. set dummy ${ac_tool_prefix}ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2781: checking for $ac_word" >&5 +echo "configure:3379: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2809,7 +3407,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ld", so it can be a program name with args. set dummy ld; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2813: checking for $ac_word" >&5 +echo "configure:3411: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2845,7 +3443,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2849: checking for $ac_word" >&5 +echo "configure:3447: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2877,7 +3475,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2881: checking for $ac_word" >&5 +echo "configure:3479: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2914,7 +3512,7 @@ fi echo $ac_n "checking for options to update archives""... $ac_c" 1>&6 -echo "configure:2918: checking for options to update archives" >&5 +echo "configure:3516: checking for options to update archives" >&5 if eval "test \"`echo '$''{'cf_cv_ar_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2935,62 +3533,181 @@ else rm -f conftest.$ac_cv_objext rm -f conftest.a - cat >conftest.$ac_ext <conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; } ; then + echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 + $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null + if test -f conftest.a ; then + cf_cv_ar_flags=$cf_ar_flags + break + fi + else + test -n "$verbose" && echo " cannot compile test-program" 1>&6 + +echo "${as_me:-configure}:3551: testing cannot compile test-program ..." 1>&5 + + + break + fi + done + rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext + +fi + +echo "$ac_t""$cf_cv_ar_flags" 1>&6 + +if test -n "$ARFLAGS" ; then + if test -n "$cf_cv_ar_flags" ; then + ARFLAGS="$ARFLAGS $cf_cv_ar_flags" + fi +else + ARFLAGS=$cf_cv_ar_flags +fi + + + + +case "$host_cpu:$host_vendor:$host_os" in + # check for MacOS X, exclude Darwin on ix86 +# powerpc:apple:darwin*) #(vi +# AC_DEFINE(MAC_OS_X) +# ;; + # check for cygwin environment + # -DSTATIC is needed for pcre + *:*:*cygwin*) #(vi + PCRE_DEFINES="$PCRE_DEFINES -DSTATIC" + ;; + # SEIUX doesn't have any useful preprocessor symbol + mips:sei:seiux*) #(vi + cat >> confdefs.h <<\EOF +#define SEIUX 1 +EOF + + ;; +esac + +echo $ac_n "checking if you would like to use heapsort""... $ac_c" 1>&6 +echo "configure:3594: checking if you would like to use heapsort" >&5 + +# Check whether --enable-heapsort or --disable-heapsort was given. +if test "${enable_heapsort+set}" = set; then + enableval="$enable_heapsort" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cf_use_heapsort=yes + else + cf_use_heapsort=no + fi +else + enableval=no + cf_use_heapsort=no + +fi + +echo "$ac_t""$cf_use_heapsort" 1>&6 +if test "x$cf_use_heapsort" = xyes; then + for ac_func in heapsort +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3616: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_$ac_func=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&5; (eval $ac_compile) 2>&5; } ; then - echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5 - $AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null - if test -f conftest.a ; then - cf_cv_ar_flags=$cf_ar_flags - break - fi - else - test -n "$verbose" && echo " cannot compile test-program" 1>&6 - -echo "${as_me:-configure}:2953: testing cannot compile test-program ..." 1>&5 + +else + echo "$ac_t""no" 1>&6 +fi +done + if test x"$ac_cv_func_heapsort" = xyes; then + echo $ac_n "checking if its prototype is compatible with qsort""... $ac_c" 1>&6 +echo "configure:3670: checking if its prototype is compatible with qsort" >&5 + cat > conftest.$ac_ext < +#include +extern int my_compare(const void *, const void *); -fi +int main() { -echo "$ac_t""$cf_cv_ar_flags" 1>&6 + char *base = 0; + heapsort((void *)0, 1, 2, my_compare); -if test -n "$ARFLAGS" ; then - if test -n "$cf_cv_ar_flags" ; then - ARFLAGS="$ARFLAGS $cf_cv_ar_flags" - fi +; return 0; } +EOF +if { (eval echo configure:3686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : else - ARFLAGS=$cf_cv_ar_flags + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + cf_use_heapsort=no fi +rm -f conftest*; + echo "$ac_t""$cf_use_heapsort" 1>&6 + else + test -n "$verbose" && echo " will use our own heapsort function" 1>&6 +echo "${as_me:-configure}:3699: testing will use our own heapsort function ..." 1>&5 - -case "$host_cpu:$host_vendor:$host_os" in - # check for MacOS X, exclude Darwin on ix86 -# powerpc:apple:darwin*) #(vi -# AC_DEFINE(MAC_OS_X) -# ;; - # check for cygwin environment - # -DSTATIC is needed for pcre - *:*:*cygwin*) #(vi - PCRE_DEFINES="$PCRE_DEFINES -DSTATIC" - ;; - # SEIUX doesn't have any useful preprocessor symbol - mips:sei:seiux*) #(vi - cat >> confdefs.h <<\EOF -#define SEIUX 1 + EXTRAO_DEP='' + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/heapsort.o" + fi +fi +if test "x$cf_use_heapsort" = xyes; then + cat >> confdefs.h <<\EOF +#define USE_HEAPSORT 1 EOF - ;; -esac - +fi # Check whether --with-ispell or --without-ispell was given. @@ -3005,7 +3722,7 @@ if test "${with_ispell+set}" = set; then *) # user supplied option-value for "--with-ispell=path" echo $ac_n "checking for ispell""... $ac_c" 1>&6 -echo "configure:3009: checking for ispell" >&5 +echo "configure:3726: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:3026: checking for $ac_word" >&5 +echo "configure:3743: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_ISPELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3079,7 +3796,7 @@ if test "${with_metamail+set}" = set; th *) # user supplied option-value for "--with-metamail=path" echo $ac_n "checking for metamail""... $ac_c" 1>&6 -echo "configure:3083: checking for metamail" >&5 +echo "configure:3800: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:3100: checking for $ac_word" >&5 +echo "configure:3817: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_METAMAIL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3153,7 +3870,7 @@ if test "${with_sum+set}" = set; then *) # user supplied option-value for "--with-sum=path" echo $ac_n "checking for sum""... $ac_c" 1>&6 -echo "configure:3157: checking for sum" >&5 +echo "configure:3874: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:3174: checking for $ac_word" >&5 +echo "configure:3891: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SUM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3217,12 +3934,12 @@ fi if test $ac_cv_path_PATH_SUM then echo $ac_n "checking if $ac_cv_path_PATH_SUM takes -r""... $ac_c" 1>&6 -echo "configure:3221: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:3938: checking if $ac_cv_path_PATH_SUM takes -r" >&5 if eval "test \"`echo '$''{'ac_cv_prog_sum_r'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:3226: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } +if { ac_try='$ac_cv_path_PATH_SUM -r config.log 1>&5'; { (eval echo configure:3943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -3252,7 +3969,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:3256: checking for default editor" >&5 +echo "configure:3973: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -3280,7 +3997,7 @@ if test -z "$DEFAULT_EDITOR" ; then # Extract the first word of "vi", so it can be a program name with args. set dummy vi; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3284: checking for $ac_word" >&5 +echo "configure:4001: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_EDITOR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3325,7 +4042,7 @@ EOF # Extract the first word of "sendmail", so it can be a program name with args. set dummy sendmail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3329: checking for $ac_word" >&5 +echo "configure:4046: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3379,7 +4096,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mailx", so it can be a program name with args. set dummy mailx; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3383: checking for $ac_word" >&5 +echo "configure:4100: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3416,7 +4133,7 @@ if test -z "$DEFAULT_MAILER" ; then # Extract the first word of "mail", so it can be a program name with args. set dummy mail; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3420: checking for $ac_word" >&5 +echo "configure:4137: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_MAILER'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3450,7 +4167,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:3454: checking for default mailer" >&5 +echo "configure:4171: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -3477,7 +4194,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:3481: checking for incoming-mail directory" >&5 +echo "configure:4198: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -3523,7 +4240,7 @@ echo "$ac_t""$DEFAULT_MAILBOX" 1>&6 ## PGP Support echo $ac_n "checking if you want PGP/GPG-Support""... $ac_c" 1>&6 -echo "configure:3527: checking if you want PGP/GPG-Support" >&5 +echo "configure:4244: checking if you want PGP/GPG-Support" >&5 # Check whether --enable-pgp-gpg or --disable-pgp-gpg was given. if test "${enable_pgp_gpg+set}" = set; then @@ -3555,7 +4272,7 @@ if test "${with_pgp+set}" = set; then *) # user supplied option-value for "--with-pgp=path" echo $ac_n "checking for pgp""... $ac_c" 1>&6 -echo "configure:3559: checking for pgp" >&5 +echo "configure:4276: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:3576: checking for $ac_word" >&5 +echo "configure:4293: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3630,7 +4347,7 @@ if test "${with_pgpk+set}" = set; then *) # user supplied option-value for "--with-pgpk=path" echo $ac_n "checking for pgpk""... $ac_c" 1>&6 -echo "configure:3634: checking for pgpk" >&5 +echo "configure:4351: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:3651: checking for $ac_word" >&5 +echo "configure:4368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_PGPK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3705,7 +4422,7 @@ if test "${with_gpg+set}" = set; then *) # user supplied option-value for "--with-gpg=path" echo $ac_n "checking for gpg""... $ac_c" 1>&6 -echo "configure:3709: checking for gpg" >&5 +echo "configure:4426: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:3726: checking for $ac_word" >&5 +echo "configure:4443: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_GPG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3781,7 +4498,7 @@ if test "${with_slrnface+set}" = set; th *) # user supplied option-value for "--with-slrnface=path" echo $ac_n "checking for slrnface""... $ac_c" 1>&6 -echo "configure:3785: checking for slrnface" >&5 +echo "configure:4502: checking for slrnface" >&5 ac_cv_path_PATH_SLRNFACE="$withval" cat >> confdefs.h <&6 -echo "configure:3802: checking for $ac_word" >&5 +echo "configure:4519: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PATH_SLRNFACE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3841,6 +4558,10 @@ EOF fi +if test -n "$ac_cv_path_PATH_SLRNFACE"; then + EXTRAO_DEP="" + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/xface.o" +fi ## Default shell @@ -3854,13 +4575,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:3858: checking for the default shell program" >&5 +echo "configure:4579: checking for the default shell program" >&5 cf_shell_progs="$cf_cv_default_shell" if test -z "$cf_shell_progs" ; then cf_shell_progs="sh ksh bash zsh pdksh mksh jsh keysh ash dash" # TIN preferred default shell for BSD systems is csh. Others are sh. cat > conftest.$ac_ext < @@ -3873,7 +4594,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:3877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -3883,11 +4604,11 @@ fi rm -f conftest* fi -echo "${as_me:-configure}:3887: testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "${as_me:-configure}:4608: testing paths of shell programs: $cf_shell_progs ..." 1>&5 if test -s /etc/shells && test `egrep -c -v '^(#| | |$)' /etc/shells` -gt 0; then -echo "${as_me:-configure}:3891: testing /etc/shells ..." 1>&5 +echo "${as_me:-configure}:4612: testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -3922,14 +4643,14 @@ echo "${as_me:-configure}:3891: testing echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "${as_me:-configure}:3926: testing $PATH ..." 1>&5 +echo "${as_me:-configure}:4647: testing $PATH ..." 1>&5 for ac_prog in $cf_shell_progs do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3933: checking for $ac_word" >&5 +echo "configure:4654: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DEFAULT_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3982,7 +4703,7 @@ EOF ### check for this early, since it'll override several options echo $ac_n "checking if NNTP-support will be used""... $ac_c" 1>&6 -echo "configure:3986: checking if NNTP-support will be used" >&5 +echo "configure:4707: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then @@ -4004,7 +4725,7 @@ echo "$ac_t""$enableval" 1>&6 USE_SPOOLDIR=yes if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking whether to be NNTP_ONLY""... $ac_c" 1>&6 -echo "configure:4008: checking whether to be NNTP_ONLY" >&5 +echo "configure:4729: checking whether to be NNTP_ONLY" >&5 # Check whether --enable-nntp-only or --disable-nntp-only was given. if test "${enable_nntp_only+set}" = set; then @@ -4036,7 +4757,7 @@ fi ### use option --enable-debug to compile-in test/development code echo $ac_n "checking if you want to compile-in debug support""... $ac_c" 1>&6 -echo "configure:4040: checking if you want to compile-in debug support" >&5 +echo "configure:4761: checking if you want to compile-in debug support" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -4063,7 +4784,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --disable-echo to suppress full display compiling commands echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6 -echo "configure:4067: checking if you want to see long compiling messages" >&5 +echo "configure:4788: checking if you want to see long compiling messages" >&5 # Check whether --enable-echo or --disable-echo was given. if test "${enable_echo+set}" = set; then @@ -4108,7 +4829,7 @@ echo "$ac_t""$enableval" 1>&6 ### use option --enable-prototypes to turn on optional prototypes echo $ac_n "checking if you want to compile with fallback prototypes""... $ac_c" 1>&6 -echo "configure:4112: checking if you want to compile with fallback prototypes" >&5 +echo "configure:4833: checking if you want to compile with fallback prototypes" >&5 # Check whether --enable-prototypes or --disable-prototypes was given. if test "${enable_prototypes+set}" = set; then @@ -4132,7 +4853,7 @@ EXTRA_CFLAGS="" if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 -echo "configure:4136: checking if you want to turn on gcc warnings" >&5 +echo "configure:4857: checking if you want to turn on gcc warnings" >&5 # Check whether --enable-warnings or --disable-warnings was given. if test "${enable_warnings+set}" = set; then @@ -4155,16 +4876,6 @@ then with_ext_const=yes -GCC_VERSION=none -if test "$GCC" = yes ; then - echo $ac_n "checking version of $CC""... $ac_c" 1>&6 -echo "configure:4162: checking version of $CC" >&5 - GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`" - test -z "$GCC_VERSION" && GCC_VERSION=unknown - echo "$ac_t""$GCC_VERSION" 1>&6 -fi - - INTEL_COMPILER=no @@ -4173,11 +4884,11 @@ if test "$GCC" = yes ; then case $host_os in linux*|gnu*) echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 -echo "configure:4177: checking if this is really Intel C compiler" >&5 +echo "configure:4888: checking if this is really Intel C compiler" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -no-gcc" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* INTEL_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" @@ -4206,8 +4917,43 @@ rm -f conftest* fi +CLANG_COMPILER=no + +if test "$GCC" = yes ; then + echo $ac_n "checking if this is really Clang C compiler""... $ac_c" 1>&6 +echo "configure:4925: checking if this is really Clang C compiler" >&5 + cf_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Qunused-arguments" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + CLANG_COMPILER=yes +cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 +fi +rm -f conftest* + CFLAGS="$cf_save_CFLAGS" + echo "$ac_t""$CLANG_COMPILER" 1>&6 +fi + + cat > conftest.$ac_ext <&6 -echo "configure:4229: checking for $CC warning options" >&5 +echo "configure:4975: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" for cf_opt in \ @@ -4240,7 +4986,7 @@ echo "configure:4229: checking for $CC w wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt" fi @@ -4250,15 +4996,19 @@ echo "configure:4229: checking for $CC w elif test "$GCC" = yes then echo "checking for $CC warning options" 1>&6 -echo "configure:4254: checking for $CC warning options" >&5 +echo "configure:5000: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= cf_warn_CONST="" test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings" + cf_gcc_warnings="Wignored-qualifiers Wlogical-op Wvarargs" + test "x$CLANG_COMPILER" = xyes && cf_gcc_warnings= for cf_opt in W Wall \ Wbad-function-cast \ Wcast-align \ Wcast-qual \ + Wdeclaration-after-statement \ + Wextra \ Winline \ Wmissing-declarations \ Wmissing-prototypes \ @@ -4266,10 +5016,10 @@ echo "configure:4254: checking for $CC w Wpointer-arith \ Wshadow \ Wstrict-prototypes \ - Wundef $cf_warn_CONST + Wundef $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6 case $cf_opt in #(vi Wcast-qual) #(vi @@ -4280,7 +5030,18 @@ echo "configure:4254: checking for $CC w [34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:4284: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5034: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 + + + continue;; + esac + ;; + Wpointer-arith) #(vi + case $GCC_VERSION in + [12].*) + test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 + +echo "${as_me:-configure}:5045: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; @@ -4303,7 +5064,7 @@ fi if test "$USE_SPOOLDIR" = "yes"; then ## options for directories echo $ac_n "checking for news-library path""... $ac_c" 1>&6 -echo "configure:4307: checking for news-library path" >&5 +echo "configure:5068: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -4327,7 +5088,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -4344,12 +5105,12 @@ case ".$withval" in #(vi esac fi -NEWSLIBDIR="$withval" +eval NEWSLIBDIR="$withval" echo "$ac_t""$NEWSLIBDIR" 1>&6 echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:4353: checking for news spool-directory path" >&5 +echo "configure:5114: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -4373,7 +5134,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -4390,12 +5151,12 @@ case ".$withval" in #(vi esac fi -SPOOLDIR="$withval" +eval SPOOLDIR="$withval" echo "$ac_t""$SPOOLDIR" 1>&6 echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:4399: checking for news overview-directory path" >&5 +echo "configure:5160: checking for news overview-directory path" >&5 # Check whether --with-nov-dir or --without-nov-dir was given. if test "${with_nov_dir+set}" = set; then @@ -4419,7 +5180,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -4436,12 +5197,12 @@ case ".$withval" in #(vi esac fi -NOVROOTDIR="$withval" +eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:4445: checking for overview filename" >&5 +echo "configure:5206: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -4477,7 +5238,7 @@ fi ## TODO: kick the --with-inews-dir= stuff, the check below should be enough ## (requires some code rework in tin) echo $ac_n "checking for directory containing \"inews\"""... $ac_c" 1>&6 -echo "configure:4481: checking for directory containing \"inews\"" >&5 +echo "configure:5242: checking for directory containing \"inews\"" >&5 # Check whether --with-inews-dir or --without-inews-dir was given. if test "${with_inews_dir+set}" = set; then @@ -4501,7 +5262,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -4518,7 +5279,7 @@ case ".$withval" in #(vi esac fi -INEWSDIR="$withval" +eval INEWSDIR="$withval" INEWSDIR=`echo $INEWSDIR |sed -e 's,/$,,'` echo "$ac_t""$INEWSDIR" 1>&6 @@ -4526,7 +5287,7 @@ echo "$ac_t""$INEWSDIR" 1>&6 # Extract the first word of "inews", so it can be a program name with args. set dummy inews; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4530: checking for $ac_word" >&5 +echo "configure:5291: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_INEWS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4582,7 +5343,7 @@ fi ### Look for network libraries first, since some functions (such as gethostname) ### are used in a lot of places. echo $ac_n "checking if you want socks library""... $ac_c" 1>&6 -echo "configure:4586: checking if you want socks library" >&5 +echo "configure:5347: checking if you want socks library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4602,7 +5363,7 @@ fi echo "$ac_t""$cf_cv_use_libsocks" 1>&6 echo $ac_n "checking if you want socks5 library""... $ac_c" 1>&6 -echo "configure:4606: checking if you want socks5 library" >&5 +echo "configure:5367: checking if you want socks5 library" >&5 if eval "test \"`echo '$''{'cf_cv_use_libsocks5'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4659,14 +5420,14 @@ if test -n "$cf_searchpath/include" ; th cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4683,7 +5444,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:4687: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5448: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4725,14 +5486,14 @@ if test -n "$cf_searchpath/../include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:4736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -4749,7 +5510,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:4753: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5514: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -4789,7 +5550,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:4793: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5554: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -4819,7 +5580,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:4823: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5584: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -4844,13 +5605,13 @@ cf_cv_header_path_socks= cf_cv_library_path_socks= -echo "${as_me:-configure}:4848: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:5609: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -4861,7 +5622,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_socks=yes @@ -4877,7 +5638,7 @@ else LIBS="-lsocks $cf_save_LIBS" cat > conftest.$ac_ext < @@ -4888,7 +5649,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_socks=yes @@ -4906,11 +5667,11 @@ else test -n "$verbose" && echo " find linkage for socks library" 1>&6 -echo "${as_me:-configure}:4910: testing find linkage for socks library ..." 1>&5 +echo "${as_me:-configure}:5671: testing find linkage for socks library ..." 1>&5 -echo "${as_me:-configure}:4914: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:5675: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" @@ -4928,7 +5689,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -4950,9 +5711,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/socks && cf_search="$cf_search /usr/include/socks" @@ -4962,7 +5723,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -4974,9 +5735,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/socks && cf_search="$cf_search /usr/local/include/socks" @@ -4986,9 +5747,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/socks && cf_search="$cf_search /opt/include/socks" @@ -4998,9 +5759,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/socks && cf_search="$cf_search $HOME/include/socks" @@ -5032,12 +5793,12 @@ cf_search="$cf_search $cf_header_path_li if test -d $cf_cv_header_path_socks ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_socks" 1>&6 -echo "${as_me:-configure}:5036: testing ... testing $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:5797: testing ... testing $cf_cv_header_path_socks ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks" cat > conftest.$ac_ext < @@ -5048,12 +5809,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6 -echo "${as_me:-configure}:5057: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:5818: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 cf_cv_find_linkage_socks=maybe @@ -5074,7 +5835,7 @@ rm -f conftest* if test "$cf_cv_find_linkage_socks" = maybe ; then -echo "${as_me:-configure}:5078: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:5839: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" @@ -5093,7 +5854,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -5114,9 +5875,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/socks && cf_search="$cf_search /usr/lib/socks" @@ -5126,7 +5887,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -5138,9 +5899,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/socks && cf_search="$cf_search /usr/local/lib/socks" @@ -5150,9 +5911,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/socks && cf_search="$cf_search /opt/lib/socks" @@ -5162,9 +5923,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/socks && cf_search="$cf_search $HOME/lib/socks" @@ -5182,14 +5943,14 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_socks ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_socks" 1>&6 -echo "${as_me:-configure}:5186: testing ... testing $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:5947: testing ... testing $cf_cv_library_path_socks ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lsocks $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks" cat > conftest.$ac_ext < @@ -5200,12 +5961,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 -echo "${as_me:-configure}:5209: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:5970: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 cf_cv_find_linkage_socks=yes @@ -5267,14 +6028,14 @@ if test -n "$cf_cv_header_path_socks" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:5278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5291,7 +6052,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:5295: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6056: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5327,7 +6088,7 @@ if test -n "$cf_cv_library_path_socks" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5331: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6092: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -5390,7 +6151,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:5394: checking for network libraries" >&5 +echo "configure:6155: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5402,22 +6163,22 @@ cf_cv_netlibs="" cf_test_netlibs=yes case $host_os in #(vi -mingw32) # (vi +mingw*) # (vi for ac_hdr in windows.h winsock.h winsock2.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5411: checking for $ac_hdr" >&5 +echo "configure:6172: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5454,7 +6215,7 @@ done LIBS="$cf_winsock_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs" else @@ -5493,12 +6254,12 @@ rm -rf conftest* for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5497: checking for $ac_func" >&5 +echo "configure:6258: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -5544,7 +6305,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:5548: checking for gethostname in -lnsl" >&5 +echo "configure:6309: checking for gethostname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5552,7 +6313,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5596,7 +6357,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:5600: checking for gethostname in -lsocket" >&5 +echo "configure:6361: checking for gethostname in -lsocket" >&5 ac_lib_var=`echo socket'_'gethostname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5604,7 +6365,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5657,7 +6418,7 @@ done echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:5661: checking for main in -linet" >&5 +echo "configure:6422: checking for main in -linet" >&5 ac_lib_var=`echo inet'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5665,14 +6426,14 @@ else ac_save_LIBS="$LIBS" LIBS="-linet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5697,12 +6458,12 @@ fi for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5701: checking for $ac_func" >&5 +echo "configure:6462: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -5748,7 +6509,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:5752: checking for socket in -lsocket" >&5 +echo "configure:6513: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5756,7 +6517,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5800,7 +6561,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:5804: checking for socket in -lbsd" >&5 +echo "configure:6565: checking for socket in -lbsd" >&5 ac_lib_var=`echo bsd'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5808,7 +6569,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5864,12 +6625,12 @@ done for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5868: checking for $ac_func" >&5 +echo "configure:6629: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -5915,7 +6676,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:5919: checking for gethostbyname in -lnsl" >&5 +echo "configure:6680: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5923,7 +6684,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5972,15 +6733,126 @@ fi done + for ac_func in inet_ntoa +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:6740: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_$ac_func=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 + +echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 +echo "configure:6791: checking for inet_ntoa in -lnsl" >&5 +ac_lib_var=`echo nsl'_'inet_ntoa | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lnsl $cf_cv_netlibs $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + +cf_tr_func=`echo "inet_ntoa" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` + + cat >> confdefs.h <&6 + + ac_cv_func_inet_ntoa=unknown + unset ac_cv_func_inet_ntoa 2>/dev/null + +fi + + +fi +done + + for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5979: checking for $ac_func" >&5 +echo "configure:6851: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6026,7 +6898,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnetwork""... $ac_c" 1>&6 -echo "configure:6030: checking for gethostbyname in -lnetwork" >&5 +echo "configure:6902: checking for gethostbyname in -lnetwork" >&5 ac_lib_var=`echo network'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6034,7 +6906,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnetwork $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6086,12 +6958,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6090: checking for $ac_func" >&5 +echo "configure:6962: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6137,7 +7009,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:6141: checking for strcasecmp in -lresolv" >&5 +echo "configure:7013: checking for strcasecmp in -lresolv" >&5 ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6145,7 +7017,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lresolv $cf_cv_netlibs $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6249,14 +7121,14 @@ if test -n "$cf_searchpath/include" ; th cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6273,7 +7145,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6277: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7149: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6315,14 +7187,14 @@ if test -n "$cf_searchpath/../include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:6326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6339,7 +7211,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:6343: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7215: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6379,7 +7251,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6383: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7255: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -6409,7 +7281,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6413: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7285: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -6439,10 +7311,10 @@ EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:6443: checking if the socks library uses socks4 prefix" >&5 +echo "configure:7315: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -6451,7 +7323,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:6455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -6463,14 +7335,14 @@ else cat conftest.$ac_ext >&5 cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_use_socks4=no else @@ -6537,9 +7409,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:6541: checking if socks5p.h is available" >&5 +echo "configure:7413: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -6576,17 +7448,17 @@ for ac_hdr in unistd.h fcntl.h sys/file. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6580: checking for $ac_hdr" >&5 +echo "configure:7452: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6613,12 +7485,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:6617: checking for fcntl" >&5 +echo "configure:7489: checking for fcntl" >&5 if eval "test \"`echo '$''{'ac_cv_func_fcntl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_fcntl=yes" else @@ -6661,12 +7533,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:6665: checking for lockf" >&5 +echo "configure:7537: checking for lockf" >&5 if eval "test \"`echo '$''{'ac_cv_func_lockf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_lockf=yes" else @@ -6709,12 +7581,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:6713: checking for flock" >&5 +echo "configure:7585: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_flock=yes" else @@ -6758,7 +7630,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:6762: checking for file-locking functions" >&5 +echo "configure:7634: checking for file-locking functions" >&5 if eval "test \"`echo '$''{'cf_cv_lockfile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6770,7 +7642,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -6798,7 +7670,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6810,7 +7682,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -6830,7 +7702,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6842,7 +7714,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -6865,7 +7737,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6886,7 +7758,7 @@ echo "$ac_t""$cf_cv_lockfile" 1>&6 echo $ac_n "checking which locking method will be used""... $ac_c" 1>&6 -echo "configure:6890: checking which locking method will be used" >&5 +echo "configure:7762: checking which locking method will be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -6954,9 +7826,8 @@ else echo "configure: warning: None of fcntl(), lockf(), flock() available" 1>&2 fi - echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:6960: checking for screen type" >&5 +echo "configure:7831: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -6974,7 +7845,7 @@ use_ncurses=no echo $ac_n "checking for specific curses-directory""... $ac_c" 1>&6 -echo "configure:6978: checking for specific curses-directory" >&5 +echo "configure:7849: checking for specific curses-directory" >&5 # Check whether --with-curses-dir or --without-curses-dir was given. if test "${with_curses_dir+set}" = set; then @@ -7002,7 +7873,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -7045,14 +7916,14 @@ if test -n "$cf_cv_curses_dir/include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7069,7 +7940,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7073: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7944: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7105,7 +7976,7 @@ if test -n "$cf_cv_curses_dir/lib" ; the if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7109: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7980: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -7137,7 +8008,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:7141: checking if you want to use ncurses library" >&5 +echo "configure:8012: checking if you want to use ncurses library" >&5 # Check whether --with-ncurses or --without-ncurses was given. if test "${with_ncurses+set}" = set; then @@ -7150,7 +8021,7 @@ fi echo "$ac_t""$use_ncurses" 1>&6 echo $ac_n "checking if you want curses rather than termcap interface""... $ac_c" 1>&6 -echo "configure:7154: checking if you want curses rather than termcap interface" >&5 +echo "configure:8025: checking if you want curses rather than termcap interface" >&5 # Check whether --enable-curses or --disable-curses was given. if test "${enable_curses+set}" = set; then @@ -7182,12 +8053,14 @@ EOF cf_ncuconfig_root=ncurses echo "Looking for ${cf_ncuconfig_root}-config" + + for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:7191: checking for $ac_word" >&5 +echo "configure:8064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7232,27 +8105,27 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS" # even with config script, some packages use no-override for curses.h echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:7236: checking if we have identified curses headers" >&5 +echo "configure:8109: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_cv_ncurses_header=none for cf_header in \ - ncurses/ncurses.h \ + ncurses/ncurses.h \ ncurses/curses.h \ ncurses.h \ curses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:7256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -7275,17 +8148,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7279: checking for $ac_hdr" >&5 +echo "configure:8152: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7361,14 +8234,14 @@ if test -n "$cf_cv_curses_dir/include/$c cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7385,7 +8258,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7389: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8262: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7404,7 +8277,7 @@ fi } echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:7408: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:8281: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7415,7 +8288,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -7462,7 +8335,7 @@ if test "$cf_cv_ncurses_h" != no ; then else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:7466: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:8339: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7480,7 +8353,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -7502,9 +8375,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" @@ -7514,7 +8387,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -7526,9 +8399,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" @@ -7538,9 +8411,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" @@ -7550,9 +8423,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" @@ -7608,14 +8481,14 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7632,7 +8505,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7636: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8509: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7654,7 +8527,7 @@ fi do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -7733,14 +8606,14 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:7744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7757,7 +8630,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:7761: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8634: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7805,7 +8678,7 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:7809: checking for terminfo header" >&5 +echo "configure:8682: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7822,7 +8695,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < #include <${cf_cv_ncurses_header:-curses.h}> @@ -7832,7 +8705,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:7836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -7887,7 +8760,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:7891: checking for ncurses version" >&5 +echo "configure:8764: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7913,7 +8786,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:7917: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:8790: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -7922,7 +8795,7 @@ EOF else cat > conftest.$ac_ext < @@ -7946,7 +8819,7 @@ int main() ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:7950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -7977,7 +8850,7 @@ cf_nculib_root=ncurses cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:7981: checking for Gpm_Open in -lgpm" >&5 +echo "configure:8854: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7985,7 +8858,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8012,7 +8885,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:8016: checking for initscr in -lgpm" >&5 +echo "configure:8889: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8020,7 +8893,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8063,7 +8936,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:8067: checking for tgoto in -lmytinfo" >&5 +echo "configure:8940: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8071,7 +8944,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8116,12 +8989,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:8120: checking for initscr" >&5 +echo "configure:8993: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_initscr=yes" else @@ -8164,17 +9037,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:8168: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:9041: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -8194,7 +9067,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -8215,9 +9088,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" @@ -8227,7 +9100,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -8239,9 +9112,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" @@ -8251,9 +9124,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" @@ -8263,9 +9136,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" @@ -8281,17 +9154,17 @@ cf_search="$cf_library_path_list $cf_sea for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:8285: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:9158: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:8295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -8322,7 +9195,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:8326: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:9199: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -8331,14 +9204,14 @@ echo "configure:8326: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:8342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 else @@ -8368,9 +9241,9 @@ fi for cf_hdr in stdlib.h wchar.h wctype.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:8372: checking for $cf_hdr" >&5 +echo "configure:9245: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -8378,7 +9251,7 @@ echo "configure:8372: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8405,12 +9278,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:8409: checking for wide char and multibyte support" >&5 +echo "configure:9282: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -8445,7 +9318,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 /* (void) iswupper((wint_t) wcb[0]); */ /* (void) towlower((wint_t) wcb[0]); */ /* (void) iswlower((wint_t) wcb[0]); */ - /* (void) iswalpha((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); /* (void) iswblank((wint_t) wcb[0]); */ /* (void) iswpunct((wint_t) wcb[0]); */ /* (void) iswxdigit((wint_t) wcb[0]); */ @@ -8464,7 +9337,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:8468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=yes else @@ -8474,7 +9347,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -8499,7 +9372,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 /* (void) iswupper((wint_t) wcb[0]); */ /* (void) towlower((wint_t) wcb[0]); */ /* (void) iswlower((wint_t) wcb[0]); */ - /* (void) iswalpha((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); /* (void) iswblank((wint_t) wcb[0]); */ /* (void) iswpunct((wint_t) wcb[0]); */ /* (void) iswxdigit((wint_t) wcb[0]); */ @@ -8518,7 +9391,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:8522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=libutf8 else @@ -8554,12 +9427,14 @@ EOF cf_ncuconfig_root=ncursesw echo "Looking for ${cf_ncuconfig_root}-config" + + for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:8563: checking for $ac_word" >&5 +echo "configure:9438: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8604,27 +9479,27 @@ LIBS="`$NCURSES_CONFIG --libs` $LIBS" # even with config script, some packages use no-override for curses.h echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:8608: checking if we have identified curses headers" >&5 +echo "configure:9483: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cf_cv_ncurses_header=none for cf_header in \ - ncursesw/ncurses.h \ + ncursesw/ncurses.h \ ncursesw/curses.h \ ncurses.h \ curses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:8628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -8647,17 +9522,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8651: checking for $ac_hdr" >&5 +echo "configure:9526: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8733,14 +9608,14 @@ if test -n "$cf_cv_curses_dir/include/$c cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8757,7 +9632,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:8761: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9636: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8776,7 +9651,7 @@ fi } echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:8780: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:9655: checking for $cf_ncuhdr_root header in include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8787,7 +9662,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -8842,7 +9717,7 @@ if test "$cf_cv_ncurses_h" != no ; then else echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6 -echo "configure:8846: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:9721: checking for $cf_ncuhdr_root include-path" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8860,7 +9735,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -8882,9 +9757,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/include/$cf_ncuhdr_root" @@ -8894,7 +9769,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -8906,9 +9781,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root" @@ -8918,9 +9793,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/include/$cf_ncuhdr_root" @@ -8930,9 +9805,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root" @@ -8988,14 +9863,14 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -9012,7 +9887,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9016: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9891: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9034,7 +9909,7 @@ fi do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -9113,14 +9988,14 @@ if test -n "$cf_1st_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:9124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -9137,7 +10012,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:9141: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10016: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9185,7 +10060,7 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:9189: checking for terminfo header" >&5 +echo "configure:10064: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9202,7 +10077,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < #include <${cf_cv_ncurses_header:-curses.h}> @@ -9212,7 +10087,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:9216: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -9267,7 +10142,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:9271: checking for ncurses version" >&5 +echo "configure:10146: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9293,7 +10168,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:9297: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:10172: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -9302,7 +10177,7 @@ EOF else cat > conftest.$ac_ext < @@ -9326,7 +10201,7 @@ int main() ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -9357,7 +10232,7 @@ cf_nculib_root=ncursesw cf_ncurses_LIBS="" cf_ncurses_SAVE="$LIBS" echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:9361: checking for Gpm_Open in -lgpm" >&5 +echo "configure:10236: checking for Gpm_Open in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9365,7 +10240,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9392,7 +10267,7 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6 -echo "configure:9396: checking for initscr in -lgpm" >&5 +echo "configure:10271: checking for initscr in -lgpm" >&5 ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9400,7 +10275,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9443,7 +10318,7 @@ freebsd*) # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:9447: checking for tgoto in -lmytinfo" >&5 +echo "configure:10322: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9451,7 +10326,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9496,12 +10371,12 @@ else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:9500: checking for initscr" >&5 +echo "configure:10375: checking for initscr" >&5 if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_initscr=yes" else @@ -9544,17 +10419,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:9548: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:10423: checking for initscr in -l$cf_nculib_root" >&5 LIBS="-l$cf_nculib_root $LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:9558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -9574,7 +10449,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -9595,9 +10470,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/$cf_nculib_root && cf_search="$cf_search /usr/lib/$cf_nculib_root" @@ -9607,7 +10482,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -9619,9 +10494,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/lib/$cf_nculib_root" @@ -9631,9 +10506,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/$cf_nculib_root && cf_search="$cf_search /opt/lib/$cf_nculib_root" @@ -9643,9 +10518,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/$cf_nculib_root && cf_search="$cf_search $HOME/lib/$cf_nculib_root" @@ -9661,17 +10536,17 @@ cf_search="$cf_library_path_list $cf_sea for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6 -echo "configure:9665: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:10540: checking for -l$cf_nculib_root in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:9675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes' @@ -9702,7 +10577,7 @@ fi if test -n "$cf_ncurses_LIBS" ; then echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6 -echo "configure:9706: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:10581: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 cf_ncurses_SAVE="$LIBS" for p in $cf_ncurses_LIBS ; do q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"` @@ -9711,14 +10586,14 @@ echo "configure:9706: checking if we can fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:9722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 else @@ -9744,13 +10619,13 @@ fi echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:9748: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:10623: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -9767,7 +10642,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:9771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=no else @@ -9775,7 +10650,7 @@ else cat conftest.$ac_ext >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=yes else @@ -9816,7 +10691,7 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:9820: checking for extra include directories" >&5 +echo "configure:10695: checking for extra include directories" >&5 if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9847,7 +10722,7 @@ test "$cf_cv_curses_incdir" != no && CPP echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:9851: checking if we have identified curses headers" >&5 +echo "configure:10726: checking if we have identified curses headers" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9858,14 +10733,14 @@ for cf_header in \ curses.h ncurses/ncurses.h ncurses/curses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:9869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -9888,17 +10763,17 @@ for ac_hdr in $cf_cv_ncurses_header do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9892: checking for $ac_hdr" >&5 +echo "configure:10767: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9927,7 +10802,7 @@ done echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:9931: checking for terminfo header" >&5 +echo "configure:10806: checking for terminfo header" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9944,7 +10819,7 @@ esac for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h" do cat > conftest.$ac_ext < #include <${cf_cv_ncurses_header:-curses.h}> @@ -9954,7 +10829,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:9958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -10003,7 +10878,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10007: checking for ncurses version" >&5 +echo "configure:10882: checking for ncurses version" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10029,7 +10904,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10033: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:10908: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } if test -f conftest.out ; then cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'` test -n "$cf_out" && cf_cv_ncurses_version="$cf_out" @@ -10038,7 +10913,7 @@ EOF else cat > conftest.$ac_ext < @@ -10062,7 +10937,7 @@ int main() ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:10066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_ncurses_version=`cat $cf_tempfile` @@ -10086,16 +10961,16 @@ EOF echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:10090: checking if we have identified curses libraries" >&5 +echo "configure:10965: checking if we have identified curses libraries" >&5 cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:10099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -10111,7 +10986,7 @@ if test "$cf_result" = no ; then case $host_os in #(vi freebsd*) #(vi echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 -echo "configure:10115: checking for tgoto in -lmytinfo" >&5 +echo "configure:10990: checking for tgoto in -lmytinfo" >&5 ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10119,7 +10994,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmytinfo $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10159,7 +11034,7 @@ hpux10.*) #(vi if test "x$cf_cv_screen" = "xcurses_colr" then echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6 -echo "configure:10163: checking for initscr in -lcur_colr" >&5 +echo "configure:11038: checking for initscr in -lcur_colr" >&5 ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10167,7 +11042,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcur_colr $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10201,7 +11076,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:10205: checking for initscr in -lHcurses" >&5 +echo "configure:11080: checking for initscr in -lHcurses" >&5 ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10209,7 +11084,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lHcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10248,7 +11123,7 @@ fi fi fi - ;; + ;; linux*) case `arch 2>/dev/null` in x86_64) @@ -10274,7 +11149,7 @@ if test -n "/lib64" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:10278: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11153: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -10304,7 +11179,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:10308: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11183: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -10336,7 +11211,7 @@ if test -n "/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:10340: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11215: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -10347,7 +11222,7 @@ fi ;; esac - ;; + ;; sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then @@ -10372,7 +11247,7 @@ if test -n "/usr/5lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:10376: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11251: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -10389,26 +11264,26 @@ fi esac if test ".$ac_cv_func_initscr" != .yes ; then - cf_save_LIBS="$LIBS" - cf_term_lib="" - cf_curs_lib="" + cf_save_LIBS="$LIBS" - if test ".${cf_cv_ncurses_version:-no}" != .no - then - cf_check_list="ncurses curses cursesX" - else - cf_check_list="cursesX curses ncurses" - fi + if test ".${cf_cv_ncurses_version:-no}" != .no + then + cf_check_list="ncurses curses cursesX" + else + cf_check_list="cursesX curses ncurses" + fi - # Check for library containing tgoto. Do this before curses library - # because it may be needed to link the test-case for initscr. - echo $ac_n "checking for tgoto""... $ac_c" 1>&6 -echo "configure:10407: checking for tgoto" >&5 + # Check for library containing tgoto. Do this before curses library + # because it may be needed to link the test-case for initscr. + if test "x$cf_term_lib" = x + then + echo $ac_n "checking for tgoto""... $ac_c" 1>&6 +echo "configure:11282: checking for tgoto" >&5 if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_tgoto=yes" else @@ -10449,10 +11324,10 @@ if eval "test \"`echo '$ac_cv_func_'tgot else echo "$ac_t""no" 1>&6 - for cf_term_lib in $cf_check_list termcap termlib unknown - do - echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 -echo "configure:10456: checking for tgoto in -l$cf_term_lib" >&5 + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown + do + echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6 +echo "configure:11331: checking for tgoto in -l$cf_term_lib" >&5 ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10460,7 +11335,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_term_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10491,17 +11366,20 @@ else echo "$ac_t""no" 1>&6 fi - done - + done + fi + fi - # Check for library containing initscr - test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown - do - echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 -echo "configure:10505: checking for initscr in -l$cf_curs_lib" >&5 + # Check for library containing initscr + test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS" + if test "x$cf_curs_lib" = x + then + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown + do + echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6 +echo "configure:11383: checking for initscr in -l$cf_curs_lib" >&5 ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10509,7 +11387,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$cf_curs_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10540,22 +11418,23 @@ else echo "$ac_t""no" 1>&6 fi - done - test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; } + done + fi + test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; } - LIBS="-l$cf_curs_lib $cf_save_LIBS" - if test "$cf_term_lib" = unknown ; then - echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6 -echo "configure:10550: checking if we can link with $cf_curs_lib library" >&5 - cat > conftest.$ac_ext <&6 +echo "configure:11429: checking if we can link with $cf_curs_lib library" >&5 + cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:10559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -10565,22 +11444,22 @@ else cf_result=no fi rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 - test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } - elif test "$cf_curs_lib" = "$cf_term_lib" ; then - : - elif test "$cf_term_lib" != predefined ; then - echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 -echo "configure:10575: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 - cat > conftest.$ac_ext <&6 + test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; } + elif test "$cf_curs_lib" = "$cf_term_lib" ; then + : + elif test "$cf_term_lib" != predefined ; then + echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6 +echo "configure:11454: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5 + cat > conftest.$ac_ext < int main() { initscr(); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:10584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=no else @@ -10588,16 +11467,16 @@ else cat conftest.$ac_ext >&5 - LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:10601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -10607,11 +11486,11 @@ else cf_result=error fi rm -rf conftest* - + fi rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 - fi + echo "$ac_t""$cf_result" 1>&6 + fi fi fi @@ -10619,13 +11498,13 @@ fi echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:10623: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:11502: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10642,7 +11521,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:10646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=no else @@ -10650,7 +11529,7 @@ else cat conftest.$ac_ext >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=yes else @@ -10690,7 +11569,7 @@ fi ## substitute externally-installed PCRE library for our bundled version echo $ac_n "checking if you want to use installed version of pcre""... $ac_c" 1>&6 -echo "configure:10694: checking if you want to use installed version of pcre" >&5 +echo "configure:11573: checking if you want to use installed version of pcre" >&5 # Check whether --with-pcre or --without-pcre was given. if test "${with_pcre+set}" = set; then @@ -10734,7 +11613,7 @@ case ".$cf_pcre_home" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval cf_pcre_home="$cf_pcre_home" case ".$cf_pcre_home" in #(vi .NONE/*) @@ -10772,12 +11651,12 @@ debug_malloc=none echo $ac_n "checking if you want to use dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:10776: checking if you want to use dbmalloc for testing" >&5 +echo "configure:11655: checking if you want to use dbmalloc for testing" >&5 # Check whether --with-dbmalloc or --without-dbmalloc was given. if test "${with_dbmalloc+set}" = set; then withval="$with_dbmalloc" - cat >> confdefs.h <<\EOF + cat >> confdefs.h <&6 -echo "configure:10893: checking for dbmalloc.h" >&5 +echo "configure:11772: checking for dbmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10916,7 +11795,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for debug_malloc in -ldbmalloc""... $ac_c" 1>&6 -echo "configure:10920: checking for debug_malloc in -ldbmalloc" >&5 +echo "configure:11799: checking for debug_malloc in -ldbmalloc" >&5 ac_lib_var=`echo dbmalloc'_'debug_malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10924,7 +11803,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldbmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10964,12 +11843,12 @@ fi echo $ac_n "checking if you want to use dmalloc for testing""... $ac_c" 1>&6 -echo "configure:10968: checking if you want to use dmalloc for testing" >&5 +echo "configure:11847: checking if you want to use dmalloc for testing" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" - cat >> confdefs.h <<\EOF + cat >> confdefs.h <&6 -echo "configure:11085: checking for dmalloc.h" >&5 +echo "configure:11964: checking for dmalloc.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11108,7 +11987,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for dmalloc_debug in -ldmalloc""... $ac_c" 1>&6 -echo "configure:11112: checking for dmalloc_debug in -ldmalloc" >&5 +echo "configure:11991: checking for dmalloc_debug in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_debug | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11116,7 +11995,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11154,19 +12033,18 @@ fi fi -EXTRAO_DEP='#' # Check whether --with-trace or --without-trace was given. if test "${with_trace+set}" = set; then withval="$with_trace" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:11165: checking for _tracef" >&5 +echo "configure:12043: checking for _tracef" >&5 if eval "test \"`echo '$''{'ac_cv_func__tracef'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func__tracef=yes" else @@ -11211,7 +12089,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for _tracef in -l${cf_with_screen}_g""... $ac_c" 1>&6 -echo "configure:11215: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:12093: checking for _tracef in -l${cf_with_screen}_g" >&5 ac_lib_var=`echo ${cf_with_screen}_g'_'_tracef | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11219,7 +12097,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l${cf_with_screen}_g $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11257,7 +12135,7 @@ EOF EOF EXTRAO_DEP='' - EXTRAOBJS="$EXTRAOBJS trace.o" + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o" else echo "$ac_t""no" 1>&6 use_trace=no @@ -11276,7 +12154,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:11280: checking for domain-name" >&5 +echo "configure:12158: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -11305,7 +12183,7 @@ echo "$ac_t""$DOMAIN_NAME" 1>&6 if test "$USE_NNTP" = "yes" ; then echo $ac_n "checking for NNTP default-server""... $ac_c" 1>&6 -echo "configure:11309: checking for NNTP default-server" >&5 +echo "configure:12187: checking for NNTP default-server" >&5 # Check whether --with-nntp-default-server or --without-nntp-default-server was given. if test "${with_nntp_default_server+set}" = set; then @@ -11371,7 +12249,7 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:11375: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:12253: checking whether to use MH style mail handling for mailgroups" >&5 # Check whether --enable-mh-mail-handling or --disable-mh-mail-handling was given. if test "${enable_mh_mail_handling+set}" = set; then @@ -11392,7 +12270,7 @@ echo "$ac_t""$enableval" 1>&6 CAN_MAKEFILE= CANDIR_MAKE= echo $ac_n "checking whether to use Cancel-Locks""... $ac_c" 1>&6 -echo "configure:11396: checking whether to use Cancel-Locks" >&5 +echo "configure:12274: checking whether to use Cancel-Locks" >&5 # Check whether --enable-cancel-locks or --disable-cancel-locks was given. if test "${enable_cancel_locks+set}" = set; then @@ -11421,19 +12299,20 @@ echo "$ac_t""$enableval" 1>&6 ## gsasl - used for AUTH SASL PLAIN +gsasl=no ac_safe=`echo "gsasl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gsasl.h""... $ac_c" 1>&6 -echo "configure:11427: checking for gsasl.h" >&5 +echo "configure:12306: checking for gsasl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:11437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -11450,7 +12329,7 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gsasl_check_version in -lgsasl""... $ac_c" 1>&6 -echo "configure:11454: checking for gsasl_check_version in -lgsasl" >&5 +echo "configure:12333: checking for gsasl_check_version in -lgsasl" >&5 ac_lib_var=`echo gsasl'_'gsasl_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11458,7 +12337,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lgsasl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11487,12 +12366,11 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l gsasl=yes else echo "$ac_t""no" 1>&6 -gsasl=no fi + else echo "$ac_t""no" 1>&6 -gsasl=no fi if test "$gsasl" = "yes"; then @@ -11525,7 +12403,7 @@ fi fi echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:11529: checking whether to enable 8-bit keycodes" >&5 +echo "configure:12407: checking whether to enable 8-bit keycodes" >&5 # Check whether --enable-8bit-keys or --disable-8bit-keys was given. if test "${enable_8bit_keys+set}" = set; then @@ -11551,7 +12429,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:11555: checking whether to enable ANSI-color" >&5 +echo "configure:12433: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then @@ -11568,7 +12446,7 @@ use_color=$enableval echo "$ac_t""$use_color" 1>&6 echo $ac_n "checking whether to enable posting-etiquette""... $ac_c" 1>&6 -echo "configure:11572: checking whether to enable posting-etiquette" >&5 +echo "configure:12450: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then @@ -11587,7 +12465,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to strictly observe RFC2047 and break long lines""... $ac_c" 1>&6 -echo "configure:11591: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:12469: checking whether to strictly observe RFC2047 and break long lines" >&5 # Check whether --enable-break-long-lines or --disable-break-long-lines was given. if test "${enable_break_long_lines+set}" = set; then @@ -11606,7 +12484,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to force MM_CHARSET obeyance when decoding mime""... $ac_c" 1>&6 -echo "configure:11610: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:12488: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 # Check whether --enable-mime-strict-charset or --disable-mime-strict-charset was given. if test "${enable_mime_strict_charset+set}" = set; then @@ -11632,7 +12510,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:11636: checking for MIME character-set" >&5 +echo "configure:12514: checking for MIME character-set" >&5 # Check whether --with-mime-default-charset or --without-mime-default-charset was given. if test "${with_mime_default_charset+set}" = set; then @@ -11654,7 +12532,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:11658: checking for default ISO/ASCII table" >&5 +echo "configure:12536: checking for default ISO/ASCII table" >&5 # Check whether --with-iso-to-ascii or --without-iso-to-ascii was given. if test "${with_iso_to_ascii+set}" = set; then @@ -11676,7 +12554,7 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:11680: checking whether to enable locale support" >&5 +echo "configure:12558: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then @@ -11695,7 +12573,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:11699: checking whether to enable posting" >&5 +echo "configure:12577: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then @@ -11714,7 +12592,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:11718: checking whether to enable shell escape" >&5 +echo "configure:12596: checking whether to enable shell escape" >&5 # Check whether --enable-shell-escape or --disable-shell-escape was given. if test "${enable_shell_escape+set}" = set; then @@ -11733,7 +12611,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:11737: checking whether to have fascist newsadmin" >&5 +echo "configure:12615: checking whether to have fascist newsadmin" >&5 # Check whether --enable-fascist-newsadmin or --disable-fascist-newsadmin was given. if test "${enable_fascist_newsadmin+set}" = set; then @@ -11752,7 +12630,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:11756: checking whether to enable inverse video and highlighting" >&5 +echo "configure:12634: checking whether to enable inverse video and highlighting" >&5 # Check whether --enable-inverse-video or --disable-inverse-video was given. if test "${enable_inverse_video+set}" = set; then @@ -11771,7 +12649,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:11775: checking whether to enable piping support" >&5 +echo "configure:12653: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then @@ -11790,7 +12668,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:11794: checking whether to enable printer support" >&5 +echo "configure:12672: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then @@ -11809,7 +12687,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to unique tmp-files by appending .pid""... $ac_c" 1>&6 -echo "configure:11813: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:12691: checking whether to unique tmp-files by appending .pid" >&5 # Check whether --enable-append-pid or --disable-append-pid was given. if test "${enable_append_pid+set}" = set; then @@ -11835,7 +12713,7 @@ fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to fallback to XHDR XREF if XOVER isn't supported""... $ac_c" 1>&6 -echo "configure:11839: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:12717: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 # Check whether --enable-xhdr-xref or --disable-xhdr-xref was given. if test "${enable_xhdr_xref+set}" = set; then @@ -11862,7 +12740,7 @@ echo "$ac_t""$enableval" 1>&6 ### bypass a bug in old versions of leafnode & NNTPcache echo $ac_n "checking whether to send a GROUP command before a LISTGROUP""... $ac_c" 1>&6 -echo "configure:11866: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:12744: checking whether to send a GROUP command before a LISTGROUP" >&5 # Check whether --enable-broken-listgroup-fix or --disable-broken-listgroup-fix was given. if test "${enable_broken_listgroup_fix+set}" = set; then @@ -11882,7 +12760,7 @@ echo "$ac_t""$enableval" 1>&6 ### on some old systems the WIFEXITED()/WEXITSTATUS() macros do not work echo $ac_n "checking whether to ignore system()s return value""... $ac_c" 1>&6 -echo "configure:11886: checking whether to ignore system()s return value" >&5 +echo "configure:12764: checking whether to ignore system()s return value" >&5 # Check whether --enable-broken-system-fix or --disable-broken-system-fix was given. if test "${enable_broken_system_fix+set}" = set; then @@ -11902,7 +12780,7 @@ echo "$ac_t""$enableval" 1>&6 ### checks for the location of the system-wide default setting file echo $ac_n "checking for directory containing tin.defaults file""... $ac_c" 1>&6 -echo "configure:11906: checking for directory containing tin.defaults file" >&5 +echo "configure:12784: checking for directory containing tin.defaults file" >&5 # Check whether --with-defaults-dir or --without-defaults-dir was given. if test "${with_defaults_dir+set}" = set; then @@ -11926,7 +12804,7 @@ case ".$withval" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval withval="$withval" case ".$withval" in #(vi .NONE/*) @@ -11943,7 +12821,7 @@ case ".$withval" in #(vi esac fi -TIN_DEFAULTS_DIR="$withval" +eval TIN_DEFAULTS_DIR="$withval" echo "$ac_t""$TIN_DEFAULTS_DIR" 1>&6 cat >> confdefs.h <&6 -echo "configure:11957: checking whether to enable IPv6" >&5 +echo "configure:12835: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then @@ -11974,7 +12852,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:11978: checking ipv6 stack type" >&5 +echo "configure:12856: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11994,7 +12872,7 @@ do ;; inria) #(vi cat > conftest.$ac_ext < @@ -12012,7 +12890,7 @@ rm -f conftest* ;; kame) #(vi cat > conftest.$ac_ext < @@ -12030,7 +12908,7 @@ rm -f conftest* ;; linux-glibc) #(vi cat > conftest.$ac_ext < @@ -12057,7 +12935,7 @@ rm -f conftest* ;; toshiba) #(vi cat > conftest.$ac_ext < @@ -12075,7 +12953,7 @@ rm -f conftest* ;; v6d) #(vi cat > conftest.$ac_ext < @@ -12093,7 +12971,7 @@ rm -f conftest* ;; zeta) cat > conftest.$ac_ext < @@ -12126,7 +13004,7 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:12130: checking for IPv6 library if required" >&5 +echo "configure:13008: checking for IPv6 library if required" >&5 case $cf_cv_ipv6type in #(vi solaris) #(vi ;; @@ -12160,7 +13038,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -12171,7 +13049,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:12175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -12190,7 +13068,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -12212,9 +13090,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/$cf_ipv6dir && cf_search="$cf_search /usr/include/$cf_ipv6dir" @@ -12224,7 +13102,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -12236,9 +13114,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/$cf_ipv6dir && cf_search="$cf_search /usr/local/include/$cf_ipv6dir" @@ -12248,9 +13126,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/$cf_ipv6dir && cf_search="$cf_search /opt/include/$cf_ipv6dir" @@ -12260,9 +13138,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/$cf_ipv6dir && cf_search="$cf_search $HOME/include/$cf_ipv6dir" @@ -12319,14 +13197,14 @@ if test -n "$cf_incdir" ; then cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:12330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -12343,7 +13221,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:12347: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13225: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -12372,12 +13250,12 @@ rm -rf conftest* eval 'cf_cv_have_lib_'$cf_ipv6lib'=no' cf_libdir="" echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 -echo "configure:12376: checking for getaddrinfo" >&5 +echo "configure:13254: checking for getaddrinfo" >&5 if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_getaddrinfo=yes" else @@ -12420,10 +13298,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:12424: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:13302: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -12434,7 +13312,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:12438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -12454,7 +13332,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -12475,9 +13353,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/$cf_ipv6dir && cf_search="$cf_search /usr/lib/$cf_ipv6dir" @@ -12487,7 +13365,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -12499,9 +13377,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/$cf_ipv6dir && cf_search="$cf_search /usr/local/lib/$cf_ipv6dir" @@ -12511,9 +13389,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/$cf_ipv6dir && cf_search="$cf_search /opt/lib/$cf_ipv6dir" @@ -12523,9 +13401,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/$cf_ipv6dir && cf_search="$cf_search $HOME/lib/$cf_ipv6dir" @@ -12541,10 +13419,10 @@ cf_search="$cf_library_path_list $cf_sea for cf_libdir in $cf_search do echo $ac_n "checking for -l$cf_ipv6lib in $cf_libdir""... $ac_c" 1>&6 -echo "configure:12545: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:13423: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -12555,7 +13433,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:12559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes' @@ -12588,7 +13466,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:12592: checking working getaddrinfo" >&5 +echo "configure:13470: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12597,7 +13475,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -12676,7 +13554,7 @@ int main() } EOF -if { (eval echo configure:12680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_getaddrinfo=yes else @@ -12720,12 +13598,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12724: checking for $ac_func" >&5 +echo "configure:13602: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -12775,9 +13653,29 @@ done +### should we use 64 bit article numbers if possible? +echo $ac_n "checking whether to enable long article numbers""... $ac_c" 1>&6 +echo "configure:13659: checking whether to enable long article numbers" >&5 + +# Check whether --enable-long-article-numbers or --disable-long-article-numbers was given. +if test "${enable_long_article_numbers+set}" = set; then + enableval="$enable_long_article_numbers" + test "$enableval" != yes && enableval=no + if test "$enableval" != "no" ; then + cat >> confdefs.h <<\EOF +#define ENABLE_LONG_ARTICLE_NUMBERS 1 +EOF + + fi +else + enableval=no +fi + +echo "$ac_t""$enableval" 1>&6 + ### checks for operator characteristics (should be the last option) echo $ac_n "checking whether to make a coffee while compiling""... $ac_c" 1>&6 -echo "configure:12781: checking whether to make a coffee while compiling" >&5 +echo "configure:13679: checking whether to make a coffee while compiling" >&5 # Check whether --with-coffee or --without-coffee was given. if test "${with_coffee+set}" = set; then @@ -12802,7 +13700,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:12806: checking for makeflags variable" >&5 +echo "configure:13704: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12848,12 +13746,12 @@ ac_link='${CC-cc} -o conftest${ac_exeext cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:12852: checking for working const" >&5 +echo "configure:13750: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -12923,21 +13821,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:12927: checking for inline" >&5 +echo "configure:13825: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -12964,13 +13862,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:12968: checking for ansi token expansion/substitution" >&5 +echo "configure:13866: checking for ansi token expansion/substitution" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_expands'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -12999,13 +13897,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:13003: checking for ansi token concatenation" >&5 +echo "configure:13901: checking for ansi token concatenation" >&5 if eval "test \"`echo '$''{'cf_cv_cpp_concats'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -13034,20 +13932,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:13038: checking if nested parameters work" >&5 +echo "configure:13936: checking if nested parameters work" >&5 if eval "test \"`echo '$''{'cf_cv_nested_params'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -13070,12 +13968,12 @@ EOF ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:13074: checking for ANSI C header files" >&5 +echo "configure:13972: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13083,7 +13981,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:13985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13100,7 +13998,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -13118,7 +14016,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -13139,7 +14037,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -13150,7 +14048,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:13154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -13178,12 +14076,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:13182: checking for $ac_hdr that defines DIR" >&5 +echo "configure:14080: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -13191,7 +14089,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:13195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -13216,7 +14114,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:13220: checking for opendir in -ldir" >&5 +echo "configure:14118: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13224,7 +14122,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13257,7 +14155,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:13261: checking for opendir in -lx" >&5 +echo "configure:14159: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13265,7 +14163,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13299,12 +14197,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:13303: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:14201: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13313,7 +14211,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:13317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -13334,12 +14232,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:13338: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:14236: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -13355,7 +14253,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:13359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -13436,9 +14334,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:13440: checking for $cf_hdr" >&5 +echo "configure:14338: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -13446,7 +14344,7 @@ echo "configure:13440: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13484,17 +14382,17 @@ unistd.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13488: checking for $ac_hdr" >&5 +echo "configure:14386: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13526,17 +14424,17 @@ if test "$ISC" = yes ; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:13530: checking for $ac_hdr" >&5 +echo "configure:14428: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13540: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -13571,16 +14469,16 @@ if test "$ac_cv_header_termios_h" = yes esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:13575: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:14473: checking whether termios.h needs _POSIX_SOURCE" >&5 cat > conftest.$ac_ext < int main() { struct termios foo; int x = foo.c_iflag ; return 0; } EOF -if { (eval echo configure:13584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -13589,7 +14487,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -13621,7 +14519,7 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:13625: checking declaration of size-change" >&5 +echo "configure:14523: checking declaration of size-change" >&5 if eval "test \"`echo '$''{'cf_cv_sizechange'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13635,7 +14533,7 @@ do CPPFLAGS="$cf_save_CPPFLAGS" test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" cat > conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -13674,7 +14572,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:13678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -13713,7 +14611,7 @@ fi echo $ac_n "checking if sys/time.h conflicts with sys/select.h""... $ac_c" 1>&6 -echo "configure:13717: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:14615: checking if sys/time.h conflicts with sys/select.h" >&5 if eval "test \"`echo '$''{'cf_cv_sys_select_timeval'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13721,7 +14619,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14651: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -13773,12 +14671,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:13777: checking for gid_t" >&5 +echo "configure:14675: checking for gid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_gid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13806,12 +14704,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:13810: checking for mode_t" >&5 +echo "configure:14708: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13839,12 +14737,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:13843: checking for off_t" >&5 +echo "configure:14741: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13872,12 +14770,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:13876: checking for pid_t" >&5 +echo "configure:14774: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13905,12 +14803,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:13909: checking for size_t" >&5 +echo "configure:14807: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -13935,323 +14833,666 @@ if test $ac_cv_type_size_t = no; then #define size_t unsigned EOF -fi +fi + +echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 +echo "configure:14840: checking for ssize_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_ssize_t=yes +else + rm -rf conftest* + ac_cv_type_ssize_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_ssize_t" 1>&6 +if test $ac_cv_type_ssize_t = no; then + cat >> confdefs.h <<\EOF +#define ssize_t int +EOF + +fi + +echo $ac_n "checking for time_t""... $ac_c" 1>&6 +echo "configure:14873: checking for time_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_time_t=yes +else + rm -rf conftest* + ac_cv_type_time_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_time_t" 1>&6 +if test $ac_cv_type_time_t = no; then + cat >> confdefs.h <<\EOF +#define time_t long +EOF + +fi + +cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then + : +else + rm -rf conftest* + + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "in_addr_t" >/dev/null 2>&1; then + : +else + rm -rf conftest* + + echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 +echo "configure:14928: checking for in_addr_t" >&5 +if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +#if STDC_HEADERS +#include +#include +#endif +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "(^|[^a-zA-Z_0-9])in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_in_addr_t=yes +else + rm -rf conftest* + ac_cv_type_in_addr_t=no +fi +rm -f conftest* + +fi +echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 +if test $ac_cv_type_in_addr_t = no; then + cat >> confdefs.h <<\EOF +#define in_addr_t unsigned long +EOF + +fi + + +fi +rm -f conftest* + + +fi +rm -f conftest* + +echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +echo "configure:14969: checking for uid_t in sys/types.h" >&5 +if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "uid_t" >/dev/null 2>&1; then + rm -rf conftest* + ac_cv_type_uid_t=yes +else + rm -rf conftest* + ac_cv_type_uid_t=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_type_uid_t" 1>&6 +if test $ac_cv_type_uid_t = no; then + cat >> confdefs.h <<\EOF +#define uid_t int +EOF + + cat >> confdefs.h <<\EOF +#define gid_t int +EOF + +fi + + +echo $ac_n "checking for quad_t""... $ac_c" 1>&6 +echo "configure:15004: checking for quad_t" >&5 +cat > conftest.$ac_ext < +#if 0 +#include +#include +#endif /* 0 */ + +int main() { +quad_t x; x = 0 +; return 0; } +EOF +if { (eval echo configure:15019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_quad_t=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_quad_t=no +fi +rm -f conftest* +echo "$ac_t""$ac_cv_quad_t" 1>&6 +if test $ac_cv_quad_t = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_QUAD_T 1 +EOF + +fi + +echo $ac_n "checking for long long""... $ac_c" 1>&6 +echo "configure:15038: checking for long long" >&5 +cat > conftest.$ac_ext < + +int main() { +long long x; x = 0 +; return 0; } +EOF +if { (eval echo configure:15049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_long_long=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_long_long=no +fi +rm -f conftest* +echo "$ac_t""$ac_cv_long_long" 1>&6 +if test $ac_cv_long_long = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_LONG_LONG 1 +EOF + +fi + +echo $ac_n "checking for int_least64_t""... $ac_c" 1>&6 +echo "configure:15068: checking for int_least64_t" >&5 +cat > conftest.$ac_ext < +#endif +#ifdef HAVE_HAVE_INTTYPES_H +#include +#endif + +int main() { +int_least64_t x; x = 0 +; return 0; } +EOF +if { (eval echo configure:15084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_int_least64_t=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_int_least64_t=no +fi +rm -f conftest* +echo "$ac_t""$ac_cv_int_least64_t" 1>&6 +if test $ac_cv_int_least64_t = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_INT_LEAST64_T 1 +EOF + -echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:13942: checking for ssize_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&6 +echo "configure:15102: checking for INT64_C" >&5 + cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include + +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_HAVE_INTTYPES_H +#include #endif + +int main() { +int_least64_t x; x = INT64_C(0) +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])ssize_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +if { (eval echo configure:15118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_type_ssize_t=yes + ac_cv_int64_c=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_type_ssize_t=no + ac_cv_int64_c=no fi rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_ssize_t" 1>&6 -if test $ac_cv_type_ssize_t = no; then - cat >> confdefs.h <<\EOF -#define ssize_t int + echo "$ac_t""$ac_cv_int64_c" 1>&6 + if test $ac_cv_int64_c = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_INT64_C 1 EOF + fi fi -echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:13975: checking for time_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <&6 +echo "configure:15139: checking for nl_item" >&5 +cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include + +#ifdef HAVE_LANGINFO_H +#include +#else +#ifdef HAVE_NL_TYPES_H +#include +#endif #endif + +int main() { +nl_item x; x = 0 +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +if { (eval echo configure:15156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - ac_cv_type_time_t=yes + ac_cv_nl_item=yes else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_type_time_t=no + ac_cv_nl_item=no fi rm -f conftest* - -fi -echo "$ac_t""$ac_cv_type_time_t" 1>&6 -if test $ac_cv_type_time_t = no; then - cat >> confdefs.h <<\EOF -#define time_t long +echo "$ac_t""$ac_cv_nl_item" 1>&6 +if test $ac_cv_nl_item = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_NL_ITEM 1 EOF fi +### Checks for libraries. +# libuu/uudeview +# only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found +echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6 +echo "configure:15178: checking for UUInitialize in -luu" >&5 +ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-luu $LIBS" cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char UUInitialize(); + +int main() { +UUInitialize() +; return 0; } EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "in_addr_t" >/dev/null 2>&1; then - : -else - rm -rf conftest* +if { (eval echo configure:15197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - cat > conftest.$ac_ext < -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "in_addr_t" >/dev/null 2>&1; then - : + eval "ac_cv_lib_$ac_lib_var=yes" else - rm -rf conftest* - - echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:14030: checking for in_addr_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 +echo "configure:15214: checking for uudeview.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif +#include EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])in_addr_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - ac_cv_type_in_addr_t=yes + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_type_in_addr_t=no + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* - fi -echo "$ac_t""$ac_cv_type_in_addr_t" 1>&6 -if test $ac_cv_type_in_addr_t = no; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 cat >> confdefs.h <<\EOF -#define in_addr_t unsigned long +#define HAVE_LIBUU 1 EOF -fi + cat >> confdefs.h <<\EOF +#define HAVE_UUDEVIEW_H 1 +EOF + LIBS="$LIBS -luu" +else + echo "$ac_t""no" 1>&6 fi -rm -f conftest* +else + echo "$ac_t""no" 1>&6 fi -rm -f conftest* -echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:14071: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then + + +# ICU - International Components for Unicode +# TODO: do separate checks for +# - unorm_normalize() +# - uidna_IDNToUnicode() +# - ubidi_open() +cf_try_icuuc="no" +ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 +echo "configure:15269: checking for unicode/unorm.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - ac_cv_type_uid_t=yes + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_type_uid_t=no + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* - fi - -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 -if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF -#define uid_t int -EOF - - cat >> confdefs.h <<\EOF -#define gid_t int +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 +echo "configure:15298: checking for unicode/ustring.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < EOF - +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_UNICODE_UNORM_H 1 +EOF + cat >> confdefs.h <<\EOF +#define HAVE_UNICODE_USTRING_H 1 +EOF -echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:14106: checking for quad_t" >&5 -cat > conftest.$ac_ext <&6 +echo "configure:15334: checking for unorm_normalize in libicuuc" >&5 + cf_save_LIBS="$LIBS" + cf_try_icuuc="no" + LIBS="$LIBS -licuuc" + cat > conftest.$ac_ext < +int main() { -#include -#if 0 -#include -#include -#endif /* 0 */ + int32_t needed, ustr = NULL; + UErrorCode status; + needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); +; return 0; } +EOF +if { (eval echo configure:15349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + + cat >> confdefs.h <<\EOF +#define HAVE_LIBICUUC 1 +EOF + + cf_try_icuuc="yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 -int main() { -quad_t x; x = 0 -; return 0; } + LIBS=$cf_save_LIBS + +fi +rm -rf conftest* + echo "$ac_t""$cf_try_icuuc" 1>&6 + ac_safe=`echo "unicode/uidna.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for unicode/uidna.h""... $ac_c" 1>&6 +echo "configure:15368: checking for unicode/uidna.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < EOF -if { (eval echo configure:14121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - ac_cv_quad_t=yes + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_quad_t=no + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* -echo "$ac_t""$ac_cv_quad_t" 1>&6 -if test $ac_cv_quad_t = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_QUAD_T 1 +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_UNICODE_UIDNA_H 1 EOF + +else + echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:14140: checking for long long" >&5 -cat > conftest.$ac_ext <&6 +echo "configure:15406: checking for unicode/ubidi.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < - -int main() { -long long x; x = 0 -; return 0; } +#include EOF -if { (eval echo configure:14151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then rm -rf conftest* - ac_cv_long_long=yes + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - ac_cv_long_long=no + eval "ac_cv_header_$ac_safe=no" fi rm -f conftest* -echo "$ac_t""$ac_cv_long_long" 1>&6 -if test $ac_cv_long_long = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_LONG_LONG 1 +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_UNICODE_UBIDI_H 1 EOF + +else + echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:14170: checking for nl_item" >&5 -cat > conftest.$ac_ext <&6 +fi -#ifdef HAVE_LANGINFO_H -#include -#else -#ifdef HAVE_NL_TYPES_H -#include -#endif -#endif -int main() { -nl_item x; x = 0 -; return 0; } -EOF -if { (eval echo configure:14187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_nl_item=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_nl_item=no + echo "$ac_t""no" 1>&6 fi -rm -f conftest* -echo "$ac_t""$ac_cv_nl_item" 1>&6 -if test $ac_cv_nl_item = yes; then - cat >> confdefs.h <<\EOF -#define HAVE_NL_ITEM 1 -EOF -fi -### Checks for libraries. -# libuu/uudeview -# only define HAVE_LIBUU and HAVE_UUDEVIEW_H if both are found -echo $ac_n "checking for UUInitialize in -luu""... $ac_c" 1>&6 -echo "configure:14209: checking for UUInitialize in -luu" >&5 -ac_lib_var=`echo uu'_'UUInitialize | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +# without icuuc try GNU libunistring for normalization +if test $cf_try_icuuc = no ; then + ac_safe=`echo "unitypes.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for unitypes.h""... $ac_c" 1>&6 +echo "configure:15457: checking for unitypes.h" >&5 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_save_LIBS="$LIBS" -LIBS="-luu $LIBS" -cat > conftest.$ac_ext < conftest.$ac_ext < EOF -if { (eval echo configure:14228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - eval "ac_cv_lib_$ac_lib_var=yes" +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:15467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" else + echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - - eval "ac_cv_lib_$ac_lib_var=no" + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" fi -rm -rf conftest* -LIBS="$ac_save_LIBS" - +rm -f conftest* fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_safe=`echo "uudeview.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for uudeview.h""... $ac_c" 1>&6 -echo "configure:14245: checking for uudeview.h" >&5 + + ac_safe=`echo "uninorm.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for uninorm.h""... $ac_c" 1>&6 +echo "configure:15486: checking for uninorm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14267,29 +15508,64 @@ rm -f conftest* fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_LIBUU 1 + + cat >> confdefs.h <<\EOF +#define HAVE_UNITYPES_H 1 EOF - cat >> confdefs.h <<\EOF -#define HAVE_UUDEVIEW_H 1 + cat >> confdefs.h <<\EOF +#define HAVE_UNINORM_H 1 EOF - LIBS="$LIBS -luu" - + echo $ac_n "checking for u8_normalize in libunistring""... $ac_c" 1>&6 +echo "configure:15522: checking for u8_normalize in libunistring" >&5 + cf_save_LIBS="$LIBS" + cf_try_unistring="no" + LIBS="$LIBS -lunistring" + cat > conftest.$ac_ext < + #include +int main() { + + size_t ol = 0; + u8_normalize(UNINORM_NFC, (uint8_t *) "x", 2, NULL, &ol); +; return 0; } +EOF +if { (eval echo configure:15537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + + cat >> confdefs.h <<\EOF +#define HAVE_LIBUNISTRING 1 +EOF + + cf_try_unistring="yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + LIBS=$cf_save_LIBS + +fi +rm -rf conftest* + echo "$ac_t""$cf_try_unistring" 1>&6 + else echo "$ac_t""no" 1>&6 fi - + else echo "$ac_t""no" 1>&6 fi +fi -# libidn - Internationalized Domain Names -echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 -echo "configure:14293: checking for stringprep_check_version in -lidn" >&5 +# without icuuc try libidn for Internationalized Domain Names / IDN 2003 +if test $cf_try_icuuc = no ; then + echo $ac_n "checking for stringprep_check_version in -lidn""... $ac_c" 1>&6 +echo "configure:15569: checking for stringprep_check_version in -lidn" >&5 ac_lib_var=`echo idn'_'stringprep_check_version | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14297,7 +15573,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14325,17 +15601,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 ac_safe=`echo "stringprep.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stringprep.h""... $ac_c" 1>&6 -echo "configure:14329: checking for stringprep.h" >&5 +echo "configure:15605: checking for stringprep.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14339: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14352,23 +15628,23 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_STRINGPREP_H 1 EOF - ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` + ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:14362: checking for idna.h" >&5 +echo "configure:15638: checking for idna.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14385,12 +15661,12 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_IDNA_H 1 EOF - echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 -echo "configure:14394: checking for idna_to_unicode_lzlz in -lidn" >&5 + echo $ac_n "checking for idna_to_unicode_lzlz in -lidn""... $ac_c" 1>&6 +echo "configure:15670: checking for idna_to_unicode_lzlz in -lidn" >&5 ac_lib_var=`echo idn'_'idna_to_unicode_lzlz | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14398,7 +15674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidn $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14425,14 +15701,14 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_IDNA_TO_UNICODE_LZLZ 1 EOF - echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:14434: checking for IDNA_USE_STD3_ASCII_RULES" >&5 - cat > conftest.$ac_ext <&6 +echo "configure:15710: checking for IDNA_USE_STD3_ASCII_RULES" >&5 + cat > conftest.$ac_ext < EOF @@ -14440,87 +15716,140 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>& egrep "IDNA_USE_STD3_ASCII_RULES" >/dev/null 2>&1; then rm -rf conftest* - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_IDNA_USE_STD3_ASCII_RULES 1 EOF - echo "$ac_t""yes" 1>&6 + echo "$ac_t""yes" 1>&6 else rm -rf conftest* echo "$ac_t""no" 1>&6 - + fi rm -f conftest* - + else echo "$ac_t""no" 1>&6 fi - + echo $ac_n "checking for idna_strerror in -lidn""... $ac_c" 1>&6 +echo "configure:15738: checking for idna_strerror in -lidn" >&5 +ac_lib_var=`echo idn'_'idna_strerror | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lidn $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + + cat >> confdefs.h <<\EOF +#define HAVE_IDNA_STRERROR 1 +EOF + + else echo "$ac_t""no" 1>&6 fi - cat >> confdefs.h <<\EOF + +else + echo "$ac_t""no" 1>&6 +fi + + cat >> confdefs.h <<\EOF #define HAVE_LIBIDN 1 EOF - LIBS="$LIBS -lidn" - + LIBS="$LIBS -lidn" + else echo "$ac_t""no" 1>&6 fi - + else echo "$ac_t""no" 1>&6 fi +fi -# ICU - International Components for Unicode -ac_safe=`echo "unicode/unorm.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unicode/unorm.h""... $ac_c" 1>&6 -echo "configure:14485: checking for unicode/unorm.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +# libidnkit - Internationalized Domain Names / IDN 2008 +echo $ac_n "checking for idn_decodename in -lidnkit""... $ac_c" 1>&6 +echo "configure:15806: checking for idn_decodename in -lidnkit" >&5 +ac_lib_var=`echo idnkit'_'idn_decodename | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - cat > conftest.$ac_ext < conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char idn_decodename(); + +int main() { +idn_decodename() +; return 0; } EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" +if { (eval echo configure:15825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + + eval "ac_cv_lib_$ac_lib_var=no" fi -rm -f conftest* +rm -rf conftest* +LIBS="$ac_save_LIBS" + fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - ac_safe=`echo "unicode/ustring.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unicode/ustring.h""... $ac_c" 1>&6 -echo "configure:14514: checking for unicode/ustring.h" >&5 + ac_safe=`echo "idn/api.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for idn/api.h""... $ac_c" 1>&6 +echo "configure:15843: checking for idn/api.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +#include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -14537,85 +15866,50 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF -#define HAVE_UNICODE_UNORM_H 1 -EOF - - cat >> confdefs.h <<\EOF -#define HAVE_UNICODE_USTRING_H 1 -EOF - - echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:14550: checking for unorm_normalize in libicuuc" >&5 + echo $ac_n "checking for IDN_DECODE_LOOKUP""... $ac_c" 1>&6 +echo "configure:15871: checking for IDN_DECODE_LOOKUP" >&5 cf_save_LIBS="$LIBS" - cf_try_icuuc="no" - LIBS="$LIBS -licuuc" + LIBS="$LIBS -lidnkit" cat > conftest.$ac_ext < +#include + #include int main() { - int32_t needed, ustr = NULL; - UErrorCode status; - needed = unorm_normalize(ustr, -1, UNORM_DEFAULT, 0, NULL, 0, &status); + idn_result_t rs; + char in[255], out[255]; + strcpy(in, "xn--brenfe-fta9a2q.de"); + rs = idn_decodename(IDN_DECODE_LOOKUP, &in, &out, 254); + idn_result_tostring(rs); ; return 0; } EOF -if { (eval echo configure:14565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF -#define HAVE_LIBICUUC 1 +#define HAVE_LIBIDNKIT 1 EOF - cf_try_icuuc="yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + cat >> confdefs.h <<\EOF +#define HAVE_IDN_API_H 1 +EOF - LIBS=$cf_save_LIBS - -fi -rm -rf conftest* - echo "$ac_t""$cf_try_icuuc" 1>&6 - ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 -echo "configure:14584: checking for unicode/ubidi.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext < + cat >> confdefs.h <<\EOF +#define HAVE_IDN_DECODENAME 1 EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + + echo "$ac_t""yes" 1>&6 else - echo "$ac_err" >&5 echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" -fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - - cat >> confdefs.h <<\EOF -#define HAVE_UNICODE_UBIDI_H 1 -EOF + + LIBS=$cf_save_LIBS + echo "$ac_t""no" 1>&6 -else - echo "$ac_t""no" 1>&6 fi - +rm -rf conftest* else echo "$ac_t""no" 1>&6 @@ -14627,6 +15921,7 @@ else fi + if test $use_curses != no ; then cf_cv_termlib=$cf_with_screen else @@ -14637,24 +15932,24 @@ else cf_cv_termlib=none cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_termlib=terminfo else @@ -14666,7 +15961,7 @@ fi rm -rf conftest* test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:14670: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:15965: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 @@ -14680,22 +15975,22 @@ if test "$cf_cv_termlib" = none; then # FreeBSD's linker gives bogus results for AC_CHECK_LIB, saying that # tgetstr lives in -lcurses when it is only an unsatisfied extern. cf_save_LIBS="$LIBS" - for cf_lib in curses ncurses termlib termcap - do - LIBS="-l$cf_lib $cf_save_LIBS" - for cf_func in tigetstr tgetstr + for cf_lib in tinfo curses ncurses termlib termcap do - echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:14690: checking for $cf_func in -l$cf_lib" >&5 - cat > conftest.$ac_ext <&6 +echo "configure:15985: checking for $cf_func in -l$cf_lib" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -14705,16 +16000,16 @@ else cf_result=no fi rm -rf conftest* - echo "$ac_t""$cf_result" 1>&6 - if test "$cf_result" = yes ; then - if test "$cf_func" = tigetstr ; then - cf_cv_termlib=terminfo - else - cf_cv_termlib=termcap + echo "$ac_t""$cf_result" 1>&6 + if test "$cf_result" = yes ; then + if test "$cf_func" = tigetstr ; then + cf_cv_termlib=terminfo + else + cf_cv_termlib=termcap + fi + break fi - break - fi - done + done test "$cf_result" = yes && break done test "$cf_result" = no && LIBS="$cf_save_LIBS" @@ -14722,7 +16017,7 @@ fi if test "$cf_cv_termlib" = none; then # allow curses library for broken AIX system. echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6 -echo "configure:14726: checking for initscr in -lcurses" >&5 +echo "configure:16021: checking for initscr in -lcurses" >&5 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14730,7 +16025,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14762,7 +16057,7 @@ else fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:14766: checking for tgoto in -ltermcap" >&5 +echo "configure:16061: checking for tgoto in -ltermcap" >&5 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14770,7 +16065,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14814,11 +16109,11 @@ fi # terminfo-based termcap interfaces may be prototyped in , # which may/may not be compatible with echo $ac_n "checking if we should include termcap.h""... $ac_c" 1>&6 -echo "configure:14818: checking if we should include termcap.h" >&5 +echo "configure:16113: checking if we should include termcap.h" >&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -I$srcdir/include" cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -14850,7 +16145,7 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:14854: checking for term.h" >&5 +echo "configure:16149: checking for term.h" >&5 if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14871,7 +16166,7 @@ esac for cf_header in $cf_header_list do cat > conftest.$ac_ext < @@ -14880,7 +16175,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:14884: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -14900,7 +16195,7 @@ no) for cf_header in ncurses/term.h ncursesw/term.h do cat > conftest.$ac_ext < @@ -14913,7 +16208,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:14917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -14956,7 +16251,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:14960: checking if we should include curses.h or termcap.h" >&5 +echo "configure:16255: checking if we should include curses.h or termcap.h" >&5 if eval "test \"`echo '$''{'cf_cv_need_curses_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14974,7 +16269,7 @@ do test -n "$cf_t_opts" && CPPFLAGS="$CPPFLAGS -D$cf_t_opts" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then test "$cf_cv_need_curses_h" = no && { cf_cv_need_curses_h=maybe @@ -14995,7 +16290,7 @@ else echo "Recompiling with corrected call (C:$cf_c_opts, T:$cf_t_opts)" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_curses_h=yes cf_ok_c_opts=$cf_c_opts @@ -15079,7 +16374,7 @@ esac echo $ac_n "checking declaration of tputs 3rd param""... $ac_c" 1>&6 -echo "configure:15083: checking declaration of tputs 3rd param" >&5 +echo "configure:16378: checking declaration of tputs 3rd param" >&5 if eval "test \"`echo '$''{'cf_cv_type_outchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15095,10 +16390,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "${as_me:-configure}:15099: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "${as_me:-configure}:16394: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -15162,14 +16457,14 @@ EOF elif test ".$cf_cv_termlib" = .termcap ; then # BSD 'tputs()' may need 'PC' to be set. cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF #define HAVE_EXTERN_TCAP_PC 1 @@ -15188,13 +16483,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:15192: checking if external errno is declared" >&5 +echo "configure:16487: checking if external errno is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16506: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -15235,13 +16530,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external errno exists""... $ac_c" 1>&6 -echo "configure:15239: checking if external errno exists" >&5 +echo "configure:16534: checking if external errno exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_have_errno=yes else @@ -15283,12 +16578,12 @@ fi for ac_func in strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15287: checking for $ac_func" >&5 +echo "configure:16582: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -15338,13 +16633,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:15342: checking if external sys_nerr is declared" >&5 +echo "configure:16637: checking if external sys_nerr is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -15385,13 +16680,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_nerr exists""... $ac_c" 1>&6 -echo "configure:15389: checking if external sys_nerr exists" >&5 +echo "configure:16684: checking if external sys_nerr exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_nerr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_have_sys_nerr=yes else @@ -15430,13 +16725,13 @@ fi echo $ac_n "checking if external sys_errlist is declared""... $ac_c" 1>&6 -echo "configure:15434: checking if external sys_errlist is declared" >&5 +echo "configure:16729: checking if external sys_errlist is declared" >&5 if eval "test \"`echo '$''{'cf_cv_dcl_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -15477,13 +16772,13 @@ fi # It's possible (for near-UNIX clones) that the data doesn't exist echo $ac_n "checking if external sys_errlist exists""... $ac_c" 1>&6 -echo "configure:15481: checking if external sys_errlist exists" >&5 +echo "configure:16776: checking if external sys_errlist exists" >&5 if eval "test \"`echo '$''{'cf_cv_have_sys_errlist'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_have_sys_errlist=yes else @@ -15531,6 +16826,8 @@ for ac_func in \ alarm \ atoi \ atol \ + atoll \ + atoq \ bcopy \ chmod \ closesocket \ @@ -15565,6 +16862,7 @@ for ac_func in \ setenv \ setlocale \ settz \ + setvbuf \ sigaction \ snprintf \ stpcpy \ @@ -15579,6 +16877,7 @@ for ac_func in \ strsep \ strstr \ strtol \ + strtoll \ tmpfile \ tzset \ uname \ @@ -15591,12 +16890,12 @@ for ac_func in \ $cf_tc_funcs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15595: checking for $ac_func" >&5 +echo "configure:16894: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -15645,12 +16944,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:15649: checking for flock" >&5 +echo "configure:16948: checking for flock" >&5 if eval "test \"`echo '$''{'ac_cv_func_flock'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_flock=yes" else @@ -15695,7 +16994,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:15699: checking for flock in -lbsd" >&5 +echo "configure:16998: checking for flock in -lbsd" >&5 ac_lib_var=`echo bsd'_'flock | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15703,7 +17002,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lbsd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15741,14 +17040,115 @@ fi fi +# clock_gettime() / librt +echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 +echo "configure:17046: checking for clock_gettime" >&5 +if eval "test \"`echo '$''{'ac_cv_func_clock_gettime'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char clock_gettime(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_clock_gettime) || defined (__stub___clock_gettime) +choke me +#else +clock_gettime(); +#endif + +; return 0; } +EOF +if { (eval echo configure:17074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_clock_gettime=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_clock_gettime=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'clock_gettime`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_CLOCK_GETTIME 1 +EOF + +else + echo "$ac_t""no" 1>&6 + + echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 +echo "configure:17096: checking for clock_gettime in -lrt" >&5 +ac_lib_var=`echo rt'_'clock_gettime | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lrt $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -rf conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_CLOCK_GETTIME 1 +EOF + + LIBS="$LIBS -lrt" + +else + echo "$ac_t""no" 1>&6 +fi + + + +fi + + echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:15747: checking for wide char and multibyte support" >&5 +echo "configure:17147: checking for wide char and multibyte support" >&5 if eval "test \"`echo '$''{'am_cv_multibyte_able'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifdef HAVE_STDLIB_H @@ -15783,7 +17183,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 /* (void) iswupper((wint_t) wcb[0]); */ /* (void) towlower((wint_t) wcb[0]); */ /* (void) iswlower((wint_t) wcb[0]); */ - /* (void) iswalpha((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); /* (void) iswblank((wint_t) wcb[0]); */ /* (void) iswpunct((wint_t) wcb[0]); */ /* (void) iswxdigit((wint_t) wcb[0]); */ @@ -15802,7 +17202,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:15806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=yes else @@ -15812,7 +17212,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -15837,7 +17237,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 /* (void) iswupper((wint_t) wcb[0]); */ /* (void) towlower((wint_t) wcb[0]); */ /* (void) iswlower((wint_t) wcb[0]); */ - /* (void) iswalpha((wint_t) wcb[0]); */ + (void) iswalpha((wint_t) wcb[0]); /* (void) iswblank((wint_t) wcb[0]); */ /* (void) iswpunct((wint_t) wcb[0]); */ /* (void) iswxdigit((wint_t) wcb[0]); */ @@ -15856,7 +17256,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:15860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=libutf8 else @@ -15890,9 +17290,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:15894: checking if gettimeofday takes two arguments" >&5 +echo "configure:17294: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -15923,12 +17323,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:15927: checking return type of signal handlers" >&5 +echo "configure:17327: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -15945,7 +17345,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:15949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -15965,7 +17365,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:15969: checking declaration of signal arguments" >&5 +echo "configure:17369: checking declaration of signal arguments" >&5 if eval "test \"`echo '$''{'cf_cv_sig_args'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -15974,7 +17374,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -15982,7 +17382,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:15986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -16008,13 +17408,13 @@ EOF if test "$ac_cv_func_sigaction" = yes; then echo $ac_n "checking whether sigaction needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:16012: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:17412: checking whether sigaction needs _POSIX_SOURCE" >&5 if eval "test \"`echo '$''{'cf_cv_sigact_bad'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16023,7 +17423,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:16027: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -16044,13 +17444,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:16048: checking if we have sigaction/related functions" >&5 +echo "configure:17448: checking if we have sigaction/related functions" >&5 if eval "test \"`echo '$''{'cf_cv_sigaction_funcs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_sigaction_funcs=yes else @@ -16090,7 +17490,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:16094: checking for fork" >&5 +echo "configure:17494: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16099,7 +17499,7 @@ if test "$cross_compiling" = yes; then cf_cv_func_fork=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_func_fork=yes else @@ -16131,12 +17531,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:16135: checking for memmove" >&5 +echo "configure:17535: checking for memmove" >&5 if eval "test \"`echo '$''{'ac_cv_func_memmove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_memmove=yes" else @@ -16178,12 +17578,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:16182: checking for bcopy" >&5 +echo "configure:17582: checking for bcopy" >&5 if eval "test \"`echo '$''{'ac_cv_func_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_bcopy=yes" else @@ -16222,7 +17622,7 @@ if eval "test \"`echo '$ac_cv_func_'bcop echo "$ac_t""yes" 1>&6 echo $ac_n "checking if bcopy does overlapping moves""... $ac_c" 1>&6 -echo "configure:16226: checking if bcopy does overlapping moves" >&5 +echo "configure:17626: checking if bcopy does overlapping moves" >&5 if eval "test \"`echo '$''{'cf_cv_good_bcopy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16231,7 +17631,7 @@ else cf_cv_good_bcopy=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_good_bcopy=yes else @@ -16282,9 +17682,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:16286: checking if select expects int * arguments" >&5 +echo "configure:17686: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -16304,7 +17704,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:16308: checking whether closedir returns void" >&5 +echo "configure:17708: checking whether closedir returns void" >&5 if eval "test \"`echo '$''{'ac_cv_func_closedir_void'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16312,13 +17712,13 @@ else ac_cv_func_closedir_void=yes else cat > conftest.$ac_ext < #include <$ac_header_dirent> int closedir(); main() { exit(closedir(opendir(".")) != 0); } EOF -if { (eval echo configure:16322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_closedir_void=no else @@ -16344,7 +17744,7 @@ fi # autoconf 2.5x assumes setvbuf is not reversed when cross-compiling if test "$cross_compiling" != yes ; then echo $ac_n "checking whether setvbuf arguments are reversed""... $ac_c" 1>&6 -echo "configure:16348: checking whether setvbuf arguments are reversed" >&5 +echo "configure:17748: checking whether setvbuf arguments are reversed" >&5 if eval "test \"`echo '$''{'ac_cv_func_setvbuf_reversed'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16352,7 +17752,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < /* If setvbuf has the reversed format, exit 0. */ @@ -16366,7 +17766,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:16370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_setvbuf_reversed=yes else @@ -16404,12 +17804,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16408: checking for $ac_func" >&5 +echo "configure:17808: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -16459,13 +17859,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:16463: checking for type sigaction_t" >&5 +echo "configure:17863: checking for type sigaction_t" >&5 if eval "test \"`echo '$''{'cf_cv_type_sigaction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16473,7 +17873,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:16477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -16493,13 +17893,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:16497: checking for nonconflicting termios.h" >&5 +echo "configure:17897: checking for nonconflicting termios.h" >&5 if eval "test \"`echo '$''{'cf_cv_use_termios_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_use_termios_h=yes else @@ -16552,13 +17952,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:16556: checking for passwd.pw_gecos" >&5 +echo "configure:17956: checking for passwd.pw_gecos" >&5 if eval "test \"`echo '$''{'cf_cv_pw_gecos'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -16569,7 +17969,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:16573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -16589,13 +17989,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:16593: checking for tm.tm_gmtoff" >&5 +echo "configure:17993: checking for tm.tm_gmtoff" >&5 if eval "test \"`echo '$''{'cf_cv_tm_gmtoff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -16635,7 +18035,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:16639: checking for long file names" >&5 +echo "configure:18039: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16683,17 +18083,17 @@ for ac_hdr in sys/wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16687: checking for $ac_hdr" >&5 +echo "configure:18087: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16730,17 +18130,17 @@ for ac_hdr in wait.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16734: checking for $ac_hdr" >&5 +echo "configure:18134: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16770,17 +18170,17 @@ for ac_hdr in waitstatus.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:16774: checking for $ac_hdr" >&5 +echo "configure:18174: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:16784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -16821,13 +18221,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:16825: checking for union wait" >&5 +echo "configure:18225: checking for union wait" >&5 if eval "test \"`echo '$''{'cf_cv_type_unionwait'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_type_unionwait=no echo compiles ok w/o union wait 1>&5 @@ -16849,7 +18249,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_type_unionwait=yes echo compiles ok with union wait and possibly macros too 1>&5 @@ -16889,7 +18289,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:16893: checking if the system function returns usable child-status" >&5 +echo "configure:18293: checking if the system function returns usable child-status" >&5 if eval "test \"`echo '$''{'cf_cv_system_status'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16898,7 +18298,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -16931,7 +18331,7 @@ int main() } EOF -if { (eval echo configure:16935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=no else @@ -16942,11 +18342,11 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_system_status=yes else @@ -16989,13 +18389,13 @@ EOF if test "$cf_cv_ncurses_version" != no ; then echo $ac_n "checking for obsolete/broken version of ncurses""... $ac_c" 1>&6 -echo "configure:16993: checking for obsolete/broken version of ncurses" >&5 +echo "configure:18393: checking for obsolete/broken version of ncurses" >&5 if eval "test \"`echo '$''{'cf_cv_ncurses_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17009,7 +18409,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:17013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -17034,13 +18434,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:17038: checking if curses supports color attributes" >&5 +echo "configure:18438: checking if curses supports color attributes" >&5 if eval "test \"`echo '$''{'cf_cv_color_curses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -17055,7 +18455,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:17059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_color_curses=yes else @@ -17106,7 +18506,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:17110: checking for redefinable signal constants" >&5 +echo "configure:18510: checking for redefinable signal constants" >&5 if eval "test \"`echo '$''{'cf_cv_sig_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17118,7 +18518,7 @@ if test -n "$cf_cv_sig_args"; then cf_cv_sig_const=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_sig_const=yes else @@ -17171,13 +18571,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:17175: checking for ANSI qsort" >&5 +echo "configure:18575: checking for ANSI qsort" >&5 if eval "test \"`echo '$''{'cf_cv_comptype'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -17217,7 +18617,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:17221: checking if application can dump core" >&5 +echo "configure:18621: checking if application can dump core" >&5 if eval "test \"`echo '$''{'cf_cv_corefile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17226,7 +18626,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -17267,7 +18667,7 @@ int main() #endif } EOF -if { (eval echo configure:17271: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_corefile=yes else @@ -17315,18 +18715,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17319: checking for missing "${ac_func}" extern" >&5 +echo "configure:18719: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:17325: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:18725: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -17348,7 +18748,7 @@ if { (eval echo configure:17344: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17407,18 +18807,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17411: checking for missing "${ac_func}" extern" >&5 +echo "configure:18811: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:17417: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:18817: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -17440,7 +18840,7 @@ if { (eval echo configure:17436: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18854: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17497,18 +18897,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17501: checking for missing "${ac_func}" extern" >&5 +echo "configure:18901: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:17507: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:18907: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -17530,7 +18930,7 @@ if { (eval echo configure:17526: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17582,6 +18982,8 @@ for ac_func in \ alarm \ atoi \ atol \ + atoll \ + atoq \ bcopy \ bzero \ calloc \ @@ -17601,6 +19003,7 @@ for ac_func in \ getcwd \ getopt \ getwd \ + heapsort \ ioctl \ isascii \ kill \ @@ -17624,6 +19027,7 @@ for ac_func in \ strftime \ strncasecmp \ strtol \ + strtoll \ system \ time \ tolower \ @@ -17639,18 +19043,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17643: checking for missing "${ac_func}" extern" >&5 +echo "configure:19047: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:17649: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19053: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -17672,7 +19076,7 @@ if { (eval echo configure:17668: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17726,18 +19130,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17730: checking for missing "${ac_func}" extern" >&5 +echo "configure:19134: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:17736: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19140: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -17759,7 +19163,7 @@ if { (eval echo configure:17755: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17816,18 +19220,18 @@ ac_tr_func=`echo "$ac_func" | sed y%abcd echo $ac_n "checking for missing "${ac_func}" extern""... $ac_c" 1>&6 -echo "configure:17820: checking for missing "${ac_func}" extern" >&5 +echo "configure:19224: checking for missing "${ac_func}" extern" >&5 if eval "test \"`echo '$''{'cf_cv_func_${ac_func}'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -echo "${as_me:-configure}:17826: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19230: testing for missing "${ac_func}" external ..." 1>&5 cf_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $CHECK_DECL_FLAG" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if test -n "$CHECK_DECL_HDRS" ; then # try to work around system headers which are infested with non-standard syntax @@ -17849,7 +19253,7 @@ if { (eval echo configure:17845: \"$ac_l cf_1_up=`echo "${ac_func}" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19267: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -17897,7 +19301,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:17901: checking for working TIOCGWINSZ" >&5 +echo "configure:19305: checking for working TIOCGWINSZ" >&5 if eval "test \"`echo '$''{'cf_cv_use_tiocgwinsz'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17908,7 +19312,7 @@ else cf_cv_use_tiocgwinsz=unknown else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cf_cv_use_tiocgwinsz=yes else @@ -17980,7 +19384,7 @@ esac # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17984: checking for $ac_word" >&5 +echo "configure:19388: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18010,19 +19414,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:18014: checking for working alloca.h" >&5 +echo "configure:19418: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:18026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_header_alloca_h=yes else @@ -18043,12 +19447,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18047: checking for alloca" >&5 +echo "configure:19451: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_func_alloca_works=yes else @@ -18108,12 +19512,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:18112: checking whether alloca needs Cray hooks" >&5 +echo "configure:19516: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18142: checking for $ac_func" >&5 +echo "configure:19546: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -18193,7 +19597,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:18197: checking stack direction for C alloca" >&5 +echo "configure:19601: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18201,7 +19605,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -18245,17 +19649,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18249: checking for $ac_hdr" >&5 +echo "configure:19653: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18284,12 +19688,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18288: checking for $ac_func" >&5 +echo "configure:19692: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -18337,7 +19741,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:18341: checking for working mmap" >&5 +echo "configure:19745: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18345,7 +19749,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -18509,12 +19913,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:18513: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:19917: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -18566,23 +19970,23 @@ fi fi - + for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18576: checking for $ac_hdr" >&5 +echo "configure:19980: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:19990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18613,12 +20017,12 @@ getgid getuid mempcpy munmap putenv sete strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18617: checking for $ac_func" >&5 +echo "configure:20021: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -18709,14 +20113,14 @@ if test -n "$cf_searchpath/include" ; th cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:18720: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18733,7 +20137,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:18737: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20141: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18775,14 +20179,14 @@ if test -n "$cf_searchpath/../include" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:18786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18799,7 +20203,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:18803: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20207: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -18839,7 +20243,7 @@ if test -n "$cf_searchpath/lib" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18843: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20247: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -18869,7 +20273,7 @@ if test -n "$cf_searchpath" ; then if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:18873: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20277: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -18891,7 +20295,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:18895: checking for iconv" >&5 +echo "configure:20299: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18904,13 +20308,13 @@ cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:18908: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:20312: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -18924,7 +20328,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_iconv=yes @@ -18940,7 +20344,7 @@ else LIBS="-liconv $cf_save_LIBS" cat > conftest.$ac_ext < @@ -18954,7 +20358,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_iconv=yes @@ -18972,11 +20376,11 @@ else test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:18976: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:20380: testing find linkage for iconv library ..." 1>&5 -echo "${as_me:-configure}:18980: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:20384: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" @@ -18994,7 +20398,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -19016,9 +20420,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/iconv && cf_search="$cf_search /usr/include/iconv" @@ -19028,7 +20432,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -19040,9 +20444,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/iconv && cf_search="$cf_search /usr/local/include/iconv" @@ -19052,9 +20456,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/iconv && cf_search="$cf_search /opt/include/iconv" @@ -19064,9 +20468,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/iconv && cf_search="$cf_search $HOME/include/iconv" @@ -19098,12 +20502,12 @@ cf_search="$cf_search $cf_header_path_li if test -d $cf_cv_header_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:19102: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:20506: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv" cat > conftest.$ac_ext < @@ -19117,12 +20521,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:19126: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:20530: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=maybe @@ -19143,7 +20547,7 @@ rm -f conftest* if test "$cf_cv_find_linkage_iconv" = maybe ; then -echo "${as_me:-configure}:19147: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:20551: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" @@ -19162,7 +20566,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -19183,9 +20587,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/iconv && cf_search="$cf_search /usr/lib/iconv" @@ -19195,7 +20599,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -19207,9 +20611,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/iconv && cf_search="$cf_search /usr/local/lib/iconv" @@ -19219,9 +20623,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/iconv && cf_search="$cf_search /opt/lib/iconv" @@ -19231,9 +20635,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/iconv && cf_search="$cf_search $HOME/lib/iconv" @@ -19251,14 +20655,14 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_iconv ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:19255: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:20659: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-liconv $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_iconv" cat > conftest.$ac_ext < @@ -19272,12 +20676,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:19281: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:20685: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 cf_cv_find_linkage_iconv=yes @@ -19329,13 +20733,13 @@ EOF echo $ac_n "checking if the declaration of iconv() needs const.""... $ac_c" 1>&6 -echo "configure:19333: checking if the declaration of iconv() needs const." >&5 +echo "configure:20737: checking if the declaration of iconv() needs const." >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -19355,7 +20759,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19359: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_const=no else @@ -19408,14 +20812,14 @@ if test -n "$cf_cv_header_path_iconv" ; cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:19419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -19432,7 +20836,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:19436: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20840: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -19470,7 +20874,7 @@ if test -n "$cf_cv_library_path_iconv" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:19474: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20878: testing adding $cf_add_libdir to library-path ..." 1>&5 LDFLAGS="-L$cf_add_libdir $LDFLAGS" @@ -19486,19 +20890,19 @@ fi echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:19490: checking for nl_langinfo and CODESET" >&5 +echo "configure:20894: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:19502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_langinfo_codeset=yes else @@ -19521,19 +20925,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:19525: checking for LC_MESSAGES" >&5 +echo "configure:20929: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:19537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_val_LC_MESSAGES=yes else @@ -19554,7 +20958,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:19558: checking whether NLS is requested" >&5 +echo "configure:20962: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -19578,7 +20982,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:19582: checking whether included gettext is requested" >&5 +echo "configure:20986: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then @@ -19597,7 +21001,7 @@ fi cf_save_LIBS_1="$LIBS" LIBS="$LIBICONV $LIBS" echo $ac_n "checking for libintl.h and gettext()""... $ac_c" 1>&6 -echo "configure:19601: checking for libintl.h and gettext()" >&5 +echo "configure:21005: checking for libintl.h and gettext()" >&5 if eval "test \"`echo '$''{'cf_cv_func_gettext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -19610,13 +21014,13 @@ cf_cv_header_path_intl= cf_cv_library_path_intl= -echo "${as_me:-configure}:19614: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:21018: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -19631,7 +21035,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_intl=yes @@ -19647,7 +21051,7 @@ else LIBS="-lintl $cf_save_LIBS" cat > conftest.$ac_ext < @@ -19662,7 +21066,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_intl=yes @@ -19680,11 +21084,11 @@ else test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me:-configure}:19684: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:21088: testing find linkage for intl library ..." 1>&5 -echo "${as_me:-configure}:19688: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:21092: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_CPPFLAGS="$CPPFLAGS" @@ -19702,7 +21106,7 @@ if test -n "${CFLAGS}${CPPFLAGS}" ; then -I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` -test "$cf_header_path" != "NONE" && \ +test "x$cf_header_path" != "xNONE" && \ test -d "$cf_header_path" && \ { test -n "$verbose" && echo " ... testing for include-directories under $cf_header_path" @@ -19724,9 +21128,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr" test -d /usr/include && cf_search="$cf_search /usr/include" test -d /usr/include/intl && cf_search="$cf_search /usr/include/intl" @@ -19736,7 +21140,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for include-directories under $prefix" @@ -19748,9 +21152,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /usr/local" test -d /usr/local/include && cf_search="$cf_search /usr/local/include" test -d /usr/local/include/intl && cf_search="$cf_search /usr/local/include/intl" @@ -19760,9 +21164,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under /opt" test -d /opt/include && cf_search="$cf_search /opt/include" test -d /opt/include/intl && cf_search="$cf_search /opt/include/intl" @@ -19772,9 +21176,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for include-directories under $HOME" test -d $HOME/include && cf_search="$cf_search $HOME/include" test -d $HOME/include/intl && cf_search="$cf_search $HOME/include/intl" @@ -19806,12 +21210,12 @@ cf_search="$cf_search $cf_header_path_li if test -d $cf_cv_header_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:19810: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:21214: testing ... testing $cf_cv_header_path_intl ..." 1>&5 CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl" cat > conftest.$ac_ext < @@ -19826,12 +21230,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:19835: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:21239: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 cf_cv_find_linkage_intl=maybe @@ -19852,7 +21256,7 @@ rm -f conftest* if test "$cf_cv_find_linkage_intl" = maybe ; then -echo "${as_me:-configure}:19856: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:21260: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" @@ -19871,7 +21275,7 @@ if test -n "${LDFLAGS}${LIBS}" ; then -L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` -test "$cf_library_path" != "NONE" && \ +test "x$cf_library_path" != "xNONE" && \ test -d "$cf_library_path" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $cf_library_path" @@ -19892,9 +21296,9 @@ fi cf_search= -test "/usr" != "$prefix" && \ +test "x/usr" != "x$prefix" && \ test -d "/usr" && \ -(test $prefix = NONE || test "/usr" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr" test -d /usr/lib && cf_search="$cf_search /usr/lib" test -d /usr/lib/intl && cf_search="$cf_search /usr/lib/intl" @@ -19904,7 +21308,7 @@ test -d "/usr" && \ } -test "$prefix" != "NONE" && \ +test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { test -n "$verbose" && echo " ... testing for lib-directories under $prefix" @@ -19916,9 +21320,9 @@ test -d "$prefix" && \ } -test "/usr/local" != "$prefix" && \ +test "x/usr/local" != "x$prefix" && \ test -d "/usr/local" && \ -(test $prefix = NONE || test "/usr/local" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/usr/local" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /usr/local" test -d /usr/local/lib && cf_search="$cf_search /usr/local/lib" test -d /usr/local/lib/intl && cf_search="$cf_search /usr/local/lib/intl" @@ -19928,9 +21332,9 @@ test -d "/usr/local" && \ } -test "/opt" != "$prefix" && \ +test "x/opt" != "x$prefix" && \ test -d "/opt" && \ -(test $prefix = NONE || test "/opt" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x/opt" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under /opt" test -d /opt/lib && cf_search="$cf_search /opt/lib" test -d /opt/lib/intl && cf_search="$cf_search /opt/lib/intl" @@ -19940,9 +21344,9 @@ test -d "/opt" && \ } -test "$HOME" != "$prefix" && \ +test "x$HOME" != "x$prefix" && \ test -d "$HOME" && \ -(test $prefix = NONE || test "$HOME" != "$prefix") && { +(test -z "$prefix" || test x$prefix = xNONE || test "x$HOME" != "x$prefix") && { test -n "$verbose" && echo " ... testing for lib-directories under $HOME" test -d $HOME/lib && cf_search="$cf_search $HOME/lib" test -d $HOME/lib/intl && cf_search="$cf_search $HOME/lib/intl" @@ -19960,14 +21364,14 @@ cf_search="$cf_library_path_list $cf_sea if test -d $cf_cv_library_path_intl ; then test -n "$verbose" && echo " ... testing $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:19964: testing ... testing $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:21368: testing ... testing $cf_cv_library_path_intl ..." 1>&5 CPPFLAGS="$cf_test_CPPFLAGS" LIBS="-lintl $cf_save_LIBS" LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl" cat > conftest.$ac_ext < @@ -19982,12 +21386,12 @@ int main() { ; return 0; } EOF -if { (eval echo configure:19986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:19991: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:21395: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 cf_cv_find_linkage_intl=yes @@ -20071,14 +21475,14 @@ if test -n "$cf_cv_header_path_intl" ; t cf_save_CPPFLAGS=$CPPFLAGS CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" cat > conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:20082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20095,7 +21499,7 @@ rm -f conftest* if test "$cf_have_incdir" = no ; then test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6 -echo "${as_me:-configure}:20099: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:21503: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -20134,7 +21538,7 @@ if test -n "$cf_cv_library_path_intl" ; if test "$cf_have_libdir" = no ; then test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:20138: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21542: testing adding $cf_add_libdir to library-path ..." 1>&5 INTLLIBS="-L$cf_add_libdir $INTLLIBS" @@ -20150,12 +21554,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20154: checking for $ac_func" >&5 +echo "configure:21558: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -20208,7 +21612,7 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20212: checking for $ac_word" >&5 +echo "configure:21616: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20242,7 +21646,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20246: checking for $ac_word" >&5 +echo "configure:21650: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20280,7 +21684,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20284: checking for $ac_word" >&5 +echo "configure:21688: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20330,7 +21734,7 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20334: checking for $ac_word" >&5 +echo "configure:21738: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20364,7 +21768,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20368: checking for $ac_word" >&5 +echo "configure:21772: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20401,7 +21805,7 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20405: checking for $ac_word" >&5 +echo "configure:21809: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20473,7 +21877,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:20477: checking for $ac_word" >&5 +echo "configure:21881: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20506,7 +21910,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:20510: checking version of bison" >&5 +echo "configure:21914: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -20554,7 +21958,7 @@ echo "configure:20510: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:20558: checking for catalogs to be installed" >&5 +echo "configure:21962: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -20613,7 +22017,7 @@ use_our_messages=no if test "$USE_NLS" = yes ; then if test -d $srcdir/po ; then echo $ac_n "checking if we should use included message-library""... $ac_c" 1>&6 -echo "configure:20617: checking if we should use included message-library" >&5 +echo "configure:22021: checking if we should use included message-library" >&5 # Check whether --enable-included-msgs or --disable-included-msgs was given. if test "${enable_included_msgs+set}" = set; then @@ -20668,17 +22072,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:20672: checking for $ac_hdr" >&5 +echo "configure:22076: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:20682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -20762,19 +22166,19 @@ if test ".$use_alloca" = .yes ; then # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:20766: checking for working alloca.h" >&5 +echo "configure:22170: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:20778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_header_alloca_h=yes else @@ -20795,12 +22199,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:20799: checking for alloca" >&5 +echo "configure:22203: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_func_alloca_works=yes else @@ -20860,12 +22264,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:20864: checking whether alloca needs Cray hooks" >&5 +echo "configure:22268: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20894: checking for $ac_func" >&5 +echo "configure:22298: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -20945,7 +22349,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:20949: checking stack direction for C alloca" >&5 +echo "configure:22353: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20953,7 +22357,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:22380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -21017,9 +22421,9 @@ fi for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:21021: checking for $cf_hdr" >&5 +echo "configure:22425: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -21027,7 +22431,7 @@ echo "configure:21021: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:21031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -21053,13 +22457,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:21057: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:22461: checking for iconv_open() //TRANSLIT extension" >&5 if test "$cross_compiling" = yes; then echo "$ac_t""unknown" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:22484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF #define HAVE_ICONV_OPEN_TRANSLIT 1 @@ -21132,12 +22536,12 @@ EOF ;; *) echo $ac_n "checking for link""... $ac_c" 1>&6 -echo "configure:21136: checking for link" >&5 +echo "configure:22540: checking for link" >&5 if eval "test \"`echo '$''{'ac_cv_func_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_link=yes" else @@ -21190,7 +22594,7 @@ if test "$cf_cv_termlib" = pdcurses ; th # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:21194: checking for X" >&5 +echo "configure:22598: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -21253,12 +22657,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:21262: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -21327,14 +22731,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -21422,7 +22826,7 @@ fi echo $ac_n "checking if you want to use pkg-config""... $ac_c" 1>&6 -echo "configure:21426: checking if you want to use pkg-config" >&5 +echo "configure:22830: checking if you want to use pkg-config" >&5 # Check whether --with-pkg-config or --without-pkg-config was given. if test "${with_pkg_config+set}" = set; then @@ -21439,10 +22843,11 @@ no) #(vi PKG_CONFIG=none ;; yes) #(vi - # Extract the first word of "pkg-config", so it can be a program name with args. + +# Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21446: checking for $ac_word" >&5 +echo "configure:22851: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21497,7 +22902,7 @@ case ".$PKG_CONFIG" in #(vi ;; .[a-zA-Z]:[\\/]*) #(vi OS/2 EMX ;; -.\${*prefix}*) #(vi +.\${*prefix}*|.\${*dir}*) #(vi eval PKG_CONFIG="$PKG_CONFIG" case ".$PKG_CONFIG" in #(vi .NONE/*) @@ -21537,17 +22942,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:21541: checking whether -R must be followed by a space" >&5 +echo "configure:22946: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_R_nospace=yes else @@ -21563,14 +22968,14 @@ rm -rf conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_R_space=yes else @@ -21602,7 +23007,7 @@ rm -rf conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:21606: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:23011: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21610,7 +23015,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -21643,7 +23048,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:21647: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:23052: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21651,7 +23056,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -21691,12 +23096,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:21695: checking for gethostbyname" >&5 +echo "configure:23100: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_gethostbyname=yes" else @@ -21740,7 +23145,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:21744: checking for gethostbyname in -lnsl" >&5 +echo "configure:23149: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21748,7 +23153,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -21789,12 +23194,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:21793: checking for connect" >&5 +echo "configure:23198: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_connect=yes" else @@ -21838,7 +23243,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:21842: checking for connect in -lsocket" >&5 +echo "configure:23247: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21846,7 +23251,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -21881,12 +23286,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:21885: checking for remove" >&5 +echo "configure:23290: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_remove=yes" else @@ -21930,7 +23335,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:21934: checking for remove in -lposix" >&5 +echo "configure:23339: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21938,7 +23343,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -21973,12 +23378,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:21977: checking for shmat" >&5 +echo "configure:23382: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_shmat=yes" else @@ -22022,7 +23427,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:22026: checking for shmat in -lipc" >&5 +echo "configure:23431: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22030,7 +23435,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -22074,7 +23479,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:22078: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:23483: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22082,7 +23487,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -22121,7 +23526,7 @@ fi cf_x_athena=${cf_x_athena:-Xaw} echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6 -echo "configure:22125: checking if you want to link with Xaw 3d library" >&5 +echo "configure:23530: checking if you want to link with Xaw 3d library" >&5 withval= # Check whether --with-Xaw3d or --without-Xaw3d was given. @@ -22138,7 +23543,7 @@ else fi echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:22142: checking if you want to link with neXT Athena library" >&5 +echo "configure:23547: checking if you want to link with neXT Athena library" >&5 withval= # Check whether --with-neXtaw or --without-neXtaw was given. @@ -22155,7 +23560,7 @@ else fi echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:22159: checking if you want to link with Athena-Plus library" >&5 +echo "configure:23564: checking if you want to link with Athena-Plus library" >&5 withval= # Check whether --with-XawPlus or --without-XawPlus was given. @@ -22189,19 +23594,19 @@ if test "$PKG_CONFIG" != none ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then test -n "$verbose" && echo " found package $cf_athena_pkg" 1>&6 -echo "${as_me:-configure}:22193: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:23598: testing found package $cf_athena_pkg ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs $cf_athena_pkg 2>/dev/null`" test -n "$verbose" && echo " package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:22200: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:23605: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:22205: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:23610: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -22297,14 +23702,30 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_a EOF + + for cf_trim_lib in Xmu Xt X11 + do + case "$LIBS" in + *-l$cf_trim_lib\ *-l$cf_trim_lib*) + LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` + test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 + +echo "${as_me:-configure}:23714: testing ..trimmed $LIBS ..." 1>&5 + + + ;; + esac + done + + echo $ac_n "checking for usable $cf_x_athena/Xmu package""... $ac_c" 1>&6 -echo "configure:22302: checking for usable $cf_x_athena/Xmu package" >&5 +echo "configure:23723: checking for usable $cf_x_athena/Xmu package" >&5 if eval "test \"`echo '$''{'cf_cv_xaw_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -22315,7 +23736,7 @@ int check = XmuCompareISOLatin1("big", " ; return 0; } EOF -if { (eval echo configure:22319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_xaw_compat=yes else @@ -22338,28 +23759,30 @@ echo "$ac_t""$cf_cv_xaw_compat" 1>&6 *) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:22342: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:23763: testing work around broken package ..." 1>&5 + cf_save_xmu="$LIBS" + cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^ *//' -e 's/ .*//'` if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then test -n "$verbose" && echo " found package xmu" 1>&6 -echo "${as_me:-configure}:22351: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:23774: testing found package xmu ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xmu 2>/dev/null`" test -n "$verbose" && echo " package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:22358: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:23781: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:22363: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:23786: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -22445,29 +23868,65 @@ fi LIBS="$cf_pkgconfig_libs $LIBS" - : + + LIBS="$cf_save_xmu" + +test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +echo "${as_me:-configure}:23877: testing ...before $LIBS ..." 1>&5 + + +LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's% % %g'` +test -n "$verbose" && echo " ...after $LIBS" 1>&6 + +echo "${as_me:-configure}:23883: testing ...after $LIBS ..." 1>&5 + + + + else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:22454: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:23895: testing ...before $LIBS ..." 1>&5 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/ / /g'` +LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:22460: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:23901: testing ...after $LIBS ..." 1>&5 + fi + + for cf_trim_lib in Xmu Xt X11 + do + case "$LIBS" in + *-l$cf_trim_lib\ *-l$cf_trim_lib*) + LIBS=`echo "$LIBS " | sed -e 's/ / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'` + test -n "$verbose" && echo " ..trimmed $LIBS" 1>&6 + +echo "${as_me:-configure}:23916: testing ..trimmed $LIBS ..." 1>&5 + + + ;; + esac + done + ;; esac fi break else + cf_pkgconfig_incs= + cf_pkgconfig_libs= : fi @@ -22482,19 +23941,19 @@ if test -z "$cf_x_athena_lib" ; then if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then test -n "$verbose" && echo " found package Xext" 1>&6 -echo "${as_me:-configure}:22486: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:23945: testing found package Xext ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs Xext 2>/dev/null`" test -n "$verbose" && echo " package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:22493: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:23952: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:22498: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:23957: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -22582,9 +24041,11 @@ fi LIBS="$cf_pkgconfig_libs $LIBS" : else + cf_pkgconfig_incs= + cf_pkgconfig_libs= echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -echo "configure:22588: checking for XextCreateExtension in -lXext" >&5 +echo "configure:24049: checking for XextCreateExtension in -lXext" >&5 ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22592,7 +24053,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXext $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -22638,19 +24099,19 @@ cf_have_X_LIBS=no if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then test -n "$verbose" && echo " found package xt" 1>&6 -echo "${as_me:-configure}:22642: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:24103: testing found package xt ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs xt 2>/dev/null`" test -n "$verbose" && echo " package xt CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:22649: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24110: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:22654: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24115: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -22744,13 +24205,13 @@ fi *) # we have an "xt" package, but it may omit Xt's dependency on X11 echo $ac_n "checking for usable X dependency""... $ac_c" 1>&6 -echo "configure:22748: checking for usable X dependency" >&5 +echo "configure:24209: checking for usable X dependency" >&5 if eval "test \"`echo '$''{'cf_cv_xt_x11_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -22764,7 +24225,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:22768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_xt_x11_compat=yes else @@ -22781,7 +24242,7 @@ echo "$ac_t""$cf_cv_xt_x11_compat" 1>&6 then test -n "$verbose" && echo " work around broken X11 dependency" 1>&6 -echo "${as_me:-configure}:22785: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:24246: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. @@ -22791,19 +24252,19 @@ echo "${as_me:-configure}:22785: testing if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:22795: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:24256: testing found package x11 ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs x11 2>/dev/null`" test -n "$verbose" && echo " package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:22802: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24263: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package x11 LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:22807: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24268: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -22891,16 +24352,18 @@ fi LIBS="$cf_pkgconfig_libs $LIBS" : else + cf_pkgconfig_incs= + cf_pkgconfig_libs= test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:22898: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:24361: testing ...before $LIBS ..." 1>&5 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt -lX11 ," -e 's/ / /g'` +LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:22904: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:24367: testing ...after $LIBS ..." 1>&5 @@ -22911,13 +24374,13 @@ fi esac echo $ac_n "checking for usable X Toolkit package""... $ac_c" 1>&6 -echo "configure:22915: checking for usable X Toolkit package" >&5 +echo "configure:24378: checking for usable X Toolkit package" >&5 if eval "test \"`echo '$''{'cf_cv_xt_ice_compat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -22927,7 +24390,7 @@ int num = IceConnectionNumber(0) ; return 0; } EOF -if { (eval echo configure:22931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_xt_ice_compat=yes else @@ -22952,7 +24415,7 @@ echo "$ac_t""$cf_cv_xt_ice_compat" 1>&6 *) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:22956: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:24419: testing work around broken ICE dependency ..." 1>&5 @@ -22961,19 +24424,19 @@ echo "${as_me:-configure}:22956: testing if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:22965: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:24428: testing found package ice ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs ice 2>/dev/null`" test -n "$verbose" && echo " package ice CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:22972: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24435: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package ice LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:22977: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24440: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -23065,19 +24528,19 @@ fi if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:23069: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:24532: testing found package sm ..." 1>&5 cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`" cf_pkgconfig_libs="`$PKG_CONFIG --libs sm 2>/dev/null`" test -n "$verbose" && echo " package sm CFLAGS: $cf_pkgconfig_incs" 1>&6 -echo "${as_me:-configure}:23076: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24539: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:23081: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24544: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -23165,20 +24628,24 @@ fi LIBS="$cf_pkgconfig_libs $LIBS" : else + cf_pkgconfig_incs= + cf_pkgconfig_libs= : fi else + cf_pkgconfig_incs= + cf_pkgconfig_libs= test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:23176: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:24643: testing ...before $LIBS ..." 1>&5 -LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s,-lXt ,-lXt $X_PRE_LIBS ," -e 's/ / /g'` +LIBS=`echo "$LIBS" | sed -e "s/[ ][ ]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's% % %g'` test -n "$verbose" && echo " ...after $LIBS" 1>&6 -echo "${as_me:-configure}:23182: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:24649: testing ...after $LIBS ..." 1>&5 @@ -23193,13 +24660,15 @@ fi cf_have_X_LIBS=yes else + cf_pkgconfig_incs= + cf_pkgconfig_libs= LDFLAGS="$X_LIBS $LDFLAGS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:23203: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:24672: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" @@ -23271,7 +24740,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:23275: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:24744: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" @@ -23280,7 +24749,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:23284: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:24753: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" @@ -23289,7 +24758,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:23293: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:24762: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" @@ -23300,14 +24769,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:23311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -23315,13 +24784,13 @@ else test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:23319: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:24788: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:23325: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:24794: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi @@ -23332,12 +24801,12 @@ fi echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:23336: checking for XOpenDisplay" >&5 +echo "configure:24805: checking for XOpenDisplay" >&5 if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_XOpenDisplay=yes" else @@ -23379,7 +24848,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:23383: checking for XOpenDisplay in -lX11" >&5 +echo "configure:24852: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -23387,7 +24856,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23422,12 +24891,12 @@ fi echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:23426: checking for XtAppInitialize" >&5 +echo "configure:24895: checking for XtAppInitialize" >&5 if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_XtAppInitialize=yes" else @@ -23469,7 +24938,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:23473: checking for XtAppInitialize in -lXt" >&5 +echo "configure:24942: checking for XtAppInitialize in -lXt" >&5 ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -23477,7 +24946,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23541,13 +25010,13 @@ do if test $cf_path != default ; then CPPFLAGS="$cf_save -I$cf_path/include" echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6 -echo "configure:23545: checking for $cf_test in $cf_path" >&5 +echo "configure:25014: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:23548: checking for $cf_test" >&5 +echo "configure:25017: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -23556,7 +25025,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:23560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -23593,24 +25062,29 @@ for cf_path in default \ /usr/local do for cf_lib in \ - "-l$cf_x_athena_root -lXmu" \ - "-l$cf_x_athena_root -lXpm -lXmu" \ - "-l${cf_x_athena_root}_s -lXmu_s" + ${cf_x_athena_root} \ + ${cf_x_athena_root}7 \ + ${cf_x_athena_root}6 + do + for cf_libs in \ + "-l$cf_lib -lXmu" \ + "-l$cf_lib -lXpm -lXmu" \ + "-l${cf_lib}_s -lXmu_s" do if test -z "$cf_x_athena_lib" ; then cf_save="$LIBS" cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then - LIBS="-L$cf_path/lib $cf_lib $LIBS" - echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6 -echo "configure:23607: checking for $cf_lib in $cf_path" >&5 + LIBS="-L$cf_path/lib $cf_libs $LIBS" + echo $ac_n "checking for $cf_libs in $cf_path""... $ac_c" 1>&6 +echo "configure:25081: checking for $cf_libs in $cf_path" >&5 else - LIBS="$cf_lib $LIBS" - echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6 -echo "configure:23611: checking for $cf_test in $cf_lib" >&5 + LIBS="$cf_libs $LIBS" + echo $ac_n "checking for $cf_test in $cf_libs""... $ac_c" 1>&6 +echo "configure:25085: checking for $cf_test in $cf_libs" >&5 fi cat > conftest.$ac_ext < @@ -23621,7 +25095,7 @@ int main() { $cf_test((XtAppContext) 0) ; return 0; } EOF -if { (eval echo configure:23625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -23633,12 +25107,14 @@ fi rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 if test "$cf_result" = yes ; then - cf_x_athena_lib="$cf_lib" + cf_x_athena_lib="$cf_libs" break fi LIBS="$cf_save" fi - done + done # cf_libs + test -n "$cf_x_athena_lib" && break + done # cf_lib done if test -z "$cf_x_athena_lib" ; then @@ -23658,12 +25134,13 @@ fi + for ac_prog in xcurses-config do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:23667: checking for $ac_word" >&5 +echo "configure:25144: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -23713,7 +25190,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:23717: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:25194: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" @@ -23785,7 +25262,7 @@ done if test -n "$cf_new_cflags" ; then test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 -echo "${as_me:-configure}:23789: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:25266: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" @@ -23794,7 +25271,7 @@ fi if test -n "$cf_new_cppflags" ; then test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 -echo "${as_me:-configure}:23798: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:25275: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" @@ -23803,7 +25280,7 @@ fi if test -n "$cf_new_extra_cppflags" ; then test -n "$verbose" && echo " add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6 -echo "${as_me:-configure}:23807: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:25284: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" @@ -23814,14 +25291,14 @@ fi if test "$cf_check_cflags" != "$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:23825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -23829,13 +25306,13 @@ else test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:23833: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:25310: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:23839: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:25316: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi @@ -23845,7 +25322,7 @@ rm -rf conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:23849: checking for XOpenDisplay in -lX11" >&5 +echo "configure:25326: checking for XOpenDisplay in -lX11" >&5 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -23853,7 +25330,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23885,14 +25362,14 @@ else fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:23889: checking for XCurses library" >&5 +echo "configure:25366: checking for XCurses library" >&5 if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else LIBS="-lXCurses $LIBS" cat > conftest.$ac_ext < @@ -23902,7 +25379,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:23906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_lib_XCurses=yes else @@ -23930,17 +25407,17 @@ EOF ac_safe=`echo "xcurses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for xcurses.h""... $ac_c" 1>&6 -echo "configure:23934: checking for xcurses.h" >&5 +echo "configure:25411: checking for xcurses.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:23944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:25421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -23969,6 +25446,61 @@ else fi fi +for ac_func in vwprintw +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:25453: checking for $ac_func" >&5 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + cat > conftest.$ac_ext < +/* Override any gcc2 internal prototype to avoid an error. */ +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:25481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_$ac_func=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + ### sum up warnings if test "$cf_cv_termlib" = none ; then @@ -24184,6 +25716,7 @@ s%@PATH_SEPARATOR@%$PATH_SEPARATOR%g s%@DESTDIR@%$DESTDIR%g s%@XLC@%$XLC%g s%@CC@%$CC%g +s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g s%@CPP@%$CPP%g s%@SET_MAKE@%$SET_MAKE%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g @@ -24191,7 +25724,6 @@ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@YACC@%$YACC%g s%@LINT@%$LINT%g -s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g s%@EXEEXT@%$EXEEXT%g s%@OBJEXT@%$OBJEXT%g s%@PROG_EXT@%$PROG_EXT%g diff -Nurp '--exclude=.bzr*' tin-2.0.1/configure.in tin-2.2.0/configure.in --- tin-2.0.1/configure.in 2011-12-24 15:54:34.000000000 +0100 +++ tin-2.2.0/configure.in 2013-12-24 00:33:36.688344813 +0100 @@ -2,10 +2,10 @@ dnl Project : tin - a Usenet reader dnl Module : configure.in dnl Author : Thomas E. Dickey dnl Created : 1995-08-24 -dnl Updated : 2011-08-07 +dnl Updated : 2013-12-06 dnl Notes : dnl -dnl Copyright (c) 1995-2011 Thomas E. Dickey +dnl Copyright (c) 1995-2014 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -41,12 +41,14 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=2.0.1 +VERSION=2.2.0 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) AC_SUBST(VERSION) +EXTRAO_DEP='#' + CF_CHECK_CACHE CF_PATHSEP @@ -79,21 +81,18 @@ case "$host_os" in esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru sv tr" +ALL_LINGUAS="da de en_GB et fr ru sv tr zh_TW" ### Checks for programs save_CFLAGS="$CFLAGS" -AC_PROG_CC +CF_PROG_CC AC_PROG_GCC_TRADITIONAL AC_PROG_MAKE_SET AC_PROG_INSTALL CF_PROG_YACC AC_CHECK_PROGS(LINT, lint alint lclint tdlint splint, :) -AC_AIX CF_XOPEN_SOURCE CF_SIGWINCH -AC_ISC_POSIX -CF_ANSI_CC_REQD CF_PROG_EXT CF_LIB_PREFIX(LIB_PREFIX) AC_PROG_LN_S @@ -122,6 +121,35 @@ case "$host_cpu:$host_vendor:$host_os" i ;; esac +dnl TODO: also check for heapsort(3) in libbsd? +AC_MSG_CHECKING(if you would like to use heapsort) +CF_ARG_ENABLE(heapsort, + [ --enable-heapsort enable heapsort() as alternative to qsort], + [cf_use_heapsort=yes], + [cf_use_heapsort=no]) +AC_MSG_RESULT($cf_use_heapsort) +if test "x$cf_use_heapsort" = xyes; then + AC_CHECK_FUNCS(heapsort) + if test x"$ac_cv_func_heapsort" = xyes; then + AC_MSG_CHECKING(if its prototype is compatible with qsort) + AC_TRY_COMPILE([ +#include +#include +extern int my_compare(const void *, const void *); +],[ + char *base = 0; + heapsort((void *)0, 1, 2, my_compare); +],,[cf_use_heapsort=no]); + AC_MSG_RESULT($cf_use_heapsort) + else + CF_VERBOSE(will use our own heapsort function) + EXTRAO_DEP='' + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/heapsort.o" + fi +fi +if test "x$cf_use_heapsort" = xyes; then + AC_DEFINE(USE_HEAPSORT) +fi CF_WITH_PROGRAM(ispell, [ --with-ispell (default: from system path)]) @@ -160,6 +188,10 @@ fi ## slrnface CF_WITH_PROGRAM(slrnface, [ --with-slrnface (default: from system path)]) +if test -n "$ac_cv_path_PATH_SLRNFACE"; then + EXTRAO_DEP="" + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/xface.o" +fi ## Default shell AC_ARG_WITH(shell, @@ -344,7 +376,6 @@ else AC_MSG_WARN([[None of fcntl(), lockf(), flock() available]]) fi - AC_MSG_CHECKING(for screen type) AC_ARG_WITH(screen, [ --with-screen=xxx specify screen type, which must be one of: @@ -435,7 +466,6 @@ debug_malloc=none CF_WITH_DBMALLOC(debug_malloc=DBMALLOC) CF_WITH_DMALLOC(debug_malloc=DMALLOC) -EXTRAO_DEP='#' AC_ARG_WITH(trace, [ --with-trace use debugging/traces for screen output], [ @@ -447,7 +477,7 @@ AC_ARG_WITH(trace, use_trace=yes AC_DEFINE(USE_TRACE) EXTRAO_DEP='' - EXTRAOBJS="$EXTRAOBJS trace.o"], + EXTRAOBJS="$EXTRAOBJS \$(OBJDIR)/trace.o"], use_trace=no)])], [use_trace=no]) #AC_MSG_CHECKING(if you want debugging-trace) @@ -525,9 +555,10 @@ AC_SUBST(CANDIR_MAKE) AC_SUBST(CANLIBS) ## gsasl - used for AUTH SASL PLAIN +gsasl=no AC_CHECK_HEADER(gsasl.h, - AC_CHECK_LIB(gsasl, gsasl_check_version, gsasl=yes, gsasl=no), - gsasl=no) + [AC_CHECK_LIB(gsasl, gsasl_check_version, gsasl=yes)] +) if test "$gsasl" = "yes"; then CF_ARG_DISABLE(gsasl, [ --disable-gsasl don't use GNU SASL], @@ -674,6 +705,14 @@ if test "$enableval" = "yes"; then fi AC_REPLACE_FUNCS(getaddrinfo getnameinfo) +### should we use 64 bit article numbers if possible? +AC_MSG_CHECKING([whether to enable long article numbers]) +CF_ARG_ENABLE(long-article-numbers, + [ --enable-long-article-numbers + enable long article numbers (default: disabled)], +[AC_DEFINE(ENABLE_LONG_ARTICLE_NUMBERS)]) +AC_MSG_RESULT($enableval) + ### checks for operator characteristics (should be the last option) AC_MSG_CHECKING(whether to make a coffee while compiling) AC_ARG_WITH(coffee, @@ -808,6 +847,38 @@ if test $ac_cv_long_long = yes; then AC_DEFINE(HAVE_LONG_LONG) fi +dnl test to see if int_least64_t is defined +AC_MSG_CHECKING(for int_least64_t) +AC_TRY_COMPILE([ +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_HAVE_INTTYPES_H +#include +#endif +],[int_least64_t x; x = 0], +ac_cv_int_least64_t=yes, ac_cv_int_least64_t=no) +AC_MSG_RESULT($ac_cv_int_least64_t) +if test $ac_cv_int_least64_t = yes; then + AC_DEFINE(HAVE_INT_LEAST64_T) + + AC_MSG_CHECKING(for INT64_C) + AC_TRY_COMPILE([ +#ifdef HAVE_STDINT_H +#include +#endif +#ifdef HAVE_HAVE_INTTYPES_H +#include +#endif +],[int_least64_t x; x = INT64_C(0)], + ac_cv_int64_c=yes, ac_cv_int64_c=no) + AC_MSG_RESULT($ac_cv_int64_c) + if test $ac_cv_int64_c = yes; then + AC_DEFINE(HAVE_INT64_C) + fi +fi + + dnl test to see if nl_item is defined AC_MSG_CHECKING(for nl_item) AC_TRY_COMPILE([ @@ -836,28 +907,13 @@ AC_CHECK_LIB(uu, UUInitialize, )] ) -# libidn - Internationalized Domain Names -AC_CHECK_LIB(idn, stringprep_check_version, - [AC_CHECK_HEADER(stringprep.h,[ - AC_DEFINE(HAVE_STRINGPREP_H) - AC_CHECK_HEADER(idna.h, [ - AC_DEFINE(HAVE_IDNA_H) - AC_CHECK_LIB(idn, idna_to_unicode_lzlz,[ - AC_DEFINE(HAVE_IDNA_TO_UNICODE_LZLZ) - AC_MSG_CHECKING(for IDNA_USE_STD3_ASCII_RULES) - AC_EGREP_HEADER(IDNA_USE_STD3_ASCII_RULES, idna.h,[ - AC_DEFINE(HAVE_IDNA_USE_STD3_ASCII_RULES) - AC_MSG_RESULT(yes)], - AC_MSG_RESULT(no) - ) - ]) - ]) - AC_DEFINE(HAVE_LIBIDN) - LIBS="$LIBS -lidn"] - )] -) # ICU - International Components for Unicode +# TODO: do separate checks for +# - unorm_normalize() +# - uidna_IDNToUnicode() +# - ubidi_open() +cf_try_icuuc="no" AC_CHECK_HEADER(unicode/unorm.h,[ AC_CHECK_HEADER(unicode/ustring.h, [ AC_DEFINE(HAVE_UNICODE_UNORM_H) @@ -875,12 +931,88 @@ AC_CHECK_HEADER(unicode/unorm.h,[ LIBS=$cf_save_LIBS ) AC_MSG_RESULT($cf_try_icuuc) + AC_CHECK_HEADER(unicode/uidna.h, [ + AC_DEFINE(HAVE_UNICODE_UIDNA_H) + ]) AC_CHECK_HEADER(unicode/ubidi.h, [ AC_DEFINE(HAVE_UNICODE_UBIDI_H) ]) ]) ]) +# without icuuc try GNU libunistring for normalization +if test $cf_try_icuuc = no ; then + AC_CHECK_HEADER(unitypes.h,[ + AC_CHECK_HEADER(uninorm.h,[ + AC_DEFINE(HAVE_UNITYPES_H) + AC_DEFINE(HAVE_UNINORM_H) + AC_MSG_CHECKING(for u8_normalize in libunistring) + cf_save_LIBS="$LIBS" + cf_try_unistring="no" + LIBS="$LIBS -lunistring" + AC_TRY_LINK([#include + #include ], [ + size_t ol = 0; + u8_normalize(UNINORM_NFC, (uint8_t *) "x", 2, NULL, &ol);], [ + AC_DEFINE(HAVE_LIBUNISTRING) + cf_try_unistring="yes"], + LIBS=$cf_save_LIBS + ) + AC_MSG_RESULT($cf_try_unistring) + ]) + ]) +fi + +# without icuuc try libidn for Internationalized Domain Names / IDN 2003 +if test $cf_try_icuuc = no ; then + AC_CHECK_LIB(idn, stringprep_check_version, + [AC_CHECK_HEADER(stringprep.h,[ + AC_DEFINE(HAVE_STRINGPREP_H) + AC_CHECK_HEADER(idna.h, [ + AC_DEFINE(HAVE_IDNA_H) + AC_CHECK_LIB(idn, idna_to_unicode_lzlz, [ + AC_DEFINE(HAVE_IDNA_TO_UNICODE_LZLZ) + AC_MSG_CHECKING(for IDNA_USE_STD3_ASCII_RULES) + AC_EGREP_HEADER(IDNA_USE_STD3_ASCII_RULES, idna.h, [ + AC_DEFINE(HAVE_IDNA_USE_STD3_ASCII_RULES) + AC_MSG_RESULT(yes)], + AC_MSG_RESULT(no) + ) + ]) + AC_CHECK_LIB(idn, idna_strerror, [ + AC_DEFINE(HAVE_IDNA_STRERROR) + ]) + ]) + AC_DEFINE(HAVE_LIBIDN) + LIBS="$LIBS -lidn"] + )] + ) +fi + +# libidnkit - Internationalized Domain Names / IDN 2008 +AC_CHECK_LIB(idnkit, idn_decodename, [ + AC_CHECK_HEADER(idn/api.h, [ + AC_MSG_CHECKING(for IDN_DECODE_LOOKUP) + cf_save_LIBS="$LIBS" + LIBS="$LIBS -lidnkit" + AC_TRY_LINK([#include + #include ], [ + idn_result_t rs; + char in[255], out[255]; + strcpy(in, "xn--brenfe-fta9a2q.de"); + rs = idn_decodename(IDN_DECODE_LOOKUP, &in, &out, 254); + idn_result_tostring(rs);], [ + AC_DEFINE(HAVE_LIBIDNKIT) + AC_DEFINE(HAVE_IDN_API_H) + AC_DEFINE(HAVE_IDN_DECODENAME) + AC_MSG_RESULT(yes)], [ + LIBS=$cf_save_LIBS + AC_MSG_RESULT(no) + ]) + ]) +]) + + if test $use_curses != no ; then cf_cv_termlib=$cf_with_screen else @@ -928,6 +1060,8 @@ AC_CHECK_FUNCS(\ alarm \ atoi \ atol \ + atoll \ + atoq \ bcopy \ chmod \ closesocket \ @@ -962,6 +1096,7 @@ AC_CHECK_FUNCS(\ setenv \ setlocale \ settz \ + setvbuf \ sigaction \ snprintf \ stpcpy \ @@ -976,6 +1111,7 @@ AC_CHECK_FUNCS(\ strsep \ strstr \ strtol \ + strtoll \ tmpfile \ tzset \ uname \ @@ -993,6 +1129,16 @@ AC_CHECK_FUNC(flock, AC_DEFINE(HAVE_FLOCK) LIBS="$LIBS -lbsd")]) +# clock_gettime() / librt +AC_CHECK_FUNC(clock_gettime, + AC_DEFINE(HAVE_CLOCK_GETTIME),[ + AC_CHECK_LIB(rt, clock_gettime, + AC_DEFINE(HAVE_CLOCK_GETTIME) + LIBS="$LIBS -lrt" + ) + ] +) + AM_MULTIBYTE_ABLE AC_MSG_CHECKING(if gettimeofday takes two arguments) @@ -1131,6 +1277,8 @@ CF_CHECK_DECL(\ alarm \ atoi \ atol \ + atoll \ + atoq \ bcopy \ bzero \ calloc \ @@ -1150,6 +1298,7 @@ CF_CHECK_DECL(\ getcwd \ getopt \ getwd \ + heapsort \ ioctl \ isascii \ kill \ @@ -1173,6 +1322,7 @@ CF_CHECK_DECL(\ strftime \ strncasecmp \ strtol \ + strtoll \ system \ time \ tolower \ @@ -1286,6 +1436,7 @@ esac if test "$cf_cv_termlib" = pdcurses ; then CF_PDCURSES_X11 fi +AC_CHECK_FUNCS(vwprintw) ### sum up warnings if test "$cf_cv_termlib" = none ; then diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/CHANGES tin-2.2.0/doc/CHANGES --- tin-2.0.1/doc/CHANGES 2011-12-24 15:40:10.000000000 +0100 +++ tin-2.2.0/doc/CHANGES 2013-12-21 13:13:25.281068429 +0100 @@ -1,4 +1,212 @@ --- 2.0.1 release 20111224 "Achenvoir" -- +-- 2.2.0 release 20131224 "Lochindaal" -- + +U025) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U024) Thomas E. Dickey + ADD. update configure macros + FIX. aclocal.m4, configure.in + +U023) Dennis Preiser + BUG. do not truncate long subjects in group level if they + fit on the screen + FIX. group.c + +U022) Matt Anton + ADD. updated french translation + FIX. fr.po + +U021) Urs Janssen + ADD. removed some useless initializations + ADD. config.guess update + BUG. don't give error message for manually aborted saves + BUG. fixed a possible free(NULL) if linked against libgsasl + BUG. forged cancels (-DFORGERY) didn't include all original headers + in the body as it was done before tin 2.0.0 + BUG. memleak in pos_group_in_newsrc() when moving a group to new position + FIX. active.c, auth.c, curses.c, feed.c, group.c, inews.c, lang.c, mail.c + main.c, misc.c, newsrc.c, page.c, post.c, prompt.c, save.c, select.c + string.c, thread.c, xref.c, config.guess + +U020) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +-- 2.1.5 release 20131126 "Meadowburn" -- + +U019) Dennis Preiser + BUG. possible dereference null return value + BUG. fixed various uncritical resource leeks + BUG. possible wrong position of %U and %f with user defined screen + layout + FIX. select.c, string.c, tin.h + +U018) Matt Anton + ADD. updated french translation + FIX. fr.po + +U017) Urs Janssen + ADD. updated german translation + ADD. remove FWS from Newsgroups and Followup-To when posting a followup + ADD. allow new gTLDs xn--ngbc5azd, xn--80asehdb, xn--80aswg, xn--unup4y + ADD. allow new IDN ccTLD of Iran + ADD. allow new gTLDs graphics, contractors, gallery, sexy, construction + tattoo, technology, estate, land, bike, ventures, camera, clothing + lighting, singles, voyage, guru, holdings, equipment + ADD. make the filter debug output somewhat more readable + ADD. more verbose "LIST OVERVIEW.FMT" debugging + ADD. updated mbox and mmdf manpage + ADD. set default of disable_gnksa_domain_check to TRUE + ADD. mention mailaddress on the posting summary screen for mailgroups + BUG. in mailgroups the posting summary screen wasn't updated after + editing the article + BUG. fixed various uncritical resource leeks + BUG. fixed various hypothetic buffer overruns + BUG. removed some dead code + BUG. in -n case a valid group could be treated as invalid on RFC 3977 + servers + FIX. active.c, art.c, config.c, debug.c, feed.c, filter.c, getline.c + group.c, header.c, help.c, inews.c, init.c, keymap.c, lang.c, lock.c + main.c, memory.c, misc.c, my_tmpfile.c, newsrc.c, nntplib.c, page.c + pgp.c, post.c, read.c, refs.c, rfc1524.c rfc2046.c, rfc2047.c + save.c, search.c, select.c, sigfile.c, version.c, xface.c, xref.c + extern.h, policy.h, proto.h, de.po, mbox.5, mmdf.5 + +U016) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +-- 2.1.4 release 20131019 "Killarow" -- + +U015) Dennis Preiser + ADD. user defined screen layout at selection, group and thread level + (debian bug #63877) + BUG. the code for genetaring initials (used for quote_chars) was not + multibyte safe + FIX. attrib.c, config.c, group.c, init.c, lang.c, memory.c, misc.c + options_menu.c, page.c, post.c, save.c, screen.c, select.c, string.c + thread.c, tincfg.tbl, extern.h, proto.h, tin.h, tinrc.h, version.h + tin.1, tin.5 + +U014) Urs Janssen + BUG. off by one error when checking for valid ISO2ASC settings + BUG. current article was not recooked if changing + news_headers_to_display and/or news_headers_to_not_display + in the attributes menu + BUG. used 'K' instead of 'k' as kilo SI suffix when shortening large + numbers + ADD. skip "Can't find base article" message if not running in + DEBUG_FILTER or DEBUG_REFS mode + ADD. allow new IDN ccTLD of Mongolia + ADD. allow gTLD post. + ADD. tweaked manpage + ADD. make traget install_nls_man for translated manpages + ADD. config.guess update + FIX. charset.c, config.c, init.c, options_menu.c, string.c, policy.h + Makefile, Makefile.in, tin.1, tin.5, config.guess + +-- 2.1.3 release 20130812 "Scarabus" -- + +U013) Dennis Preiser + BUG. contents of Supersedes header was shown mime decoded in pager + FIX. cook.c + +U012) Wei-Lun Chao + ADD. updated chinese translation + FIX. zh_TW.po + +UO11) Dennis Grevenstein + BUG. used strdup() instead of my_strdup() (strdup is not mandatory + in ANSI-C) + FIX. art.c + +U010) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U009) Toomas Soome + ADD. updated estonian translation + FIX. et.po + +U008) Urs Janssen + BUG. interactive prompting for username/password in batch-mode + BUG. don't generate Cancel-Lock if cancel secret is empty + BUG. used strdup() instead of my_strdup() + ADD. prefer $XDG_RUNTIME_DIR over $HOME for fifos used by xface + ADD. allow new IDN ccTLD of Ukraine + ADD. allow new ccTLD of Sint Maarten + ADD. config.guess, config.sub update + ADD. avoid charset conversion if the local charset is the same as + the network charset + ADD. mention $TIN_NOVFILENAME in man pages + FIX. auth.c, debug.c, lang.c, misc.c, post.c, prompt.c, xface.c, bool.h + extern.h, policy.h, Makefile, config.guess, config.sub, tin.[15] + +-- 2.1.2 release 20121224 "Langholm" -- + +U007) Vincent Lefevre + BUG. doubled % in some description strings where single % are needed + (debian bug #684587) + FIX. lang.c + +U006) Urs Janssen + BUG. possible printf with null pointer in check_moderated() when trying + to post an article to a non existent group + ADD. config.guess, config.sub update + ADD. allow new IDN ccTLDs of Oman and Malaysia + BUG. username and password wasn't converted to UTF-8 for SASL AUTH PLAIN + BUG. missing square brackets in gsasl.h check + FIX. auth.c, post.c, policy.h, configure[.in], config.guess, config.sub + +U005) Matt Anton + ADD. updated french translation + FIX. fr.po + +-- 2.1.1 release 20120623 "Mulindry" -- + + 007) Urs Janssen + ADD. allow new IDN ccTLD of Kazakhstan and new ccTLD of Curacao + FIX. policy.h + + 006) Wei-Lun Chao + ADD. chinese translation + FIX. zh_TW.po + + 005) Dennis Preiser + BUG. in read groups with show_only_unread_arts base article was invalid + but should be displayed after 'M'enu + FIX. group.c, options_menu.c, page.c, post.c, select.c, thread.c, proto.h + +U004) Thomas E. Dickey + ADD. update configure macros + ADD. --enable-heapsort configure switch + ADD. 'M'enu option for sort_function if --enable-heapsort + FIX. art.c, config.c, heapsort.c, init.c, lang.c, options_menu.c + tcurses.c, tincfg.tbl, extern.h, proto.h, tin.h, tinrc.h + configure[.in], autoconf.h[in], aclocal.m4 + +U003) Urs Janssen + ADD. config.guess, config.sub update + ADD. heapsort.c fallback + ADD. compile heapsort.c and xface.c conditionaly + ADD. configure check for libunistring if libicuuc is not found + ADD. configure check for setvbug + ADD. prefer libicuuc for idna2003 decoding over libidn + ADD. use NFC instead of NFKC as default normalization if possible + ADD. swapped args for append_file() to match order of copy_fp() + BUG. creation of several temporary files could fail if $TMPDIR didn't + end with / + BUG. doubled % in some description strings where single % are needed + BUG. used strftime() instead of my_strftime() in debug.c + BUG. cached overview wasn't converted to undeclared_charset if set for + the group and post_8bit_header was active + FIX. art.c, config.c, debug.c, heapsort.c, inews.c, init.c, lang.c + mail.c, misc.c, nntplib.c, pgp.c, post.c, refs.c, select.c + string.c extern.h, proto.h, tin.h, autoconf.h[in], configure[.in] + config.guess, config.sub, Makefile, tin.1, tin.5, *.po + +-- 2.1.0 release 20111224 "Bridgend" -- 004) Matt Anton ADD. updated french translation @@ -8,6 +216,15 @@ ADD. updated estonian translation FIX. et.po +U002) Dennis Preiser + ADD. support for article numbers > 2^31 (--enable-long-article-numbers) + ADD. reduce memory usage if getart_limit is set + ADD. store superseds in posted_articles_file + FIX. active.c, art.c, debug.c, group.c, lang.c, mail.c, memory.c + newsrc.c, page.c, post.c, rfc2046.c, save.c, screen.c, select.c + string.c, thread.c, xref.c, extern.h, proto.h, tin.h, autoconf.h[in] + configure[.in] + 002) Dennis Preiser BUG. buggy error-message for attributes with no scope BUG. abbreviated group names might get unnecessary cut off @@ -18,6 +235,19 @@ FIX. art.c, attrib.c, lang.c, options_menu.c, select.c, tcurses.c extern.h, tincfg.tbl +U001) Urs Janssen + ADD. some more debugging output + ADD. timestamps to debugging output + ADD. configure check for libidnkit (IDNA 2008) + ADD. configure check for clock_gettime(2) + ADD. updated german translation, switch to UTF-8 encoding + ADD. configure check for inet_ntoa in libnsl + ADD. configure check for idna_strerro in libidn + ADD. use range in LISTGROUP if getart_limit is set + FIX. active.c, art.c, debug.c, filter.c, group.c, lang.c, mail.c, misc.c + nntplib.c, screen.c, signal.c, xref.c, proto.h, tin.h, tin.1, tin.5 + Makefile[.in], configure[.in] autoconf.h[in], aclocal.m4, de.po + 001) Urs Janssen ADD. config.guess, config.sub update BUG. crash when entering scope menu without active group diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/INSTALL tin-2.2.0/doc/INSTALL --- tin-2.0.1/doc/INSTALL 2011-06-09 13:22:12.000000000 +0200 +++ tin-2.2.0/doc/INSTALL 2013-08-28 19:09:39.011066011 +0200 @@ -15,40 +15,41 @@ Note: The section 'News machine names' i The following configure options and defines are documented in detail: --------------------------------------------------------------------- - --disable-fcntl --program-prefix - --disable-included-msgs --program-suffix - --enable-8bit-keys --program-transform-name - --enable-append-pid --with-coffee - --enable-break-long-lines --with-curses-dir - --enable-broken-listgroup-fix --with-dbmalloc - --enable-broken-system-fix --with-defaults-dir - --enable-cancel-locks --with-dmalloc - --enable-color --with-domain-name - --enable-curses --with-editor - --enable-debug --with-gpg - --enable-echo --with-included-gettext - --enable-etiquette --with-inews-dir - --enable-fascist-newsadmin --with-slrnface - --enable-flock --with-iso-to-ascii + --disable-fcntl --prefix + --disable-included-msgs --program-prefix + --enable-8bit-keys --program-suffix + --enable-append-pid --program-transform-name + --enable-break-long-lines --with-coffee + --enable-broken-listgroup-fix --with-curses-dir + --enable-broken-system-fix --with-dbmalloc + --enable-cancel-locks --with-defaults-dir + --enable-color --with-dmalloc + --enable-curses --with-domain-name + --enable-debug --with-editor + --enable-echo --with-gpg + --enable-etiquette --with-included-gettext + --enable-fascist-newsadmin --with-inews-dir + --enable-flock --with-slrnface + --enable-heapsort --with-iso-to-ascii --enable-inverse-video --with-ispell --enable-locale --with-libdir --enable-lockf --with-libiconv-prefix - --enable-mh-mail-handling --with-mailbox - --enable-mime-strict-charset --with-mailer - --enable-nls --with-metamail - --enable-nntp --with-mime-default-charset - --enable-nntp-only --with-ncurses - --enable-pgp-gpg --with-nntp-default-server - --enable-piping --with-nov-dir - --enable-posting --with-nov-fname - --enable-printing --with-pcre - --enable-prototypes --with-pgp - --enable-shell-escape --with-pgpk - --enable-warnings --with-screen - --enable-xhdr-xref --with-shell - --exec-prefix --with-spooldir - --mandir --with-trace - --prefix + --enable-long-article-numbers --with-mailbox + --enable-mh-mail-handling --with-mailer + --enable-mime-strict-charset --with-metamail + --enable-nls --with-mime-default-charset + --enable-nntp --with-ncurses + --enable-nntp-only --with-nntp-default-server + --enable-pgp-gpg --with-nov-dir + --enable-piping --with-nov-fname + --enable-posting --with-pcre + --enable-printing --with-pgp + --enable-prototypes --with-pgpk + --enable-shell-escape --with-screen + --enable-warnings --with-shell + --enable-xhdr-xref --with-spooldir + --exec-prefix --with-trace + --mandir ENFORCE_RFC1034 HAVE_UUDEVIEW_H @@ -293,6 +294,13 @@ Only define if your NNTP-server file is DISABLE_PIPELINING Define if your newsserver can't handle pipelined commands. +--enable-long-article-numbers (default: off) +Add code to handle huge (>2^31) article numbers, such article numbers violate +the NNTP RFC and support for them may sensible increases tins memory usage. +If SMALL_MEMORY_MACHINE is defined --enable-long-article-numbers has no +effect. + + Options to set some default values ---------------------------------- --with-shell=PROG (default: sh, except on BSD where csh is used) @@ -366,7 +374,7 @@ one of the following 7 conversion tables 4 convert 8-bit characters according to RFC 1345 5 build 8-bit characters by combining several 7-bit chars and using backspace (useful for printers) - 6 ??? + 6 table for IBM PC character set (code page 437) E.g., adding --with-iso-to-ascii=2 to the configure options would be useful in german language newsgroups. For more detailed info read the file @@ -513,6 +521,11 @@ Turn on Cancel-Locks. This feature requi Message-ID of the posting, so if your server does not offer server side purposed IDs you have to mess around with EVIL_INSIDE +--enable-heapsort (default: off) +Enable heapsort(3) as alternative to qsort(3). In large groups with a long +retention and long threads this may be a performance win as the data in +the group is somewhat presorted. + --enable-nls (default: on) The --enable-nls option enables Native Language Support (NLS), which allows tin to run in languages other than American English. Native Language diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/TODO tin-2.2.0/doc/TODO --- tin-2.0.1/doc/TODO 2011-08-16 22:02:07.000000000 +0200 +++ tin-2.2.0/doc/TODO 2013-12-16 20:01:09.247516294 +0100 @@ -42,18 +42,16 @@ o batch mode has several bugs the statistics nor taken into account for the 'any unread news' status. - -vc could be more verbose (like -vcZ is) - -o currently is not a 'batch_mode' option - - if server requires authentication (and no ~/.newsauth entry matches) - tin prompts for username but not for password [Urs Janssen ] o add version number to other config-files (e.g. tin.defaults) and do the same checks as for TINRC_VERSION/tinrc. for the filter and attributes file store the charset the file is written in (e.g. ISO-8859-x vs. unicode) and for the filter file the filter method - used (wildmat or regexp) + used (wildmat or regexp (or TRE)) [Urs Janssen ] -o overview file cacheing code is over-complex +o overview file caching code is over-complex - cache the original overview info instead of rebuilding it from the processed (decoded etc.) data, no matter if it's broken (e.g. contains raw 8 bit data) as we have to deal with that anyway. if there @@ -72,6 +70,10 @@ o if tin is falling back to HEAD/NEXT ( tinrc.getart_limit [20090112 Urs Janssen ] +o the keys GroupToggleSubjDisplay and ThreadToggleSubjDisplay are misnamed, + as they toggle the display of the sender address, not the subject. + [20130839 Urs Janssen ] + Pager Problems -------------- @@ -87,6 +89,10 @@ o remove Message-IDs with 8bit chars in Message-ID or References header [done for References in replies/followups, Urs] +o keep RFC 6532 in mind as parts of it will sooner or later make it into + NNTP (sic!). + [20120220 Urs Janssen ] + o repost ('x') ignores ~/.tin/attributes - bug or feature?! [IMHO a bug as settings like mailing_list are essential, Urs] @@ -101,10 +107,24 @@ o mailers other than sendmail (f.e. elm New features ------------ -o as libidn only does IDNA 2003 but not IDNA 2008 (RFC 5890-5894) add - a configure check for libidnkit2.x () - and if found use idn_decodename() in misc.c:idna_decode() - [20110120 Urs Janssen ] +o add per scope getart_limit via attributes + [20131114 Urs Janssen ] + +o add support for %A (Address), %C (Firstname), %N (Fullname) to + group_format and thread_format + (what about "conflicting" settings for show_author and %[ACIN]?) + [20130925 Urs Janssen ] + +o add a key to "drop" pending data from the server (either by + disconnet/reconnect (fast but reconnect may fail due to rate limit or ...) + or via calling drain_buffer() (might be slow if there ss much pending + data)) so one doesn't have to quit and restart tin if the client/server + communication get's desynced (i.e by reading an article which has a non + dotstuffed lone . in it or the like) + [20130615 Urs Janssen ] + +o x_body currently doesn't allow cmd. execution via ! like x_headers + [20110912 Urs Janssen ] o add nntp_default_server to tin.defaults to override compile time setting. if given strings starts with / or ~ the value is taken from the referenced @@ -125,7 +145,10 @@ o give an error message if append_mail( o allow remapping of the 'z' abort-key (lynx style) in wait_for_input(). -o add user defined screen layout at different levels +o add user defined screen layout at different levels (i.e. posting + history screen) + (done for selection, group and thread level) + - what about groupname_max_length, still needed? [20041025 Urs Janssen ] o add TLS (RFC 4642), NNTPS support @@ -136,9 +159,9 @@ o add TLS (RFC 4642), NNTPS support can be used for NNTPS) [20031210 Urs Janssen ] -o add more AUTHINFO SASL (RFC 4643) support (DIGEST-MD5, EXTERNAL, ...) - and a fallback if no libgsasl is found (e.g cyrus-sasl or a handrolled - version for at least PLAIN) +o add more AUTHINFO SASL (RFC 4643, RFC 5802) support (DIGEST-MD5, + EXTERNAL, ...) and a fallback if no libgsasl is found (e.g cyrus-sasl + or a handrolled version for at least PLAIN) [20080316 Urs Janssen ] o add XZVER (and XZHDR) support (zlib compressed yyencoded overview data) @@ -148,6 +171,11 @@ o make 'GNKSA'-parser RFC5322/USEFOR co (e.g. "<~$!~( )@( )example.com>" causes "illegal character in RHS", but the address is valid) +o the TLD checking in the 'GNKSA'-parser needs some rework, keeping the + list of valid TLDs up to date is more or less impossible with the ~1400 + pending new TLDs + [20131024 Urs Janssen ] + o add In-Reply-To threading for mailgroups [20030518 Urs Janssen ] @@ -195,12 +223,13 @@ o should the postponed 'file' (and post o add maildir/maildir++ support (besides MBOX{O,RD} and MMDF}, MH (not only reading but also writing), mailstore, BABYL, Kendra (MMDF - like with 20*CTRL-A as sep.), MBX (indexed MBOX from UW-IMAP) and add - man-pages for the various formats. + like with 20*CTRL-A as sep.), MBX and MIX (indexed MBOX from UW-IMAP) + and add man-pages for the various formats. (see for BABYL, for maildir, for MBOXCL and MBOXCL2, - for MBX) + for MBX, + ] o add $LOCKEXT support @@ -224,6 +253,9 @@ o turn CA_ERROR_SPACE_IN_NEWSGROUPS, CA [define FOLLOW_USEFOR_DRAFT to turn the mentioned errors into warnings. 20011226 Urs Janssen ] +o check FOLLOW_USEFOR_DRAFT code against RFC 5536 + [20120221 Urs Janssen ] + o support "Suggested Minimal Digest Format" @@ -292,6 +324,13 @@ o if using "-n" commandline switch you o item_by_item_etiquette_warnings [compile-time?] (e.g. enable x-posts without f'up warning, disable long-sig warning) +o don't prefix posted_articles_file with maildir if posted_articles_file + has an absolute path (after expanding ~). + [20130627 Urs Janssen ] + +o posted_articles_file is not available in attributes + [20130628 Urs Janssen ] + o unify Fcc and posted_articles_file [20031012 Dirk Nimmich ] @@ -348,6 +387,7 @@ o Additions to the group menu: o Additions to the select menu: '%' (toggle rot13 encoding of screen content) + key to toggle groupname abbreviation o Add to the 'M'enu: 'R' (GLOBAL_BUGREPORT) @@ -395,15 +435,22 @@ o Merge the selection code with the ran of picking articles with similar goals is wasteful. [Jason Faultless ] -o add check for liblzma/libbzip2/zlib (>=1.1.4)/[mini]lzo +o add check for liblzma/libbzip2/zlib (>=1.1.4)/[mini]lzo, liblz4, liblrzip (, , - , ) - and add an option to write/read {g,b,l}zipped local overviews. - liblzma, zlib, libbzip2 and lzo might also be used for post-processing. + , , + , + ) and add an option to + write/read *zipped local overviews. + the libs might also be used for post-processing articles. o rewrite/cleanup all the debugging code, the output in /tmp is messy; the on screen output either slows down things dramatically or is unreadable; - add timestamps to at least the NNTP-log; split DEBUG_MISC? + split DEBUG_MISC? + [Urs Janssen ] + +o replace gettimeofday() with clock_gettime() if available in parsdate.y + as POSIX.1-2008 marks gettimeofday() as obsolete. + [20110910 Urs Janssen ] o Add 'M'enu option to define chars for utf8_graphics. @@ -470,6 +517,11 @@ o allow expiring filter entrys n-days a o add command to generate filter rules for all currently tagged articles +o allow editing of the strings presented in the kill-Menu for + "Kill Subject", "Kill From", "Kill Msg-Id" without having to edit + the full filter-file + [20120201 Urs Janssen ] + Pager enhancements ------------------ o add 'autoview' (spawn external viewer) 'autohide' (don't even show info @@ -494,11 +546,22 @@ o add Content-Language (RFC 3282) analy o suppress hide_uue=2 checking unless first line in an article or following a blank line +o add missing mailcap (RFC 1524) features (%n, %F, copiousoutput, print, ...) + [20111205 Urs Janssen ] + Internal Changes ---------------- +o rename disable_gnksa_domain_check to enable_gnksa_domain_check and + invert logic now the default changed + [20131119 Urs Janssen ] + +o %s/%S in quote_char should replaced by %I in misc.c:copy_body() and + config.c:rc_update() to be consistent. + [20131003 Urs Janssen ] + o curses.c:input_pending() and curses.c:get_arrow_key() have #ifdef HAVE_SELECT and a code path for the case when we don't have - select(2), but read.c:wait_for_input() has no code path the the + select(2), but read.c:wait_for_input() has no code path for the !HAVE_SELECT case. we should add a !HAVE_SELECT case there (or at least have adjusted messages in txt_reading_article and txt_group) [20110506 Urs Janssen ] @@ -522,14 +585,6 @@ o rewrite auth.c - turn t_bool authinfo_user, authinfo_sasl, authinfo_state into enum authinfo { NONE = 0, USER = 1, SASL = 2 } -o make article numbers (u)int_least64_t/PRI[iu]LEAST64 (on OSs where possible), - provide useful fallbacks if system doesn't have / - (check for long long and if present use "%lld"; - #ifdef int_least64_t typedef artnum_t int_least64_t #else ...). - use atoll/strtoll for parsing article numbers. (#ifdef HAVE ATOLL - #define atoartnum atoll #else ...) - [20050728 Urs Janssen ] - o fix aclocal.m4:CF_FUNC_SYSTEM and/or misc.c:invoke_cmd() that --enable-broken-system-fix/IGNORE_SYSTEM_STATUS isn't needed anymore. [20090520 Urs Janssen ] @@ -541,7 +596,7 @@ o tinrc.confirm_choice should be writte changes). [20081112 Urs Janssen ] -o use read()/write() instead of fputs()/fgets() +o use read()/write() instead of fputs()/fgets() on socket o move several (server related) files into the per-server dir e.g.: @@ -591,14 +646,10 @@ o get rid of CURR_GROUP, use t_group in o clean up $AUTOSUBSCRIBE code (the NNTP code path is a mess) [20030412 Urs Janssen ] -o try to get rid of the magic numbers like NUM_MIME_CHARSETS and use - a sentinel in the arrays instead (match_list is a showstopper here). - [20030203 Urs Janssen ] - o check where joinpath() should be used (e.g. grep for TMPDIR in the source) [Urs Janssen ] -o make configure look for strrstr() in libpub/publib.h +o make configure look for strrstr() in libpub & publib.h [Urs Janssen ] o reorder several structs to avoid padding (see gcc -Wpadded) @@ -657,10 +708,11 @@ o add check for sizeof char, short, int o cleanup post.c o check code with Splint (LCLint) , - ccmalloc (), - MSS (), - valgrind () and cppcheck - () + valgrind (), cppcheck + (), AdLint + (), clang-analyzer + () and Coverity + () o rewrite the tag code so that arts[].tagged becomes index in arts[] of next tagged article. num_of_tagged_arts becomes index of first @@ -710,7 +762,7 @@ o make mm_network_charset an "option_li us-ascii) on each...) and disable those not available. (think about more network charsets (GB2312, GB18030, Shift_JIS, ISO-8859-6[-{I,E}], ISO-8859-8[-{I,E}], ISO-8859-11, VISCII, VIQR; - check wether KOI8-RU is still used/valid)) + check whether KOI8-RU is still used/valid)) [done except configure check 20010907 urs@tin.org] o make mm_network_charset an user configurable item list @@ -721,17 +773,25 @@ o make mm_network_charset an user confi best (i.e. can display most (all) of the chars in the article). [20050805 ] -o add IDNA support (RFC 3490ff.) - ( might be useful) +o add IDNA 2003 (RFC 3490ff.) and IDNA 2008 (RFC 5890ff.) support, + ( IDNA 2003, + IDNA 2008, + IDNA (uidna_IDNToUnicode()), + IDNA 2008) (added minimalistic IDNA decoding support if a recent libidn is found, urs) [20030917 Urs Janssen ] o add normalization (via or - ) + or + ) (done for search strings) [20031209 Michael Bienia ] +o check for wcsftime() and if found use it instead of strftime() (at + least in page.c). + [20130129 Urs Janssen ] + Docs/online help ---------------- o the documentation of PageFollowupQuoteHeaders (^W) and @@ -825,7 +885,7 @@ o replace wildmat.c with uwildmat.c patterns and can handle UTF-8 strings [20091223 Urs Janssen ] -o support $XDG_CONFIG_HOME / $XDG_DATA_HOME? +o support $XDG_CONFIG_HOME[S] / $XDG_DATA_HOME[S] / $XDG_RUNTIME_DIR [20081010 Urs Janssen ] @@ -886,7 +946,8 @@ o should 'tin -z foo.bar' only start up o trn and perls Net::NNTP::Auth use ~/.nntpauth (format is "^server\s+user\s+password"), shall we also try ~/.nntpauth if we can't - find a matching entry in ~/.newsauth? + find a matching entry in ~/.newsauth? and should we look for + ${TIN_HOMEDIR:-"$HOME"}/.tin/.newsauth if ~/.newsauth is not found? [20040128 Urs Janssen ] o what todo if in a CTE: x-uue the CD: filename differs from the one given @@ -926,7 +987,7 @@ o check_article_to_be_posted() needs a o update gettext stuff to > gettext-0.12.1 -o clean up included pcre stuff and update to >= pcre-8.13 +o clean up included pcre stuff and update to >= pcre-8.34 o shows up cross-postings multiple times even if read once before getting a resync/reread active/newsrc-file @@ -960,7 +1021,27 @@ o cleanup main.c/init_selfinfo() what I mean) [fixed some of the double/tripple reads, urs] +o cache mailbox_name in misc.c/mail_check()? + +o configure checks for fdopen(3) and defines HAVE_FDOPEN if found, but we + don't have any code guared with that macro nor any fallback code if not + found. + o re add innlib support? (the old one was dropped as the lib has retired all (which were not that many) features we used and our code didn't use the innlibs code where ever it was possible (and useful). [20080211 Urs Janssen ] + +o add check for libarchive + and use for post-processing? + [20111225 Urs Janssen ] + +o add check for heapsort(3) in libbsd? + [20130305 Urs Janssen ] + +o add jump to selected article from DisplayPostHist (’W’) + [20120220 Urs Janssen ] + +o add check for libtre and offer TRE as matching method for "wildcard"? + , + [20130706 Urs Janssen ] diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/WHATSNEW tin-2.2.0/doc/WHATSNEW --- tin-2.0.1/doc/WHATSNEW 2011-08-23 23:27:54.000000000 +0200 +++ tin-2.2.0/doc/WHATSNEW 2013-11-20 08:18:45.356274841 +0100 @@ -2,9 +2,16 @@ New features and changes since tin-2.0.0 New features ------------ +. IDNA 2008 support if linked against libidnkit2 +. user configurable timeout (nntp_read_timeout_secs) +. support large article numbers (>2^31) (--enable-long-article-numbers) +. support for user defined screen layout at selection, group and thread level Changes ------- +. disable_gnksa_domain_check now defaults to TRUE; too many new gTLDs Retired Features ---------------- +. show_info, can now be set via user defined screen layout at group and thread + level diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/config-anomalies tin-2.2.0/doc/config-anomalies --- tin-2.0.1/doc/config-anomalies 2011-05-08 11:53:02.000000000 +0200 +++ tin-2.2.0/doc/config-anomalies 2013-09-29 01:19:16.267034504 +0200 @@ -61,7 +61,6 @@ print_header batch_save start_editor_offset editor_format -show_info * posted_articles_file * add_posted_to_filter sigfile diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/keymap.sample tin-2.2.0/doc/keymap.sample --- tin-2.0.1/doc/keymap.sample 2011-04-17 16:04:27.000000000 +0200 +++ tin-2.2.0/doc/keymap.sample 2013-08-28 19:09:39.535131415 +0200 @@ -23,7 +23,7 @@ LookupMessage L OptionMenu M Postponed O ^O QuitTin Q -BugReport R +BugReport R DisplayPostHist W MarkThreadUnread Z FirstPage ^ diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/l10n/de/tin.1 tin-2.2.0/doc/l10n/de/tin.1 --- tin-2.0.1/doc/l10n/de/tin.1 2011-12-24 15:50:11.000000000 +0100 +++ tin-2.2.0/doc/l10n/de/tin.1 2013-12-21 18:15:58.488557318 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2011-12-24 +.\" Updated : 2013-12-24 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature @@ -14,14 +14,14 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 1 "24. December 2011" 2.0.1 "Usenet Newsreader" +.TH tin 1 "24. Dezember 2013" 2.2.0 "Usenet Newsreader" .\" .\" .SH NAME .\" .\" tin, rtin \- Ein Usenet Newsreader -.SH ÜBERSICHT +.SH ÃœBERSICHT .\" .\" \fBtin\fP [\|[\|\fB\-h\fP\||\|\fB\-H\fP\||\|\fB\-V\fP\|]\ \|| [\|[\|[\|\fB\-a\fP\|] @@ -32,29 +32,30 @@ tin, rtin \- Ein Usenet Newsreader [\|\fB\-g\fP \fIServer\fP\|] [\|\fB\-m\fP \fIMail\-Verz.\fP\|] [\|\fB\-p\fP \fIPort\fP\|] [\|\fB\-I\fP \fIindex\-Verz.\fP\|]\ \|[\fINewsgruppe\fP\|[\|,.\|.\|.\|]\|]\|] .SH BESCHREIBUNG -\fBtin\fP ist ein einfach zu bedienender Newsreader für das Usenet. Er kann +\fBtin\fP ist ein einfach zu bedienender Newsreader für das Usenet. Er kann Artikel von einem lokalen (z. B. aus \fI/var/spool/news\fP) oder entfernten Server (\fBrtin\fP oder \fBtin \-r\fP Option) mittels NNTP (Network News Transport -Protocol) lesen. Er benutzt, sofern vorhanden, lokale NOV \fBnewsoverview\fP(5) -Indexdateien bzw. den [X]OVER NNTP\-Befehl (\fBRFC2980\fP, \fBRFC3977\fP). +Protocol) lesen. Er benutzt, sofern vorhanden, lokale NOV +\fB\%newsoverview\fP(5) Indexdateien bzw. den [X]OVER NNTP\-Befehl +(\fBRFC\%2980\fP, \fBRFC\%3977\fP). .PP \fBtin\fP hat vier unterschiedliche Arbeitsebenen: Auswahlebene, Gruppenebene, -Threadebene und Artikelebene. Mit dem \fBHelp\fP ('\fBh\fP') Befehl können die -jeweils verfügbaren Befehle angezeigt werden. +Threadebene und Artikelebene. Mit dem \fBHelp\fP ('\fBh\fP') Befehl können die +jeweils verfügbaren Befehle angezeigt werden. .PP Am Anfang zeigt \fBtin\fP eine Liste der Gruppen in \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP. Ein Pfeil '\->' oder ein inverser Balken zeigt auf die erste Newsgruppe. Um zu einer Gruppe zu navigieren -können die Cursor\-Tasten (hängt vom verwendetem Terminal ab) oder \fBDown\fP -('\fBj\fP') und \fBUp\fP ('\fBk\fP') benutzt werden. Mit Bildhoch/Bildrunter (hängt +können die Cursor\-Tasten (hängt vom verwendetem Terminal ab) oder \fBDown\fP +('\fBj\fP') und \fBUp\fP ('\fBk\fP') benutzt werden. Mit Bildhoch/Bildrunter (hängt vom verwendetem Terminal ab) oder \fBPageUp\fP ('\fB^U\fP') (CTRL\-U) und \fBPageDown\fP ('\fB^D\fP') (CTRL\-D) kann Seitenweise navigiert werden. Die -ausgewählte Gruppe wird durch Drücken von '\fB\fP' betreten. +ausgewählte Gruppe wird durch Drücken von '\fB\fP' betreten. .PP .\" .\" -Durch Drücken der \fBGroupNextUnreadArtOrGrp\fP ('\fB\fP') Taste wird -die nächste Newsgruppe mit ungelesenen Artikeln betreten. +Durch Drücken der \fBGroupNextUnreadArtOrGrp\fP ('\fB\fP') Taste wird +die nächste Newsgruppe mit ungelesenen Artikeln betreten. .SH EXIT\-STATUS Interaktiver\-Modus: .RS +.5i @@ -95,12 +96,13 @@ ANSI\-Farben ein/\-ausschalten (Standard Erzwinge Authentifikation beim Verbindungsaufbau. .TP \fB\-c\fP -Erstelle bzw. aktualisiere Index\-Dateien für alle Gruppen in +Erstelle bzw. aktualisiere Index\-Dateien für alle Gruppen in \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP bzw. der mittels \*(rq\fB\-f\fP\*(rq angegebenen Datei und markiere alle Artikel als gelesen. .TP \fB\-d\fP -Keine Gruppenbeschreibungen laden (Interaktiver\-Modus). +Keine Gruppenbeschreibungen und die Server Meldung des Tages laden +(Interaktiver\-Modus). .TP \fB\-D\fP\fI Debuggrad\fP Debuggrad angeben (1 = NNTP, 2 = Filter, 4 = newsrc, 8 = Threading, 16 = @@ -111,17 +113,17 @@ Benutze die angegebene newsrc\-Datei ans \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP. .TP \fB\-g\fP\fI Server\fP -Zugehörigen Newsserver und newsrc\-Datei aus +Zugehörigen Newsserver und newsrc\-Datei aus \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/newsrctable\fP benutzen. .TP \fB\-G\fP\fI Artikellimit\fP -Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe. +Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe. .TP \fB\-h\fP -Kurzübersicht der verfügbaren Komandozeilenoptionen. +Kurzübersicht der verfügbaren Komandozeilenoptionen. .TP \fB\-H\fP -Kurzeinführung in \fBtin\fP welche auch beim allerersten Start ausgegeben wird. +Kurzeinführung in \fBtin\fP welche auch beim allerersten Start ausgegeben wird. .TP \fB\-I\fP\fI Verzeichnis\fP Directory in which to store newsgroup index files. Default is @@ -132,30 +134,33 @@ has no effect if \fBtin\fP retrieves its \fB\-l\fP Get number of articles per group from the \fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fP file. If reading -via NNTP this is done with the LIST command (\fBRFC3977\fP). This might result -in incorrect article counts but is usually faster than the default which is -to read the \fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fP file -(either directly or via LIST) and then check the article count via NNTP -GROUP command (\fBRFC3977\fP) \*(rq\fB\-ln\fP\*(rq. +via NNTP this is done with the LIST command (\fBRFC\%3977\fP ). This might +result in incorrect article counts but is usually faster than the default +which is to read the +\fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fP file (either +directly or via LIST) and then check the article count via NNTP GROUP +command (\fBRFC\%3977\fP ) \*(rq\fB\-ln\fP\*(rq. If reading via NNTP and LIST COUNTS +(\fBRFC\%6048\fP ) is available that is used instead as it gives more accurate +article counts. .TP \fB\-m\fP\fI Verzeichnis\fP Zu benutzendes Mailbox\-Verzeichnis. Standard ist \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. .TP \fB\-M\fP\fI Benutzer\fP -Sende ungelesene Artikel an den angegebenen Benutzer um sie später lesen zu -können. Für weitere Informationen siehe den Abschnitt "AUTOMATISCHES MAILEN +Sende ungelesene Artikel an den angegebenen Benutzer um sie später lesen zu +können. Für weitere Informationen siehe den Abschnitt "AUTOMATISCHES MAILEN UND SPEICHERN VON UNGELESENEN ARTIKELN". .TP \fB\-n\fP Only load groups from the \fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fP file that are subscribed to in the user's \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP. This allows -a noticeable speedup when connecting via a slow line, but \fBtin\fP can not -tell which groups are moderated. See also \*(rq\fB\-l\fP\*(rq. +a noticeable speedup when connecting via a slow line, but \fBtin\fP may not be +able detect which groups are moderated. See also \*(rq\fB\-l\fP\*(rq. .TP \fB\-N\fP -Sende ungelesene Artikel an dich selbst um sie später lesen zu können. Für +Sende ungelesene Artikel an dich selbst um sie später lesen zu können. Für weitere Informationen siehe den Abschnitt "AUTOMATISCHES MAILEN UND SPEICHERN VON UNGELESENEN ARTIKELN". .TP @@ -165,13 +170,14 @@ quick, it should be used with \*(rq\fB\- .TP \fB\-p\fP\fI Port\fP Zu benutzende Portnummer falls per NNTP gelesen wird (Standard ist -119). Übersteuert die Umgebungsvariable $\fBNNTPPORT\fP. +119). Ãœbersteuert die Umgebungsvariable $\fBNNTPPORT\fP. .TP \fB\-q\fP -Nicht prüfen ob neue Newsgruppen vorhanden sind. +Nicht prüfen ob neue Newsgruppen vorhanden sind und die Server Meldung des +Tages nicht laden. .TP \fB\-Q\fP -Schnellstart. \fBtin\fP so schnell wie möglich starten, zur Zeit entspricht +Schnellstart. \fBtin\fP so schnell wie möglich starten, zur Zeit entspricht diese Option \*(rq\fB\-nqd\fP\*(rq. .TP \fB\-r\fP @@ -186,7 +192,7 @@ Save/read articles to/in directory. Defa \fI${TIN_HOMEDIR:\-"$HOME"}/News\fP. .TP \fB\-S\fP -Speichere ungelesene Artikel zum späteren Lesen mittels \*(rq\fB\-R\fP\*(rq. Für +Speichere ungelesene Artikel zum späteren Lesen mittels \*(rq\fB\-R\fP\*(rq. Für weitere Informationen siehe den Abschnitt "AUTOMATISCHES MAILEN UND SPEICHERN VON UNGELESENEN ARTIKELN". .TP @@ -197,18 +203,18 @@ option. This option is disabled if \fBti NNTP server and \fBcache_overview_files\fP is turned off. .TP \fB\-v\fP -Ausführliche Ausgabe für \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \*(rq\fB\-S\fP\*(rq, +Ausführliche Ausgabe für \*(rq\fB\-c\fP\*(rq, \*(rq\fB\-M\fP\*(rq, \*(rq\fB\-N\fP\*(rq, \*(rq\fB\-S\fP\*(rq, \&\*(rq\fB\-u\fP\*(rq und \*(rq\fB\-Z\fP\*(rq\-Optionen. .TP \fB\-V\fP Versionsinformationen ausgeben. .TP \fB\-w\fP -Schnell\-Modus um nur einen Artikel zu posten. Nach Möglichkeit mit \*(rq\fB\-n\fP\*(rq +Schnell\-Modus um nur einen Artikel zu posten. Nach Möglichkeit mit \*(rq\fB\-n\fP\*(rq kombinieren. .TP \fB\-x\fP -No posting mode. You cannot post articles if you use this option. +Sie können keine Artikel veröffentlichen, wenn Sie diese Option verwenden. .TP \fB\-X\fP No overwrite mode. \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP and files in @@ -229,7 +235,7 @@ that new/unread news exists. Useful for \fBtin\fP can also dynamically change its options by the \fBOptionMenu\fP ('\fBM\fP') command. Any changes are written to \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP. For more information see section -"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" and \fBtin\fP(5). +"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" and \fB\%tin\fP(5). .PP A list of groups can be specified after the other command\-line options. This can be useful if you wish to yank in or subscribe to a hand\-picked subset of @@ -259,8 +265,8 @@ NB: With the \*(rq\fB\-n\fP\*(rq flag, o .PP .\" .\" -Komandozeilenoptionen haben eine höhere Priorität als attributes und tinrc -Optionen und übersteuern daher die konfigurierten Werte. +Komandozeilenoptionen haben eine höhere Priorität als attributes und tinrc +Optionen und übersteuern daher die konfigurierten Werte. .SH GEBRAUCH .\" .\" @@ -277,15 +283,16 @@ administrator. The subscriptions file sh directory (i.e., \fI${TIN_LIBDIR:\-NEWSLIBDIR}/subscriptions\fP) and should have file permissions set to 0644. If you read news via NNTP, then your news server must support the LIST SUBSCRIPTIONS command. It is part of the NNTP -List Extensions (\fBRFC6048\fP) and all modern servers should understand it. +List Extensions (\fBRFC\%6048\fP ) and all modern servers should understand it. .SS "SCREEN FORMAT" \fBtin\fP hat vier unterschiedliche Arbeitsebenen: Auswahlebene, Gruppenebene, Threadebene und Artikelebene. .PP At the Selection level the title displays (the name of the newsserver and) the number of subscribed groups (containing new unread articles). The -newsgroups are displayed in the middle of the screen with the number of -unread articles displayed on the same line in front. +newsgroups are displayed in the middle of the screen usually with the number +of unread articles displayed on the same line in front, but it can be +customized via \fBselect_format\fP. .PP .\" FIXME - make this autoscale .nf @@ -332,9 +339,13 @@ then you will receive an error from your group to post to. .PP At the Group level the title contains the name of the group, the number of -conversation threads, the threading method, the limit of articles to get, -the total number of articles, the number of hot articles, the number of -recent articles and the number of killed articles. I.e.: +conversation threads, the abbreviated threading method (\fBthread_articles\fP), +the limit of articles to get (if set; \fBgetart_limit\fP), the total number of +(unread) articles (\fBart_marked_read\fP or \fBart_marked_unread\fP), the number +of hot articles \fBart_marked_selected\fP, the number of read hot articles (if +any; \fBart_marked_read_selected\fP), the number of recent articles +(\fBart_marked_recent\fP) and the number of killed articles +(\fBart_marked_killed\fP). I.e.: .PP .nf .\" FIXME - make this autocenter @@ -348,16 +359,16 @@ missing if the specific option is not en switch!) if the group is moderated, set to no posting or postings to it get redirected. .PP -If a thread has unread articles in it it's marked with a -\fBart_marked_unread\fP in front of the total number of articles in the -thread. If there are recent articles within the thread it might be marked -with \fBart_marked_recent\fP in front of the total number of articles in the -thread \- this is controlled by the \fBrecent_time\fP option. If a thread has -hot articles in it (see also section "FILTERING ARTICLES") it's marked with -\fBart_marked_selected\fP in front of the total number of articles in the -thread. The number of lines of the first (unread) article in the thread -might also be shown right before the subject \- this is controlled by the -\fBshow_info\fP option. +If a thread has unread articles it is marked with \fBart_marked_unread\fP in +front of the total number of articles in the thread. If there are recent +articles within the thread it might be marked with \fBart_marked_recent\fP in +front of the total number of articles in the thread \- this is controlled by +the \fBrecent_time\fP option. If a thread has hot articles in it (see also +section "FILTERING ARTICLES") it's marked with \fBart_marked_selected\fP in +front of the total number of articles in the thread. The number of lines of +the first (unread) article in the thread might also be shown right before +the subject \- this is controlled by the \fBshow_info\fP option. The display can +be customized via \fBgroup_format\fP. .PP .\" FIXME - make this autoscale .nf @@ -371,7 +382,7 @@ might also be shown right before the sub .PP .\" FIXME - add description of fields At the Thread level the screen usually (depends on the threading method -used) looks like this: +used) looks like this, but can be customized via \fBthread_format\fP: .PP .\" FIXME - make this autoscale .nf @@ -391,10 +402,13 @@ So, 28 Dez 1997 21:21:01 de.admin.new Zeilen 50 Re: EINSPRUCH zu RESULT:de.comm.mobil.ALL Artikel 47 von 59 Urs Janssen bei Arbeitskreis Kultur und Kommunikati -Artikel\-Körper +Artikel\-Körper .fi +.PP .\" .\" +Das Aussehen der Auswahl\-, Gruppen\- und Threadebene kann individuell +angepasst werden. Siehe hierzu den Abschnitt "ANSICHTEN ANPASSEN". .SS "COMMON MOVING KEYS" This table shows the common keys used for moving around all levels within \fBtin\fP. @@ -420,7 +434,7 @@ editing a string: .PP .TP 10 \fB^A, ^E\fP -move to beginning or end of line, respectively. +An den Zeillenanfang bzw. das Zeilenende springen. .TP \fB^F, ^B\fP non\-destructive move forward or back one location, respectively. @@ -430,16 +444,16 @@ delete the character currently under the characters in the buffer. .TP \fB^H, \fP -Zeichen links vom Cursor löschen. +Zeichen links vom Cursor löschen. .TP \fB^K\fP -Lösche vom Cursor bis zum Zeilenende. +Lösche vom Cursor bis zum Zeilenende. .TP \fB^P, ^N\fP move through history, previous and next, respectively. .TP \fB^L, ^R\fP -redraw the current line. +Aktuelle Zeile neu aufbauen. .TP \fB\fP places line on history list if non\-blank, appends newline and returns to the @@ -450,8 +464,8 @@ caller. .\" aborts the present editing operation. .SS "ALLGEMEINE BEFEHLE" -Die folgenden Befehle stehen in allen vier Ebenen zur Verfügung und bewirken -überall das Gleichen. +Die folgenden Befehle stehen in allen vier Ebenen zur Verfügung und bewirken +überall das Gleichen. .PP .TP 10 \fBShellEscape '!'\fP @@ -460,16 +474,16 @@ Shell escape. \fBShellEscape\fP by itsel have been disabled by the System Administrator. .TP \fBToggleColor '&'\fP -Toggle use of ANSI color. +ANSI Farben ein\-/ausschalten. .TP \fBRedrawScr '^L'\fP Bildschirminhalt neu aufbauen. .TP \fBScrollUp '<'\fP -Eine Zeile nach oben blättern (scrollen). +Eine Zeile nach oben blättern (scrollen). .TP \fBScrollDown '>'\fP -Eine Zeile nach unten blättern (scrollen). +Eine Zeile nach unten blättern (scrollen). .TP \fBPostponed 'O' '^O'\fP Reload postponed article. If your system blocks the \fBPostponed\fP key you @@ -490,7 +504,7 @@ Help screen of commands available on the ('\fB\e\fP') to search on this screen. \fBQuit\fP ('\fBq\fP') returns to the menu. .TP \fBToggleHelpDisplay 'H'\fP -Toggle the display of help mini menu at the bottom of the screen. +Mini\-Hilfe am unterem Bildschirrand ein\-/ausschalten. .TP \fBDisplayPostHist 'W'\fP List articles posted by user. The date posted, the newsgroup and the subject @@ -502,18 +516,18 @@ to the menu. .\"-------------------------------------------------------------------- .\" Versions\-Informationen ausgeben. -.SS "NEWSGROUP SELECTION COMMANDS" +.SS "BEFEHLE ZUR GRUPPENAUSWAHL" .TP 10 \fB4\fP -Gruppe 4 auswählen. +Gruppe 4 auswählen. .TP \fBSelectResetNewsrc '^R'\fP Reset \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file. This will destroy all records of which articles have been read, so use this carefully. .TP \fBSetRange '#'\fP -Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet -wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. +Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet +wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. .TP \fBSelectSortActive '.'\fP Liste vorhandener Newsgroups sortieren. @@ -522,10 +536,12 @@ Liste vorhandener Newsgroups sortieren. Vorherige Suche wiederholen. .TP \fBSearchSubjF '/'\fP -Search for a group by name and description (if displayed). +Vorwärts nach einer Gruppe anhand des Namens und/oder der Kurzbeschreibung +(falls angezeigt) suchen. .TP \fBSearchSubjB '?'\fP -Backward search through the group names and descriptions. +Rückwärts mach einer Gruppe anhand des Namens und/oder der Kurzbeschreibung +(falls angezeigt) suchen. .TP \fBSelectReadGrp '^J' ''\fP Read current group. @@ -579,7 +595,7 @@ Quit \fBtin\fP \- ask the user to confir accordingly. .TP \fBQuitTin 'Q'\fP -Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. +Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. .TP \fBSelectToggleReadDisplay 'r'\fP Toggle display of all subscribed to groups and just those groups containing @@ -592,7 +608,7 @@ senden. Dies ist der sinnvollste Weg um bekommen bzw. nach neuen Funktionen zu fragen. .TP \fBSelectSubscribe 's'\fP -Ausgewählte Gruppe abonnieren. +Ausgewählte Gruppe abonnieren. .TP \fBSelectSubscribePat 'S'\fP Subscribe to groups matching user specified pattern. See the section @@ -616,7 +632,8 @@ get the chance to \fBPostEdit\fP ('\fBe\ discard it via \fBQuit\fP ('\fBq\fP'). .TP \fBSelectQuitNoWrite 'X'\fP -Quit \fBtin\fP without saving any changes to the configuration. +\fBtin\fP beenden ohne ggf. gemachte Änderungen an den Einstellung zu +speichern. .TP \fBSelectYankActive 'y'\fP Yanks in all groups. Toggles the displayed groups between all the groups in @@ -632,9 +649,12 @@ see if any new news has arrived since st .\" Alle Artikel in der aktuellen Gruppe als ungelesen markieren. .SS "GROUP INDEX COMMANDS" +All searches in this level are limited to unread articles if in +\fBshow_only_unread_arts\fP mode. \fBGroupToggleReadUnread\fP ('\fBr\fP') can be use +toggle the setting right before/after the search. .TP 10 \fB4\fP -Artikel 4 auswählen. +Artikel 4 auswählen. .TP \fBMenuFilterSelect '^A'\fP Auto select article(s) using a menu. Read the section "FILTERING ARTICLES" @@ -655,8 +675,8 @@ matching pattern or tagged articles as u should be marked. .TP \fBSetRange '#'\fP -Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet -wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. +Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet +wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. .TP \fBLastViewed '\-'\fP Re\-enter the last message that was viewed. @@ -665,10 +685,10 @@ Re\-enter the last message that was view Vorherige Suche wiederholen. .TP \fBSearchSubjF '/'\fP -Search forward for specified subject. +Vorwärts nach dem angegebenem Subject suchen. .TP \fBSearchSubjB '?'\fP -Search backward for specified subject. +Rückwärts nach dem angegebenem Subject suchen. .TP \fBGroupSelThd '*'\fP Select current thread for later processing. @@ -767,7 +787,7 @@ Choose a new group by name. This command even those not currently yanked in. .TP \fBGroupToggleGetartLimit 'G'\fP -Toggle article/group limit. +Artikel/Gruppe Beschränkungen ein\-/ausschalten. .TP \fBToggleInfoLastLine 'i'\fP Display the subject of the first article in the current thread in the last @@ -818,7 +838,7 @@ Go to previous unread article. Return to previous level. .TP \fBQuitTin 'Q'\fP -Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. +Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. .TP \fBGroupToggleReadUnread 'r'\fP Toggle the display between all articles and unread articles. @@ -866,7 +886,7 @@ your own articles. .TP \fBGroupMarkUnselArtRead 'X'\fP Mark all unread articles that have not been selected as read, redraw screen -to reflect changes and put index at the first thread to begin reading. +to reflect changes and put index at the first thread to begin reading. Pressing \fBGroupMarkUnselArtRead\fP ('\fBX\fP') again will toggle back to the way it was before. See \fBGroupUndoSel\fP ('\fB~\fP') command for clearing the toggle effect, leaving the group will also clear the toggle effect and make the @@ -885,7 +905,7 @@ present, a prompt asks how to proceed. .\" this sections should be complete .TP 10 \fB4\fP -Artikel 4 aus dem Thread auswählen. +Artikel 4 aus dem Thread auswählen. .TP \fBMenuFilterSelect '^A'\fP Auto select article(s) using a menu. Read the section "FILTERING ARTICLES" @@ -906,8 +926,8 @@ matching pattern or tagged articles as u should be marked. .TP \fBSetRange '#'\fP -Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet -wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. +Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet +wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. .TP \fBLastViewed '\-'\fP Re\-enter the last message that was viewed. @@ -942,7 +962,7 @@ PIPING PRINTING REPOSTING AND SAVING ART Read current article within thread. .TP \fBThreadReadNextArtOrThread ''\fP -Nächsten ungelesenen Artikel im Thread anzeigen. +Nächsten ungelesenen Artikel im Thread anzeigen. .TP \fBSearchAuthF 'a'\fP Author forward search. This searches for articles with a specific \*(rqFrom:\*(rq @@ -977,7 +997,7 @@ newsgroup 'control' or 'control.cancel'. Filter\-Datei bearbeiten und danach anwenden. .TP \fBToggleInfoLastLine 'i'\fP -Subject des geöffneten Artikels in der untersten Zeile anzeigen. +Subject des geöffneten Artikels in der untersten Zeile anzeigen. .TP \fBToggleInverseVideo 'I'\fP Toggle inverse video. @@ -1004,7 +1024,7 @@ PIPING PRINTING REPOSTING AND SAVING ART Return to previous level. .TP \fBQuitTin 'Q'\fP -Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. +Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. .TP \fBBugReport 'R'\fP Einen Fehlerbericht oder Kommentar an @@ -1059,7 +1079,7 @@ Reply through mail to the author of the article with all headers included. .TP \fBPagePGPCheckArticle '^G'\fP -Perform \fBpgp\fP(1) operations on article. +Perform \fB\%pgp\fP(1) operations on article. .TP \fBPageToggleRaw '^H'\fP Toggles the display mode (raw including all headers vs. cooked). @@ -1084,7 +1104,7 @@ Toggles the display of all headers vs. h \fBnews_headers_to_display\fP. .TP \fBPageToggleRot '%'\fP -Toggle ROT\-13 decoding for this article. +ROT\-13 Entschlüsseln ein\-/ausschalten. .TP \fBPageToggleUue '('\fP Toggle the display of uuencoded sections. The default behavior is taken from @@ -1154,10 +1174,10 @@ contain PageNextUnread, then this key wi article. .TP \fBSearchAuthF 'a'\fP -Suche nach Autor (vorwärts). +Suche nach Autor (vorwärts). .TP \fBSearchAuthB 'A'\fP -Suche nach Autor (rückwärts). +Suche nach Autor (rückwärts). .TP \fBSearchBody 'B'\fP Search the body of all articles in group (can be slow). You can abort the @@ -1196,7 +1216,7 @@ Zum Anfang des Artikels springen. Zum Ende des Artikels springen. .TP \fBToggleInfoLastLine 'i'\fP -Subject des geöffneten Artikels in der untersten Zeile anzeigen. +Subject des geöffneten Artikels in der untersten Zeile anzeigen. .TP \fBToggleInverseVideo 'I'\fP Toggle inverse video. @@ -1240,7 +1260,7 @@ Go to the previous unread article. Return to the previous level. .TP \fBQuitTin 'Q'\fP -Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. +Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. .TP \fBPageReplyQuote 'r'\fP Reply through mail to the author of the current article with a copy of the @@ -1306,10 +1326,10 @@ The current URL will be prompted and ope \fBurl_handler\fP. '\fB\fP' or no input will skip the URL. .TP \fBSearchSubjF '/'\fP -Suche nach URL (vorwärts). +Suche nach URL (vorwärts). .TP \fBSearchSubjB '?'\fP -Suche nach URL (rückwärts). +Suche nach URL (rückwärts). .TP \fBSearchRepeat '\e'\fP Vorherige Suche wiederholen. @@ -1324,7 +1344,7 @@ Toggle the display of the current URL in Help screen of commands available. .TP \fBToggleHelpDisplay 'H'\fP -Toggle the display of help mini menu at the bottom of the screen. +Mini\-Hilfe am unterem Bildschirrand ein\-/ausschalten. .RE .\"-------------------------------------------------------------------- .\" @@ -1341,7 +1361,7 @@ Pipe attachment into command. Save current attachment / tagged attachments to disk. .TP \fBAttachSelect '^J' ''\fP -Multimediaanhänge anzeigen. +Multimediaanhänge anzeigen. .TP \fBAttachTag 't'\fP Tag one or more attachments for saving. @@ -1372,19 +1392,19 @@ Pipe attachment into command. Uses the r Shell escape. .TP \fBToggleInfoLastLine 'i'\fP -Names oder Beschreibung des Anhangs in der untersten Zeile anzeigen. +Name oder Beschreibung des Anhangs in der untersten Zeile anzeigen. .TP \fBHelp 'h'\fP Help screen of commands available. .TP \fBToggleHelpDisplay 'H'\fP -Toggle the display of help mini menu at the bottom of the screen. +Mini\-Hilfe am unterem Bildschirrand ein\-/ausschalten. .RE .\"-------------------------------------------------------------------- .\" .SS "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" .\" FIXME - add missing descriptions -At startup, \fBtin\fP reads in the configuration files (see also \fBtin\fP(5)). +At startup, \fBtin\fP reads in the configuration files (see also \fB\%tin\fP(5)). They contain a list of variables that can be used to configure the way \fBtin\fP works. If it exists, the global configuration file, \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fP is read. After that, the user's own @@ -1424,55 +1444,55 @@ Here is a full list of all the available the name of the corresponding setting in \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP. .TP 4 -\fBLange Newsgruppennamen abkürzen (abbreviate_groupname)\fP +\fBLange Newsgruppennamen abkürzen (abbreviate_groupname)\fP If ON abbreviate long newsgroup names at group selection level and article level (if necessary) like this: news.software.readers \-> n.software.readers \-> n.s.readers \-> n.s.r. Default is OFF. .TP -\fBFüge gepostete Artikel zum Filter (add_posted_to_filter)\fP +\fBFüge gepostete Artikel zum Filter (add_posted_to_filter)\fP If ON add posted articles which start a new thread to filter for highlighting follow\-ups. Default is ON. .TP -\fBFüge 'User\-Agent:'\-header ein (advertising)\fP +\fBFüge 'User\-Agent:'\-header ein (advertising)\fP Turn ON advertising in header (\*(rqUser\-Agent:\*(rq). Default is ON. .TP -\fBÜbersp. multipart/alternative\-Teile (alternative_handling)\fP +\fBÃœbersp. multipart/alternative\-Teile (alternative_handling)\fP If ON strip multipart/alternative messages automatically. Default is ON. .TP -\fBZeichen für gelöschte Artikel (art_marked_deleted)\fP -Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'. +\fBZeichen für gelöschte Artikel (art_marked_deleted)\fP +Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'. .TP -\fBZeichen für Artikel im Bereich (art_marked_inrange)\fP +\fBZeichen für Artikel im Bereich (art_marked_inrange)\fP The character used to show that an article is in a range. Default is '#'. .TP -\fBZeichen für wiederkehrende Artikel (art_marked_return)\fP +\fBZeichen für wiederkehrende Artikel (art_marked_return)\fP The character used to show that an article will return as an unread article when the group is next entered. Default is '\-'. .TP -\fBZeichen für wichtige Artikel (art_marked_selected)\fP -The character used to show that an article/thread is auto\-selected (hot). +\fBZeichen für wichtige Artikel (art_marked_selected)\fP +The character used to show that an article/thread is auto\-selected (hot). Default is '*'. .TP -\fBZeichen für aktuelle Artikel (art_marked_recent)\fP +\fBZeichen für aktuelle Artikel (art_marked_recent)\fP The character used to show that an article/thread is recent (not older than X days). See also \fBrecent_time\fP. Default is 'o'. .TP -\fBZeichen für ungelesene Artikel (art_marked_unread)\fP +\fBZeichen für ungelesene Artikel (art_marked_unread)\fP The character used to show that an article has not been read. Default is \&'+'. .TP -\fBZeichen für gelesene Artikel (art_marked_read)\fP +\fBZeichen für gelesene Artikel (art_marked_read)\fP The character used to show that an article was read. Default is ' '. .TP -\fBZeichen für gekillte Artikel (art_marked_killed)\fP -The character used to show that an article was killed. Default is 'K'. +\fBZeichen für gekillte Artikel (art_marked_killed)\fP +The character used to show that an article was killed. Default is 'K'. \fBkill_level\fP must be set accordingly. .TP -\fBZeichen für gelesene wichtige Art. (art_marked_read_selected)\fP -The character used to show that an article was hot before it was read. +\fBZeichen für gelesene wichtige Art. (art_marked_read_selected)\fP +The character used to show that an article was hot before it was read. Default is ':'. \fBkill_level\fP must be set accordingly. .TP -\fBStart des MIME\-Viewers bestätigen (ask_for_metamail)\fP +\fBStart des MIME\-Viewers bestätigen (ask_for_metamail)\fP If ON \fBtin\fP will ask before using a MIME viewer (\fBmetamail_prog\fP) to display MIME messages. This only occurs if a MIME viewer is set. Default is OFF. @@ -1482,7 +1502,7 @@ Automatically put your name in the \*(rq mailing an article. Default is No. .TP \fBZeige Thread mit rechter Pfeilt. an (auto_list_thread)\fP -If ON automatically list thread when entering it using right arrow key. +If ON automatically list thread when entering it using right arrow key. Default is ON. .TP \fBAutom. Wiederverbindung zum Server (auto_reconnect)\fP @@ -1498,14 +1518,14 @@ OFF. If set ON articles/threads will be saved in batch mode when save \&\*(rq\fB\-S\fP\*(rq or mail \*(rq\fB\-M\fP, \fB\-N\fP\*(rq is specified on the command line. Default is ON. .TP -\fBZeigt Minimenü & Posting etiquette (beginner_level)\fP +\fBZeigt Minimenü & Posting etiquette (beginner_level)\fP If set ON a mini menu of the most useful commands will be displayed at the bottom of the screen for each level. Also a short posting etiquette will be displayed after composing an article. Default is ON. .TP \fBSpeichere NNTP Overview Daten lokal (cache_overview_files)\fP If ON, create local copies of NNTP overview files. This can be used to -considerably speed up accessing large groups when using a slow connection. +considerably speed up accessing large groups when using a slow connection. See also "INDEX FILES". Default is OFF. .TP \fBCatchup der Gruppen beim Beenden (catchup_read_groups)\fP @@ -1527,16 +1547,16 @@ Farbe der Artikelheaderzeilen Farbe des Hilfstext .TP \fBFarbe des inversen Text (Hinterg.) (col_invers_bg)\fP -Hintergrundfarbe für inversen Text +Hintergrundfarbe für inversen Text .TP \fBFarbe des inversen Text (Vordergr.) (col_invers_fg)\fP -Vordergrundfarbe für inversen Text +Vordergrundfarbe für inversen Text .TP \fBFarbe der Hervorhebung _Striche_ (col_markdash)\fP Color of words emphasized like _this_. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP -\fBFarbe der Hervorhebung /Schrägstr./ (col_markslash)\fP +\fBFarbe der Hervorhebung /Schrägstr./ (col_markslash)\fP Color of words emphasized like /this/. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP @@ -1548,8 +1568,8 @@ Color of words emphasized like *this*. S Color of words emphasized like \-this\-. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP -\fBFarbe des Minihilfemenü (col_minihelp)\fP -Farbe des Minihilfemenü +\fBFarbe des Minihilfemenü (col_minihelp)\fP +Farbe des Minihilfemenü .TP \fBFarbe des angezeigten Headers (col_newsheaders)\fP Farbe des angezeigten Headers @@ -1566,7 +1586,7 @@ Farbe von zweifach zitierten Zeilen \fBFarbe von =>3\-fach zitierten Zeilen (col_quote3)\fP Farbe von =>3\-fach zitierten Zeilen .TP -\fBFarbe des Antwortzählers (col_response)\fP +\fBFarbe des Antwortzählers (col_response)\fP Color of response counter. This is the text that says "Response x of y" in the article viewer. .TP @@ -1588,7 +1608,7 @@ Farbe der Textzeilen \fBFarbe des Hilfe/Mail\-Zeichens (col_title)\fP Farbe des Hilfe/Mail\-Zeichens .TP -\fBBestätigung erforderlich für (confirm_choice)\fP +\fBBestätigung erforderlich für (confirm_choice)\fP Ask for manual confirmation to protect the user. .RS +.5i .IP \(bu 3 @@ -1609,8 +1629,8 @@ the \fBQuit\fP ('\fBq\fP') command. .\" most of these default_* settings are not available from the menu .\" as they are intended for internal use only. Format string \fBtin\fP uses for date representation. A description of the -different format options can be found at \fBstrftime\fP(3). \fBtin\fP uses -\fBstrftime\fP(3) when available and supports most format options in his +different format options can be found at \fB\%strftime\fP(3). \fBtin\fP uses +\fB\%strftime\fP(3) when available and supports most format options in his fallback code. Default is "%a, %d %b %Y %H:%M:%S". .TP \fB(default_art_search)\fP @@ -1639,15 +1659,15 @@ OFF=apply to current group. Default is O Default for quick (1 key) kill filter header. .RS +.5i .IP 0 4 - \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) + \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) .IP 1 - \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) + \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) .IP 2 - \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) + \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) .IP 3 - \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) + \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) .IP 4 - \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge + \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge .IP 5 \&\*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag .IP 6 @@ -1672,15 +1692,15 @@ groups OFF=apply to current group. Defau Default for quick (1 key) auto\-selection filter header. .RS +.5i .IP 0 4 - \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) + \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) .IP 1 - \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) + \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) .IP 2 - \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) + \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) .IP 3 - \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) + \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) .IP 4 - \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge + \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge .IP 5 \&\*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag .IP 6 @@ -1728,7 +1748,7 @@ Allows groups/articles to be selected by an highlighted bar if set OFF. Default is OFF. .TP \fBAufruf Ihres Editors (editor_format)\fP -The format string used to create the editor start command with parameters. +The format string used to create the editor start command with parameters. Default is "%E +%N %F" (i.e., /bin/vi +7 .article). .TP \fBAnzeigeauffrischung nach Kommandos (force_screen_redraw)\fP @@ -1744,15 +1764,20 @@ fetching articles from your first unread \fBCatchup der Gruppe mit l. Cursor (group_catchup_on_exit)\fP If ON catchup group when leaving with the left arrow key. Default is ON. .TP -\fBZum nächsten ungelesenen Artikel... (goto_next_unread)\fP -Which keys \fBtin\fP should accept to jump to the next unread article. +\fBFormatanweisung für die Gruppenebene (group_format)\fP +Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Gruppenebene +benutzt. Für weitere Informationen sei auf den Abschnitt "ANSICHTEN +ANPASSEN" verwiesen. Voreingestellt ist "%n\ %m\ %R\ %L\ \ %s\ \ %F". +.TP +\fBZum nächsten ungelesenen Artikel... (goto_next_unread)\fP +Which keys \fBtin\fP should accept to jump to the next unread article. Possible is any combination of \fBPageDown\fP and \fBPageNextUnread\fP. When \fBPageDown\fP is set \fBtin\fP jumps to the next article at the end of the current one. When \fBPageNextUnread\fP is set \fBtin\fP jumps immediately to the next article when \fBPageNextUnread\fP ('\fB\fP') is -pressed. Default is PageNextUnread. +pressed. Default is \fBPageNextUnread\fP. .TP -\fBMax. Länge angezeigter Gruppennamen (groupname_max_length)\fP +\fBMax. Länge angezeigter Gruppennamen (groupname_max_length)\fP Maximum length of the names of newsgroups to be displayed so that more of the newsgroup description can be displayed. Default is 32. .TP @@ -1766,9 +1791,10 @@ article but can also lead to false posit toggled in the article viewer. Default is 'No'. .TP \fBExternes inews\-Programm (inews_prog)\fP -Path, name and options of external \fBinews\fP(1). If you are reading via NNTP -the default value is \-\-internal (use built\-in NNTP inews), else it is "inews -\-h". The article is passed to \fBinews_prog\fP on STDIN via '< article'. +Path, name and options of external \fB\%inews\fP(1). If you are reading via +NNTP the default value is \-\-internal (use built\-in NNTP inews), else it is +"inews \-h". The article is passed to \fBinews_prog\fP on STDIN via '< +article'. .TP \fB(info_in_last_line)\fP .\" this is missing from the Menu @@ -1787,7 +1813,7 @@ use_mailreader_i=ON option). 0 turns off .\" TODO: fix menu description .\" mono_mark* currently do allow "Reverse video" even if .\" inverse_okay=FALSE -\fBInverse Darstellung für die Header (inverse_okay)\fP +\fBInverse Darstellung für die Header (inverse_okay)\fP If ON use inverse video for page headers and URL highlighting. Default is ON. .TP @@ -1822,31 +1848,32 @@ Voreinstellung ist 0 (\fBKillt nur ungel Allows 8bit characters unencoded in the header of mail message. Default is OFF. Turning it ON is effective only if \fBmail_mime_encoding\fP is also set to 8bit. Leaving it OFF is safe for most users and compliant to Internet Mail -Standard (\fBRFC5322\fP and \fBRFC2047\fP). Default is OFF. +Standard (\fBRFC\%5322\fP and \fBRFC\%2047\fP ). Default is OFF. .TP \fBMailadresse (und Name) (mail_address)\fP User's mail address (and full name), if not username@host. This is used when -creating articles, sending mail and when \fBpgp\fP(1) signing. +creating articles, sending mail and when \fB\%pgp\fP(1) signing. .TP -\fBMIME\-Kodierung für E\-Mails (mail_mime_encoding)\fP +\fBMIME\-Kodierung für E\-Mails (mail_mime_encoding)\fP MIME encoding of the body in mail message, if necessary (8bit, base64, quoted\-printable, 7bit). Default is quoted\-printable. .TP \fBEinleitungszeile bei Mailantwort (mail_quote_format)\fP -Format of quote line when replying (via mail) to an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, -%C=Firstname, %I=Initials). Default is "In article %M you wrote:" +Format der Einleitungszeile für Mailantworten (%A=Mailadresse, %D=Datum, +%F=Name und Adresse, %G=Name der Gruppe, %M=Message\-ID, %N=Name des Autors, +%C=Vorname des Autors, %I=Initialen des Autor). Voreinstellung ist "In +article %M you wrote:". .TP \fBMailbox\-Format (mailbox_format)\fP -Select one of the following mailbox\-formats: MBOXO (default, except for -SCO), MBOXRD or MMDF (default on SCO). See \fBmbox\fP(5) for more details on -MBOXO and MBOXRD and \fBmmdf\fP(5) for more details about MMDF. +Select one of the following mailbox\-formats: MBOXO (default, except on SCO), +MBOXRD or MMDF (default on SCO). See \fB\%mbox\fP(5) and \fBRFC\%4155\fP for more +details on MBOXO and MBOXRD and \fB\%mmdf\fP(5) for more details about MMDF. .TP \fBMail Verzeichnis (maildir)\fP -The directory where articles/threads are to be saved in \fBmbox\fP(5) -format. This feature is mainly for use with the \fBelm\fP(1) mail program. It -allows the user to save articles/threads/groups simply by giving '=' as the -filename to save to. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. +The directory where articles/threads are to be saved in \fB\%mbox\fP(5) +format. This feature is mainly for use with the \fB\%elm\fP(1) mail +program. It allows the user to save articles/threads/groups simply by giving +\&'=' as the filename to save to. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. .TP \fBAufruf Ihres Mailkommandos (mailer_format)\fP .\" TODO: document %S, %T, %M, %F, %U ... @@ -1869,9 +1896,9 @@ unread articles, or nothing. If ON mark articles that are saved as read. Default is ON. .TP \fBMIME\-Viewer (metamail_prog)\fP -Path, name and options of external \fBmetamail\fP(1) program used to view +Path, name and options of external \fB\%metamail\fP(1) program used to view non\-textual parts of articles. To use the built\-in viewer, set to -\-\-internal. This is the default value when \fBmetamail\fP(1) is not +\-\-internal. This is the default value when \fB\%metamail\fP(1) is not installed. Leave it blank if you don't want any automatic viewing of non\-textual attachments. The 'V' command can always be used to manually view any attachments. See also \fBask_for_metamail\fP. @@ -1884,13 +1911,13 @@ than the value of this parameter is cons represented as '?'. Otherwise, all character sets are regarded as compatible with the display. If it's not set, the value of the environment variable $\fBMM_CHARSET\fP is used. US\-ASCII or compile\-time default is used in case -neither of them is defined. If your system supports \fBiconv\fP(3), this option -is disabled and you should use \fBmm_network_charset\fP instead. +neither of them is defined. If your system supports \fB\%iconv\fP(3), this +option is disabled and you should use \fBmm_network_charset\fP instead. .TP \fBMM_NETWORK_CHARSET (mm_network_charset)\fP -Charset used for posting and MIME headers; replaces \fBmm_charset\fP. +Charset used for posting and MIME headers; replaces \fBmm_charset\fP. Conversion between \fBmm_network_charset\fP and local charset (determined via -\fBnl_langinfo\fP(3)) is done via \fBiconv\fP(3), if this function is not +\fB\%nl_langinfo\fP(3)) is done via \fB\%iconv\fP(3), if this function is not available on your system this option is disabled and you have to use \fBmm_charset\fP instead. \fBmm_network_charset\fP is limited to one of the following charsets: @@ -1898,7 +1925,7 @@ following charsets: US\-ASCII, ISO\-8859\-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8\-{R,U,RU} EUC\-{CN,JP,KR,TW}, ISO\-2022\-{CN,CN\-EXT,JP,JP\-1,JP\-2}, Big5, UTF\-8 .in -.3i -Not all values might work on your system, see \fBiconv_open\fP(3) for more +Not all values might work on your system, see \fB\%iconv_open\fP(3) for more details. If it's not set, the value of the environment variable $\fBMM_CHARSET\fP is used. US\-ASCII or compile\-time default is used in case neither of them is defined. @@ -1908,7 +1935,7 @@ Character attribute of words emphasized terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP -\fBHervorhebungsattr. /Schrägstriche/ (mono_markslash)\fP +\fBHervorhebungsattr. /Schrägstriche/ (mono_markslash)\fP Character attribute of words emphasized like /this/. It depends on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. @@ -1924,7 +1951,7 @@ terminal which attributes are usable. Se \fBword_highlight\fP. .TP \fB(newnews)\fP -These are internal timers used by \fBtin\fP to keep track of new newsgroups. +These are internal timers used by \fBtin\fP to keep track of new newsgroups. Do not change them unless you understand what they are for. .TP \fBor *) (news_headers_to_display\fP @@ -1943,9 +1970,14 @@ do something like this: \fInews_headers_ off this option. .TP \fBEinleitungszeile beim Antworten (news_quote_format)\fP -Format of quote line when posting/following up an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, -%C=Firstname, %I=Initials). Default is "%F wrote:". +Format der Einleitungszeile für Newsartikel (%A=Mailadresse, %D=Datum, +%F=Name und Adresse, %G=Name der Gruppe, %M=Message\-ID, %N=Name des Autors, +%C=Vorname des Autors, %I=Initialen des Autor). Voreinstellung ist "%F +wrote:". +.TP +\fBNNTP read timeout in seconds (nntp_read_timeout_secs)\fP +Time in seconds to wait for a response from the server. Default is 120. +Setting this to 0 means no timeout. .TP \fBUnicode Normalisierungsart (normalization_form)\fP The normalization form \fBtin\fP should use to normalize unicode input. The @@ -1963,7 +1995,7 @@ possible values are: \fBNFD\fP: Canonical Decomposition .RE Some normalization modes are only available if they are supported by the -library \fBtin\fP uses to do the normalization. Default is NFKC. +library \fBtin\fP uses to do the normalization. NFC should be used if possible. .TP \fBSetze Cursor auf ersten ungel. Art. (pos_first_unread)\fP If ON put cursor at first unread article in group otherwise at last @@ -1987,7 +2019,7 @@ and quoted\-printable are usually undesi \fBNachbearbeitete Artikel anzeigen (post_process_view)\fP If ON, then \fBtin\fP will start an appropriate viewer program to display any files that were post processed and uudecoded. The program is determined -using the mailcap file. Default is ON. +using the \fB\%mailcap\fP(5) file. Default is ON. .TP \fBNachbearbeiten gespeichert. Artikel (post_process_type)\fP This specifies whether to perform post processing on saved articles. The @@ -1996,7 +2028,7 @@ following values are allowed: .IP 0 3 \fBNo\fP (default), no post processing is done. .IP 1 -\fBShell archives\fP, unpacking of multi\-part \fBshar\fP(1) files only. +\fBShell archives\fP, unpacking of multi\-part \fB\%shar\fP(1) files only. .IP 2 \fBYes\fP, binary attachments and data will be decoded and saved. .RE @@ -2012,12 +2044,12 @@ the \*(rqSubject:\*(rq and \*(rqFrom:\*( .TP \fBDruckprogramm mit Optionen (printer)\fP The printer program with options that is to be used to print articles. The -default is \fBlpr\fP(1) for BSD machines and \fBlp\fP(1) for SysV +default is \fB\%lpr\fP(1) for BSD machines and \fB\%lp\fP(1) for SysV machines. Printing from \fBtin\fP may have been disabled by the System Administrator. .TP \fBBearbeite nur ungelesene Artikel (process_only_unread)\fP -If ON only save/print/pipe/mail unread articles (tagged articles excepted). +If ON only save/print/pipe/mail unread articles (tagged articles excepted). Default is OFF. .TP \fBLeeres Fup'2 im Editor anzeigen (prompt_followupto)\fP @@ -2041,17 +2073,17 @@ When you are viewing an article in raw m reply to it, the signature will be quoted even if it would otherwise not be. If \fBshow_signatures\fP is off, then the signature will never be quoted. .TP -\fBRegulärer Ausd. für zit. Zeilen (quote_regex)\fP +\fBRegulärer Ausd. für zit. Zeilen (quote_regex)\fP A regular expression that will be applied when reading articles. All matching lines are shown in \fBcol_quote\fP. If \fBquote_regex\fP is blank, then \fBtin\fP uses a built\-in default. .TP -\fBReg. Ausd. für zweifach zitierte Z. (quote_regex2)\fP +\fBReg. Ausd. für zweifach zitierte Z. (quote_regex2)\fP A regular expression that will be applied when reading articles. All matching lines are shown in \fBcol_quote2\fP. If \fBquote_regex2\fP is blank, then \fBtin\fP uses a built\-in default. .TP -\fBReg. Ausd. für >=3\-fach zitierte Z. (quote_regex3)\fP +\fBReg. Ausd. für >=3\-fach zitierte Z. (quote_regex3)\fP A regular expression that will be applied when reading articles. All matching lines are shown in \fBcol_quote3\fP. If \fBquote_regex3\fP is blank, then \fBtin\fP uses a built\-in default. @@ -2081,23 +2113,28 @@ marked as killed. If the score of an article is above or equal this value the article gets marked as hot. .TP -\fBBewertung für gekillte Artikel (score_kill)\fP +\fBBewertung für gekillte Artikel (score_kill)\fP Score of an article which should be killed, this must be <= \fBscore_limit_kill\fP. .TP -\fBBewertung für wichtige Artikel (score_select)\fP +\fBBewertung für wichtige Artikel (score_select)\fP Score of an article which should be marked hot, this must be >= \fBscore_limit_select\fP. .TP -\fBBlättere Artikel um ... Zeilen (scroll_lines)\fP +\fBBlättere Artikel um ... Zeilen (scroll_lines)\fP The number of lines that will be scrolled up/down in the article pager when using cursor\-up/down. The default is 1 (line\-by\-line). Set to 0 to get traditional tin page\-by\-page scrolling. Set to \-1 to get page\-by\-page -scrolling where the top/bottom line is carried over onto the next page. +scrolling where the top/bottom line is carried over onto the next page. This setting supersedes show_last_line_prev_page=ON. Set to \-2 to get half\-page scrolling. This setting supersedes full_page_scroll=OFF. .TP -\fBIm Gruppenmenü, zeige Autor an nach (show_author)\fP +\fBFormatanweisung für die Auswahlebene (select_format)\fP +Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Auswahlebene +benutzt. Für weitere Informationen sei auf den Abschnitt "ANSICHTEN +ANPASSEN" verwiesen. Voreingestellt ist "%f\ %n\ %U\ \ %G\ \ %d". +.TP +\fBIm Gruppenmenü, zeige Autor an nach (show_author)\fP Which information about the author should be shown. Default is 2, authors full name. .RS +.5i @@ -2122,7 +2159,17 @@ and turn descriptions off. The text used \fBtin\fP to be build with mh\-mail\-handling support) from \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/mailgroups\fP for mailgroups. Default is ON. .TP -\fBZeige Zeilenz./Bewert. in Übersicht (show_info)\fP +\fBSortierfunktion (sort_function)\fP +Sortierfunktion für Artikel. Standard ist 0. +.RS +.5i +.IP 0 3 +Mit \fB\%qsort\fP(3) sortieren. +.IP 1 +Mit \fB\%heapsort\fP(3) sortieren. Kann in großen Gruppen mit langen Threads +schneller sein. +.RE +.TP +\fBZeige Zeilenz./Bewert. in Ãœbersicht (show_info)\fP Which information about the thread or article should be shown. Default is 1, show only the line count. .RS +.5i @@ -2137,7 +2184,7 @@ displayed. in thread listing the score of the thread will be displayed \- see also \fBthread_score\fP. .IP 3 -\fBZeilen und Bewertung\fP, Zeilenzahl und Bewertung zusätzlich anzeigen. +\fBZeilen und Bewertung\fP, Zeilenzahl und Bewertung zusätzlich anzeigen. .RE .TP \fBZeige nur ungelesene Artikel (show_only_unread_arts)\fP @@ -2163,10 +2210,10 @@ be executed to generate a signature. \fB current newsgroup as argument to the program. \-\-none will suppress any signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. .TP -\fBSignatur beim Reposten anhängen (signature_repost)\fP +\fBSignatur beim Reposten anhängen (signature_repost)\fP If ON add signature to reposted articles. Default is ON. .TP -\fBReg. für /Schrägst./ Hervorhebungen (slashes_regex)\fP +\fBReg. für /Schrägst./ Hervorhebungen (slashes_regex)\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markslash\fP or \fBmono_markslash\fP. If \fBslashes_regex\fP is blank, then \fBtin\fP uses a built\-in default. @@ -2176,7 +2223,7 @@ This specifies how articles should be so the default. The following sort types are allowed: .RS +.5i .IP 0 3 -\fBNothing\fP, don't sort articles. +\fBNichts\fP, keine Sortierung. .IP 1 \fBSubject: (absteigend)\fP, Artikel absteigend nach \*(rqSubject:\*(rq sortieren. .IP 2 @@ -2224,12 +2271,12 @@ these strings. The matching is case\-ins .sp \fIspam,delete,remove\fP .TP -\fBRegu. A. für *Stern* Hervorhebungen (stars_regex)\fP +\fBRegu. A. für *Stern* Hervorhebungen (stars_regex)\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstar\fP or \fBmono_markstar\fP. If \fBstars_regex\fP is blank, then \fBtin\fP uses a built\-in default. .TP -\fBStarte Editor mit Einrückung (start_editor_offset)\fP +\fBStarte Editor mit Einrückung (start_editor_offset)\fP Set ON if the editor used for posting, follow\-ups and bug reports has the capability of starting and positioning the cursor at a specified line within a file. Default is ON. @@ -2240,10 +2287,10 @@ a file. Default is ON. Strips the blanks from the end of each line therefore speeding up the display when reading on a slow terminal or via modem. Default is ON. .TP -\fBLösche nicht vorhan. G. aus newsrc (strip_bogus)\fP +\fBLösche nicht vorhan. G. aus newsrc (strip_bogus)\fP Bogus groups are groups that are present in your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file that no longer exist on the news -server. There are 3 options. 0 means do nothing & always keep bogus groups. +server. There are 3 options. 0 means do nothing & always keep bogus groups. 1 means bogus groups will be permanently removed. 2 means that bogus groups will appear on the Group Selection Menu, prefixed with a 'D'. This allows you to unsubscribe from them as and when you wish. Default is 0 (Always @@ -2253,12 +2300,12 @@ Keep). If ON, then unsubscribed groups will be permanently removed from your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file. Default is OFF. .TP -\fBReg. für \-Durchstr.\- Hervorhebungen (strokes_regex)\fP +\fBReg. für \-Durchstr.\- Hervorhebungen (strokes_regex)\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If \fBstrokes_regex\fP is blank, then \fBtin\fP uses a built\-in default. .TP -\fBNä.ungel.\-kein Abbr. am Listenende? (wrap_on_next_unread)\fP +\fBNä.ungel.\-kein Abbr. am Listenende? (wrap_on_next_unread)\fP If enabled a search for the next unread article will wrap around all articles to find also previous unread articles. If disabled the search stops at the end of the thread list. Default is ON. @@ -2271,18 +2318,18 @@ toggled in the article viewer via \fBPag Defines which threading method to use. It's possible to set the threading type on a per group basis by setting the group attribute variable \fBthread_arts\fP to 0 \- 4 in the file -\fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. (See also "GROUP ATTRIBUTES".) +\fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. (See also "GROUP ATTRIBUTES".) The default is Both Subject and References. The choices are: .RS +.5i .IP 0 3 \fBNone\fP, don't thread. .IP 1 -\fBSubject\fP, thread on \*(rqSubject:\*(rq only. +\fBSubject\fP, Diskussionsfaden nur anhand von \*(rqSubject:\*(rq aufbauen. .IP 2 -\fBReferences\fP, thread on \*(rqReferences:\*(rq only. +\fBReferences\fP, Diskussionsfaden nur anhand von \*(rqReferences:\*(rq aufbauen. .IP 3 -\fBBoth Subject and References\fP, thread on \*(rqReferences:\*(rq then -\&\*(rqSubject:\*(rq (default). +\fBBoth Subject and References\fP, Diskussionsfaden anhand von +\&\*(rqReferences:\*(rqund \*(rqSubject:\*(rq aufbauen. (Voreinstellung). .IP 4 \fBMultipart Subject\fP, thread multipart articles on \*(rqSubject:\*(rq. .IP 5 @@ -2294,6 +2341,11 @@ The default is Both Subject and Referenc If ON catchup group/thread when leaving with the left arrow key. Default is ON. .TP +\fBFormatanweisung für die Threadebene (thread_format)\fP +Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Threadebene +benutzt. Für weitere Informationen sei auf den Abschnitt "ANSICHTEN +ANPASSEN" verwiesen. Voreingestellt ist "%n\ %m\ \ [%L]\ \ %T\ \ %F". +.TP \fBProzentualer Subject Vergleich (thread_perc)\fP How closely the subjects must match for two threads to be considered part of the same thread. This is a percentage and the default if 75%. @@ -2303,30 +2355,30 @@ How the total score of a thread is compu in this thread. .RS +.5i .IP 0 3 -\fBMax\fP, the maximum score in this thread. +\fBMax\fP, Maximalwert im Diskussionsfaden. .IP 1 -\fBSum\fP, the sum of all scores in this thread. +\fBSum\fP, Summer aller Bewertungen im Diskussionsfaden. .IP 2 -\fBAverage\fP, the average score in this thread. +\fBAverage\fP, Durchschnitt aller Bewertungen im Diskussionsfaden. .RE .TP \fBVerwende Umschreibungen (translit)\fP -If ON append //TRANSLIT to the first argument of \fBiconv_open\fP(3) to enable -transliteration. This means that when a character cannot be represented in -the target character set, it can be approximated through one or several -similarly looking characters. On systems where this extension doesn't exist, -this option is disabled. Default is OFF. +If ON append //TRANSLIT to the first argument of \fB\%iconv_open\fP(3) to +enable transliteration. This means that when a character cannot be +represented in the target character set, it can be approximated through one +or several similarly looking characters. On systems where this extension +doesn't exist, this option is disabled. Default is OFF. .TP \fBHow to treat blank lines (trim_article_body)\fP -Allows you to select how \fBtin\fP treats blank lines in article bodies. +Allows you to select how \fBtin\fP treats blank lines in article bodies. Default is 0. This option does not affect lines within verbatim blocks. .RS +.5i .IP 0 3 \fBDon't trim article body\fP, do nothing. .IP 1 -\fBFührende Leerzeilen überspringen\fP. +\fBFührende Leerzeilen überspringen\fP. .IP 2 -\fBAbschliessende Leerzeilen überspr.\fP. +\fBAbschließende Leerzeilen überspr.\fP. .IP 3 \fBSkip leading and trailing blank l.\fP, skip leading and trailing blank lines. @@ -2341,7 +2393,7 @@ textblocks with one blank line. \fBCompact mltpl., skip lead. & trai.\fP, 4 + 3 .RE .TP -\fBReg. für _Unterstr._ Hervorhebungen (underscores_regex)\fP +\fBReg. für _Unterstr._ Hervorhebungen (underscores_regex)\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markdash\fP or \fBmono_markdash\fP. If \fBunderscores_regex\fP is blank, then \fBtin\fP uses a built\-in default. @@ -2349,9 +2401,9 @@ matching words are shown in \fBcol_markd \fBEntferne ~/.article nach dem posten (unlink_article)\fP If ON remove \fI~/.article\fP after posting. Default is ON. .TP -\fBÖffne URLs mit ... (url_handler)\fP +\fBÖffne URLs mit ... (url_handler)\fP The program that will be run when launching URL's in the article viewer -using \fBPageViewUrl\fP ('\fBU\fP'). The actual URL will be appended to this. +using \fBPageViewUrl\fP ('\fBU\fP'). The actual URL will be appended to this. Default is \fBurl_handler.pl %s\fP. .TP \fBURL\-Hervorhebung im Artikel (url_highlight)\fP @@ -2364,35 +2416,37 @@ If enabled \fBtin\fP uses ANSI\-colors. Standard ist OFF. .TP \fBMaus in xterm nutzen (use_mouse)\fP -Allows the mouse button support in a \fBxterm\fP(1x) to be enabled/disabled. -Default is OFF. +Allows the mouse button support in a \fB\%xterm\fP(1x) to be +enabled/disabled. Default is OFF. .TP \&\fB\*(rqX\-Face:\*(rqs mit slrnface Anzeigen (use_slrnface)\fP -If enabled \fBtin\fP uses \fBslrnface\fP(1) to interpret the \*(rqX\-Face:\*(rq +If enabled \fBtin\fP uses \fB\%slrnface\fP(1) to interpret the \*(rqX\-Face:\*(rq header. For this option to have any effect, \fBtin\fP must be running in an -\fBxterm\fP(1x) and \fBslrnface\fP(1) must be in your $\fBPATH\fP. Default is OFF. +\fB\%xterm\fP(1x) and \fB\%slrnface\fP(1) must be in your $\fBPATH\fP. Default is +OFF. .TP \fBUse UTF\-8 graphics (utf8_graphics)\fP If ON use UTF\-8 characters for indicator ('\->'), thread/attachment tree and ellipsis ('...'). Default is OFF. .TP -\fBReg. Ausd. für den Anfang e. wortgetreuen Textblock (verbatim_begin_regex)\fP +\fBReg. Ausd. für den Anfang e. wortgetreuen Textblock (verbatim_begin_regex)\fP A regular expression that tin will use to find the begin of a verbatim block. .TP -\fBReg. Ausd. für das Ende eines wortgetreuen Textblocks (verbatim_end_regex)\fP +\fBReg. Ausd. für das Ende eines wortgetreuen Textblocks (verbatim_end_regex)\fP A regular expression that tin will use to find the end of a verbatim block. .TP -\fBWortgetreue Textblöcke erkennen (verbatim_handling)\fP +\fBWortgetreue Textblöcke erkennen (verbatim_handling)\fP If ON verbatim blocks will be detected. Default is ON. .TP -\fBWildcardprüfung (wildcard)\fP +\fBWildcardprüfung (wildcard)\fP Allows you to select how \fBtin\fP matches strings. The default is 0 and uses -the wildmat notation, which is how this has traditionally been handled. -Setting this to 1 allows you to use \fBperl\fP(1) compatible regular -expressions \fBpcre\fP(3) (see also \fBperlre\fP(1) and \fBpcrepattern\fP(3)). You -will probably want to update your filter file if you use this regularly. -NB: Newsgroup names will always be matched using the wildmat notation. +the wildmat notation, which is how this has traditionally been handled. +Setting this to 1 allows you to use \fB\%perl\fP(1) compatible regular +expressions \fB\%pcre\fP(3) (see also \fB\%perlre\fP(1) and +\fB\%pcrepattern\fP(3)). You will probably want to update your filter file if +you use this regularly. NB: Newsgroup names will always be matched using +the wildmat notation. .TP \fBAnstelle der Markierung anzeigen (word_h_display_marks)\fP Should the leading and ending stars, slashes, strokes and dashes also be @@ -2442,7 +2496,7 @@ the attributes are specified for that li reasonable default so you only have to specify the attribute that you want to change (e.g., savedir). All toggle attributes are set by specifying ON/OFF. Otherwise, these function exactly the same as their global -equivalents. For more details see \fBtin\fP(5). +equivalents. For more details see \fB\%tin\fP(5). .PP Attributes can also be changed from the attributes menu which can be accessed by \fBConfigToggleAttrib\fP ('\fB\fP') from the options menu @@ -2458,7 +2512,7 @@ options menu the attributes menu provide \fBConfigResetAttrib\fP ('\fBr\fP') which resets an attribute to a default value. .SS "SCOPES MENU" The scopes menu (accessible from the options menu with \fBConfigScopeMenu\fP -('\fBS\fP')) shows all scopes read from the global and local attributes file. +('\fBS\fP')) shows all scopes read from the global and local attributes file. Scopes from the global attributes file are marked with '!' to the left of the scope number. Delete/rename/move are not possible with those scopes. .PP @@ -2481,7 +2535,7 @@ specify. This can be anything from the n lines in an article. .PP When \fBtin\fP starts up the user's kill\-file -\fI${TIN_HOMEDIR:\-"$HOME"}/.tin/filter\fP (see also \fBtin\fP(5)) is read. Each +\fI${TIN_HOMEDIR:\-"$HOME"}/.tin/filter\fP (see also \fB\%tin\fP(5)) is read. Each time a newsgroup is entered the rules are applied and articles killed or selected when they meet certain criteria. .PP @@ -2499,28 +2553,30 @@ The filtering capabilities of \fBtin\fP previous versions to include scoring and better pattern matching. It is recommended that you read the file \fIfiltering\fP in the \fBtin\fP documentation directory. This file can also be read online at +.br . .PP .\" FIXME - Next paragraph is out of date .\" .\" -The on\-screen filtering menu is accessed by pressing '\fB^K\fP' at the Group -and Article levels. It allows the user to kill or select an article that -matches the current \*(rqSubject:\*(rq line, \*(rqFrom:\*(rq line or a string entered by -the user. The user entered string can be applied to the \*(rqSubject:\*(rq or -\&\*(rqFrom:\*(rq lines of an article. The kill description can be limited to the -current newsgroup or it can apply to all newsgroups. Once entered the user -can abort the command and not save the kill description, edit the kill file -or save the kill description. +The on\-screen filtering menu is accessed by pressing \fBMenuFilterKill\fP +('\fB^K\fP') or \fBMenuFilterSelect\fP ('\fB^A\fP') at the Group and Article +levels. It allows the user to kill or select an article that matches the +current \*(rqSubject:\*(rq line, \*(rqFrom:\*(rq line or a string entered by the +user. The user entered string can be applied to the \&\*(rqSubject:\*(rq or +\&\*(rqFrom:\*(rq line of an article. The filter can be limited to the current +newsgroup or it can apply to all newsgroups. Once entered the user can abort +the command and not save the new filter, edit the full filter file or save +filter. .SS "POSTING ARTICLES" \fBtin\fP allows posting of articles, follow\-up to already posted articles and replying direct through mail to the author of an article. .PP Use the \fBPost\fP ('\fBw\fP') command to post an article to a newsgroup. After -entering the post subject the default editor (i.e., \fBvi\fP(1)) or the editor -specified by the $\fBVISUAL\fP or $\fBEDITOR\fP environment variable will be -started and the article can be entered. To crosspost articles simply add a -comma and the name of the newsgroup(s) to the end of the \*(rqNewsgroups:\*(rq +entering the post subject the default editor (i.e., \fB\%vi\fP(1)) or the +editor specified by the $\fBVISUAL\fP or $\fBEDITOR\fP environment variable will +be started and the article can be entered. To crosspost articles simply add +a comma and the name of the newsgroup(s) to the end of the \*(rqNewsgroups:\*(rq line at the beginning of the article. After saving and exiting the editor you are asked if you wish to a)bort posting the article, e)dit the article again or p)ost the article to the specified newsgroup(s). @@ -2563,7 +2619,7 @@ following variables are expanded if foun \fB%A\fP Mailadresse \fB%D\fP Datum (benutzt \fBdate_format\fP) \fB%F\fP Name und Adresse (%N <%A>) -\fB%G\fP Groupname +\fB%G\fP Name der Gruppe \fB%M\fP Message\-ID \fB%N\fP Name des Autors \fB%C\fP Vorname des Autors @@ -2577,7 +2633,7 @@ z. B. news_quote_format=In %M schreib %F:\fP .fi .RE -ergäbe folgendes: +ergäbe folgendes: .RS .nf \f(CWAm 21. Sept 1993 9:45:51 \-0400 in alt.sources schrieben Sie: @@ -2607,7 +2663,7 @@ Otherwise, the initial prompt will ask y hot (auto\-selected), regex pattern, tagged articles you wish to mail, pipe etc. .PP -Tagged articles must have already been tagged with a \fB*Tag\fP ('\fBt\fP') +Tagged articles must have already been tagged with a \fB*Tag\fP ('\fBt\fP') command. All tagged articles can be untagged by a \fB*Untag\fP ('\fBU\fP') untag command. .PP @@ -2640,10 +2696,10 @@ processed. A default process type can be \&\*(rq\fB\-N\fP\*(rq option) or saved (\*(rq\fB\-S\fP\*(rq option) in batch mode for later reading. Useful when going on holiday and you don't want to return and find that expire has removed a whole load of unread articles. Best to run via -\fBcron\fP(1) everyday while away, after which you will be mailed a report of -which articles were mailed/saved from which newsgroups and the total number -of articles mailed/saved. Articles are saved in a private news structure -under your directory (default is +\fB\%cron\fP(1) everyday while away, after which you will be mailed a report +of which articles were mailed/saved from which newsgroups and the total +number of articles mailed/saved. Articles are saved in a private news +structure under your directory (default is \fI${TIN_HOMEDIR:\-"$HOME"}/News\fP). Be careful of using this option if you read a lot of groups because you could overflow your file system. .PP @@ -2689,10 +2745,10 @@ Several places in \fBtin\fP allow you to include command\-line groups, (un)subscribe groups, the AUTO[UN]SUBSCRIBE mechanism. The scope= attributes file tag and the filter file group= tag also use the same syntax. \fBtin\fP interprets this variable similarly to -\fBrn(1).\fP It contains a list of patterns, separated by commas and possibly -prefixed with exclamation points. An exclamation point negates the meaning -of a match on this pattern, and can be used to cancel certain matches. Some -examples: +\fB\%rn\fP(1). It contains a list of patterns, separated by commas and +possibly prefixed with exclamation points. An exclamation point negates the +meaning of a match on this pattern, and can be used to cancel certain +matches. Some examples: .sp \fIalt.config,news.*,!news.test\fP .sp @@ -2704,11 +2760,11 @@ See the explanation for the $\fBAUTOSUBS examples. .SS SIGNATUREN \fBtin\fP will recognize a signature in either -\fI${TIN_HOMEDIR:\-"$HOME"}/.signature\fP or \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. +\fI${TIN_HOMEDIR:\-"$HOME"}/.signature\fP or \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. If \fI${TIN_HOMEDIR:\-"$HOME"}/.signature\fP exists, then the signature will be pulled into the editor for mail commands only. A signature in \fI${TIN_HOMEDIR:\-"$HOME"}/.signature\fP will not be pulled into the editor for -posting commands since \fBinews\fP(1) will append the signature itself. +posting commands since \fB\%inews\fP(1) will append the signature itself. .PP A signature in \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP will be pulled into the editor for both posting and mailing commands. @@ -2717,7 +2773,7 @@ Nachstehend eine Beispiel \fI.Sig\fP Dat .RS .nf \f(CWNAMES Erika Mustermann -SNAIL Heidestraße 17, 99999 Notreal, Germany\fP +SNAIL Heidestraße 17, 99999 Notreal, Germany\fP .fi .RE .PP @@ -2732,29 +2788,170 @@ directory \fI.sigs\fP (note: one signatu signature can also consist of a fixed part signature that can contain your name, address etc. followed by the random sig. The fixed part of the random sig is read from the file \fI$HOME/.sigfixed\fP. +.SS "ANSICHTEN ANPASSEN" +Das Aussehen der Auswahl\-, Gruppen\- und Threadebene kann den eigenen +Bedürfnissen angepasst werden. Hierzu dienen Formatanweisungen, welche den +Inhalt und die Position der einzelnen Elemente einer Bildschirmzeile +definieren. Innerhalb der Formatanweisungen werden Platzhalter eingesetzt, +die später beim Bildschirmaufbau durch den eigentlichen Inhalt ersetzt +werden. Folgende Platzhalter stehen zur Verfügung: +.PP +.in +.3i +.nf +.ta \w'%G 'u +\w'aktuelle Gruppen\-, Thread\- oder Artikelnummer'u +\fB%D\fP Datum +\fB%F\fP Absender, Name und/oder E\-Mail Adresse +\fB%G\fP Name der Gruppe +\fB%I\fP Initialen des Absenders +\fB%L\fP Anzahl der Zeilen +\fB%M\fP Message\-ID +\fB%R\fP Anzahl der Antworten im Thread +\fB%S\fP Score +\fB%T\fP Subject und/oder Baumdarstellung des Thread +\fB%U\fP Anzahl ungelesener Artikel +\fB%d\fP Gruppenbeschreibung +\fB%f\fP Gruppenkennzeichnung +\fB%m\fP Artikelkennzeichnungen +\fB%n\fP aktuelle Gruppen\-, Thread\- oder Artikelnummer +\fB%s\fP Subject +\fB%%\fP % +.fi +.in -.3i +.PP +Nicht alle Platzhalter können in jeder Ebene verwendet werden. Die folgende +Tabelle gibt einen Ãœberblick über die Verfügbarkeit der einzelnen +Platzhalter: +.PP +.in +.3i +.nf +.ta \w'%G 'uC +\w'\fBselect_format\fP 'uC +\w'\fBgroup_format\fP 'uC +\w'\fBthread_format\fP'uC + \fBselect_format\fP \fBgroup_format\fP \fBthread_format\fP +\fB%D\fP X X +\fB%F\fP X X +\fB%G\fP X +\fB%I\fP X X +\fB%L\fP X X +\fB%M\fP X X +\fB%R\fP X +\fB%S\fP X X +\fB%T\fP X +\fB%U\fP X +\fB%d\fP X +\fB%f\fP X +\fB%m\fP X X +\fB%n\fP X X X +\fB%s\fP X +\fB%%\fP X X X +.fi +.in -.3i +.PP +Voreingestellt sind folgende Formatanweisungen: +.PP +.in +.3i +.nf +.ta \w'select_format 'u +\w'"\fB%n %m [%L] %T %F\fP"'u +\fBselect_format\fP: "\fB%f %n %U %G %d\fP" +\fBgroup_format\fP: "\fB%n %m %R %L %s %F\fP" +\fBthread_format\fP: "\fB%n %m [%L] %T %F\fP" +.fi +.in -.3i +.PP +Ob in der Auswahlebene die Gruppenbeschreibung angezeigt wird, hängt von +\fBshow_description\fP ab. Außerdem kann mit \fBSelectToggleDescriptions\fP +('\fBd\fP') die Beschreibung aus\- bzw. eingeblendet werden. +.PP +Welche Absenderinformationen bei '\fB%F\fP' angezeigt werden ist abhängig von +\fBshow_author\fP. Zusätzlich kann mit \fBGroupToggleSubjDisplay\fP +bzw. \fBThreadToggleSubjDisplay\fP ('\fBd\fP') durch die möglichen Anzeigeoptionen +durchgeschaltet werden. +.PP +Für die Datumsanzeige mit '\fB%D\fP' wird \fBdate_format\fP benutzt. Man kann +allerdings auch in runden Klammern ein eigenes Datumsformat angeben, das +anstelle von \fBdate_format\fP benutzt werden soll. Der Platzhalter dafür würde +dann z.B. so aussehen: '\fB%(%d %b %y %H:%M)D\fP' (siehe \fBdate_format\fP für +weiterführende Informationen). +.PP +Den einzelnen Platzhaltern (außer '\fB%%\fP') kann man eine Längenangabe +mitgeben. Das durch den Platzhalter repräsentierte Feld wird dann mit genau +dieser Breite auf dem Bildschirm dargestellt. Die Angabe erfolgt als +positive Zahl zwischen '\fB%\fP' und dem den Platzhalter charakterisierenden +Buchstaben. Folgendes Beispiel stellt den Score in der Threadebene 10 +Zeichen breit dar: '\fB%10S\fP'. Einige Platzhalter haben eine voreingestellte +Breite die unter Umständen dazu führt, dass der Inhalt abgeschnitten +wird. Für Platzhalter die nur Zahlen enthalten wird der Wert durch eine +passende Zehnerpotenz geteilt und mit dem zugehörigen SI\-Suffix versehen, +z.B. wird bei einer Breite von vier aus 54321 dann "54 k". Wenn das nicht +gewünscht ist muss die Breite angegeben werden, z.B. '\fB%6n\fP'. Hier ist eine +Ãœbersicht der Voreinstellungen: +.PP +.in +.3i +.nf +.ta \w'Platzhalter 'u +\w'Breite'u +Platzhalter Breite +\fB%I\fP 3 +\fB%L\fP 4 +\fB%M\fP 10 +\fB%R\fP 3 +\fB%S\fP 6 +\fB%U\fP 5 +\fB%n\fP 4 +.fi +.in -.3i +.PP +Wird bei '\fB%D\fP' keine Länge angegeben, so wird die Länge anhand der +Formatanweisung für das Datum und dem aktuellen Tag bestimmt. Sind in der +Formatanweisung volle Wochentags\- oder Monatsnamen enthalten, kann es +vorkommen, dass das Datum anderer Artikel länger als ermittelt ist. In +diesem Fall wird das Datum abgeschnitten dargestellt. Das tritt z. B. auf, +wenn der aktuelle Monat Mai ist und der Artikel, zu dem das Datum angezeigt +werden soll, im Dezember gepostet wurde. In solchen Fällen ist es sinnvoll, +die maximale Länge manuell zu ermitteln und in die Formatanweisung +einzutragen. +.PP +Sind in der Formatanweisung '\fB%F\fP' und '\fB%s\fP' bzw. '\fB%T\fP' enthalten und +jeweils keine Längen angegeben, dann nimmt '\fB%F\fP' ein Drittel und '\fB%s\fP' +bzw. '\fB%T\fP' zwei Drittel des für beide zusammen verfügbaren Platzes ein. +.PP +Weiterhin kann eine Mindestbildschirmbreite definiert werden. Das +entsprechende Element wird dann erst dargestellt, wenn auf dem Bildschirm +mehr Zeichen als angegeben dargestellt werden können. Das ist hilfreich, um +die Anzeige bei kleineren Bildschirmen oder Terminalfenstern nicht zu +überfrachten. Hier erfolgt die Angabe vor dem den Platzhalter +charakterisierenden Buchstaben durch eine positive Zahl, welcher ein +\&'\fB>\fP' vorangestellt wird. Soll z. B. der Score erst ab einer +Bildschirmbreite größer 100 Zeichen angezeigt werden, lautet die +Formatanweisung '\fB%>100S\fP'. +.PP +.\" +.\" +Wenn eine Längenangabe und eine Mindestbildschirmbreite angegeben werden +soll, muss zuerst die Länge und danach die Mindestbreite in der +Formatanweisung stehen. Um den Score 10 Zeichen breit und erst ab einer +Bildschirmbreite über 100 Zeichen darzustellen, lautet die Anweisung +\&'\fB%10>100S\fP'. .SS "TIPS UND TRICKS" \fBtin\fP can be pretty much be navigated by using the four cursor keys. The left arrow key goes up a level, the right arrow key goes down a level, the up arrow key goes up a line and the down arrow key goes down a line. .PP -In den folgenden Newsgruppen finden sich nützliche Informationen über +In den folgenden Newsgruppen finden sich nützliche Informationen über Newssoftware: .in +.5i .ti -\w'\(em'u -\(emde.comm.software.newsreader (Informationen über Newsrader wie tin, slrn, +\(emde.comm.software.newsreader (Informationen über Newsrader wie tin, slrn, \&...) .ti -\w'\(em'u -\(emnews.software.nntp (Informationen über NNTP) +\(emnews.software.nntp (Informationen über NNTP) .ti -\w'\(em'u \(emnews.answers (Frequently Asked Questions (FAQ) about many different themes) .PP Many prompts within \fBtin\fP offer a default choice that the cursor is -positioned on. By pressing '\fB\fP' the default value is taken. +positioned on. By pressing '\fB\fP' the default value is taken. Most prompts can be aborted by pressing '\fB\fP'. .PP -When \fBtin\fP is run in an \fBxterm\fP(1x) it will resize itself each time the -\fBxterm\fP(1x) is resized. +When \fBtin\fP is run in an \fB\%xterm\fP(1x) it will resize itself each time the +\fB\%xterm\fP(1x) is resized. .PP \fBtin\fP will reread the \fI${TIN_LIBDIR:\-NEWSLIBDIR}"/"${TIN_ACTIVEFILE:\-active}\fP file at set @@ -2765,21 +2962,21 @@ intervals (\fBreread_active_file_secs\fP If you find large number of new newsgroups cluttering up your screen, pressing \fBSelectToggleReadDisplay\fP ('\fBr\fP') will make them go away. .SS "XTERM BUTTONS" -If the environment variable \fB$TERM\fP is set to \fBxterm\fP(1x), then button -pressing can be used to select groups and articles. In this discussion, the -buttons are assumed to be assigned conventionally (i.e., Button1 is the left -button). +Falls die Umgebungsvariable \fB$TERM\fP auf \fB\%xterm\fP(1x) gesetzt ist können +die Maustasten benutzt werden um Gruppen oder Artikel auszuwählen. Es wird +davon ausgegangen, dass die Maustasten normal zugeteilt sind (Maustaste1 ist +die linke Maustaste). .PP In general (i.e., for the group, thread and article menus), .TP 10 -Button1 (left) +Maustaste1 (Links) enters next (lower) level if you click on an article, otherwise pages down. .TP -Button2 (center) +Maustaste2 (Mitte) returns to the previous (upper) level if you click on an article, otherwise pages up. .TP -Button3 (right) +Maustaste3 (Rechts) positions on the article line under mouse cursor, or pages down if you've clicked outside the list of articles. .PP @@ -2826,16 +3023,16 @@ moves to the article pointed at. .\" .\" In other menus and areas button pressing reverts back to usual cut and paste -of \fBxterm\fP(1x), but after one click of any button. +of \fB\%xterm\fP(1x), but after one click of any button. .SS "INDEX DATEIEN" -If your news server supports NOV index files (see \fBnewsoverview\fP(5), most +If your news server supports NOV index files (see \fB\%newsoverview\fP(5), most modern installations will) and you have a fast connection to your news server then this section can be ignored. .PP If your news server doesn't support NOV index files or you have a very slow connection to your news server then \fBtin\fP can cache the index for each newsgroup if \fBcache_overview_files\fP is set to ON. Note that this cache can -use up large amounts of diskspace if you read a lot of groups and/or high +use up large amounts of disk space if you read a lot of groups and/or high traffic groups. .PP Each user creates/updates his/her own index files that are stored in @@ -2854,7 +3051,7 @@ updating of the index file and will be m need to be cached. .PP As indexing might take some time you may want to run \fBtin\fP form the system -batcher \fBcron\fP(1) with the \*(rq\fB\-u\fP\*(rq option: +batcher \fB\%cron\fP(1) with the \*(rq\fB\-u\fP\*(rq option: .PP .RS .nf @@ -2862,9 +3059,8 @@ batcher \fBcron\fP(1) with the \*(rq\fB .fi .RE .PP -If you are low on local disk space you should consider using \fBgetart_limit\fP -to limit the size of cached indexes and also manually purge cached data for -groups you are not reading anymore with something like: +If you are low on local disk space you should consider to manually purge +cached data for groups you are not reading anymore with something like: .PP .RS .nf @@ -2877,6 +3073,7 @@ groups you are not reading anymore with .SH DATEIEN .\" TODO: mention dead.article, dead.articles .\" .article[.$$], .cancel[.$$], .letter[.$$]? +.\" ${XDG_RUNTIME_DIR:\-"$HOME"}/.slrnfaces .\" $PWD/trace[.out] (--with-trace) .\" $TMPDIR/NNTP (-D 1) .\" $TMPDIR/FILTER (-D 2) @@ -2889,11 +3086,11 @@ groups you are not reading anymore with .\" $TMPDIR/SCOPES-R (-D 32) .\" $TMPDIR/SCOPES-W (-D 32) .\" $TMPDIR/ACTIVE (-D 64) -Für eine ausführlich Beschreibung siehe \fBtin\fP(5). +Für eine ausführlich Beschreibung siehe \fB\%tin\fP(5). .PP \fI$MAILCAPS\fP .br -\fI${TIN_HOMEDIR:\-"$HOME"}/.mailcap\fP +\fI~/.mailcap\fP .br \fI/etc/mailcap\fP .br @@ -3029,19 +3226,8 @@ Für eine ausführlich Beschreibung siehe .\" .\" .SH UMGEBUNGSVARIABLEN -.\" TODO: sort in a useful order, add undocumented env-vars like: -.\" -.\" .TP -.\" .B SHELL (Unix) -.\" The pathname of the user's login shell. -.\" -.\" used in xface support -.\" .TP -.\" .B DISPLAY -.\" .TP -.\" .B WINDOWID -.\" -.\" +.\" TODO: - sort in a useful order +.\" - add undocumented env-vars (if any) .TP \fBTINRC\fP Define this variable if you want to specify command\-line options that \fBtin\fP @@ -3086,6 +3272,11 @@ Define this variable if you want to over compiled into the \fBtin\fP binary, default is \fBSPOOLDIR\fP (see above). If tin is running in NNTP mode setting this variable has no effect. .TP +\fBTIN_NOVFILENAME\fP +Define this variable if you want to override the \fBOVERVIEW_FILE\fP file name +that was compiled into the \fBtin\fP binary, default is \fI.overview\fP. If tin is +running in NNTP mode setting this variable has no effect. +.TP \fBTIN_ACTIVEFILE\fP Define this variable if you want to override the \fBNEWSLIBDIR/active\fP path that was compiled into the \fBtin\fP binary. If tin is running in NNTP mode @@ -3109,27 +3300,33 @@ variable instead of the system default. .TP \fBISO2ASC\fP Set the ISO to ASCII charset decoding table character to use in decoding an -article text. Values can range from 0 to 6. +article text. Values can range from \-1 to 6. .RS +.5i .TP +\fB\-1\fP +Keine Umformung +.TP \fB0\fP -universal table for many languages +Universal\-Tabelle für viele Sprachen .TP \fB1\fP single\-spacing universal table .TP \fB2\fP -table for Danish, Dutch, German, Norwegian and Swedish +Tabelle für Dänisch, Niederländisch, Deutsch, Norwegisch und Schwedisch .TP \fB3\fP table for Danish, Finnish, Norwegian and Swedish using the appropriate ISO 646 variant .TP \fB4\fP -table with RFC 1345 codes in brackets +table with \fBRFC\%1345\fP codes in brackets .TP \fB5\fP table for printers that allow overstriking with backspace +.TP +\fB6\fP +table for IBM PC character set (code page 437) .RE .TP \fBORGANIZATION\fP @@ -3139,7 +3336,8 @@ DomainOS machine the environment variabl of $\fBORGANIZATION\fP. .TP \fBNEWSORG (DomainOS)\fP -DomainOS specific, same as $\fBORGANIZATION\fP on other OSs (see above). +DomainOS spezifisch, wie $\fBORGANISATION\fP auf anderen Betriebssystemen +(siehe oben). .TP \fBREPLYTO\fP Set the article header field \*(rqReply\-To:\*(rq to the return address specified @@ -3155,7 +3353,7 @@ Same as $\fBNAME\fP. .TP \fBHOME\fP Das Anmeldeverzeichnis des Benutzers. Weitere Informationen finden sich in -\fBenviron\fP(5). +\fB\%environ\fP(5). .TP \fBMAILER\fP This variable has precedence over the default mailer that is used in all @@ -3165,16 +3363,16 @@ mailing operations within \fBtin\fP. Full path to the user's mailbox. .TP \fBVISUAL\fP -This variable has precedence over the default editor (i.e., \fBvi\fP(1)) that -is used in all editing operations within \fBtin\fP (e.g., posting, replying, -follow\-ups, ...). Evaluation order is \fI${VISUAL:\-"${EDITOR:\-vi}"}\fP. See -\fBenviron\fP(5) for more info. +This variable has precedence over the default editor (i.e., \fB\%vi\fP(1)) +that is used in all editing operations within \fBtin\fP (e.g., posting, +replying, follow\-ups, ...). Evaluation order is +\fI${VISUAL:\-"${EDITOR:\-vi}"}\fP. See \fB\%environ\fP(5) for more info. .TP \fBEDITOR\fP If $\fBVISUAL\fP is unset, then this variable is looked up for a default editor. If $\fBEDITOR\fP and $\fBVISUAL\fP are both unset, \fBtin\fP uses the systems -default editor (i.e. \fBvi\fP(1)) on UNIX\-systems). See \fBenviron\fP(5) for -more info. +default editor (i.e. \fB\%vi\fP(1)) on UNIX\-systems). See \fB\%environ\fP(5) +for more info. .TP \fBAUTOSUBSCRIBE\fP A new group is checked against the list of patterns; if it matches, \fBtin\fP @@ -3204,70 +3402,70 @@ A pathname of a directory made available files. .TP \fBMAILCAPS\fP -This variable can be used to override the default path search for mailcap -files. See also \fBtin\fP(5). +This variable can be used to override the default path search for +\fB\%mailcap\fP(5) files. See also \fB\%tin\fP(5). .TP \fBNOMETAMAIL\fP -Set this variable to disable the use of \fBmetamail\fP(1) or a replacement +Set this variable to disable the use of \fB\%metamail\fP(1) or a replacement (e.g. metamutt). .TP \fBMM_CHARSET\fP .TP \fBISPELL\fP -Set this variable to point to \fBispell\fP(1) or a replacement and its +Set this variable to point to \fB\%ispell\fP(1) or a replacement and its cmd\-line options. .TP \fBPGPOPTS\fP -Define any additional options that you wish to pass to your \fBpgp\fP(1) or -\fBgpg\fP(1) program. +Define any additional options that you wish to pass to your \fB\%pgp\fP(1) or +\fB\%gpg\fP(1) program. .TP \fBPGPPATH\fP -Override the name of the \fBpgp\fP(1) directory in \fB$HOME\fP that holds your +Override the name of the \fB\%pgp\fP(1) directory in \fB$HOME\fP that holds your keys etc.. .TP \fBGNUPGHOME\fP -Override the name of the \fBgpg\fP(1) directory in \fB$HOME\fP that holds your +Override the name of the \fB\%gpg\fP(1) directory in \fB$HOME\fP that holds your keys etc.. .TP \fBLC_CTYPE\fP .\" TODO: document LC_CTYPEs influence on .\" ~/.tin/keymap.*, 8bit char display, ... -This variable determines the \fBlocale\fP(5) category for character handling +This variable determines the \fB\%locale\fP(5) category for character handling functions. Usually it determines the character classes for pattern matching character classification and case conversion. Currently this is not true for \fBtin\fP (which temporary unsets \fB$LC_CTYPE\fP right before any match is done to avoid confusion). It's value should be of the form -\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP][\fI@modifier\fP]. See \fBenviron\fP(5) +\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP][\fI@modifier\fP]. See \fB\%environ\fP(5) for more information. .TP \fBLC_MESSAGES\fP -Formats of informative and diagnostic messages and interactive responses. +Formats of informative and diagnostic messages and interactive responses. It's value should be of the form -\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP][\fI@modifier\fP]. See \fBlocale\fP(5) and -\fBenviron\fP(5) for more information. +\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP][\fI@modifier\fP]. See \fB\%locale\fP(5) +and \fB\%environ\fP(5) for more information. .TP \fBLC_TIME\fP Date and time formats. It's value should be of the form -\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP][\fI@modifier\fP]. See \fBlocale\fP(5) and -\fBenviron\fP(5) for more information. +\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP][\fI@modifier\fP]. See \fB\%locale\fP(5) +and \fB\%environ\fP(5) for more information. .TP \fBLC_ALL\fP This variable overrides the value of the \fB$LANG\fP variable and any other \fB$LC_\fP variable. It's value should be of the form -\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP]. See \fBlocale\fP(5) and \fBenviron\fP(5) -for more information. +\fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP]. See \fB\%locale\fP(5) and +\fB\%environ\fP(5) for more information. .TP \fBLANG\fP -This variable determines the \fBlocale\fP(5) category for any category not +This variable determines the \fB\%locale\fP(5) category for any category not specifically selected with a variable starting with \fB$LC_\fP. It's value should be of the form \fIlanguage\fP[\fI_territory\fP][\fI.codeset\fP]. See -\fBenviron\fP(5) for more information. +\fB\%environ\fP(5) for more information. .TP \fBLANGUAGE\fP This variable defines a priority list for translations. Whenever a translation is not available in the language selected via \fB$LC_ALL\fP or \fB$LANG\fP the next language from the list is tried. It's value should be of -the form \fIlanguage:language[:language]\fP. See \fBenviron\fP(5) for more +the form \fIlanguage:language[:language]\fP. See \fB\%environ\fP(5) for more information. .TP \fBCOLUMNS\fP @@ -3291,12 +3489,26 @@ or window. When \fB$LINES\fP is set, any \fB$LINES\fP unless they wish to override the system selection. .TP \fBTERM\fP +Der verwendete Terminaltyp. Weitere Informationen finden sich in +\fB\%environ\fP(5). +.TP +\fBDISPLAY\fP +Display name, pointing to the X server; required for xface. +.TP +\fBWINDOWID\fP +Used for determining terminal's X window id; required for xface. Should be +set by the terminal emulator. +.TP +\fBSHELL\fP +The pathname of the user's login shell. Used to set +\fBdefault_shell_command\fP. +.TP +\fBXDG_RUNTIME_DIR\fP .\" .\" -.\" TODO: add missing, sort useful, document in detail -Der verwendete Terminaltyp. Weitere Informationen finden sich in -\fBenviron\fP(5). +The pathname of the user's dir to put non\-essential runtime files into. .SH SIGNALE +.\" TODO: add missing, sort useful, document in detail \fBtin\fP verarbeitet folgende Signale: .TP \fBSIGHUP\fP @@ -3326,23 +3538,23 @@ readable files in \fB$TMPDIR\fP which ma cleartext. On multiuser\-systems \fB$TMPDIR\fP should be set to a safe location before starting tin in debug mode (e.g. \fBTMPDIR=$HOME tin \-D 1\fP). .SH "KONFORM ZU" -.\" - RFC2045, RFC2047, RFC2980, RFC3977, RFC4643, RFC5322 -.\" RFC5536, RFC5537, RFC6048 or whatever +.\" - RFC\%2045, RFC\%2047, RFC\%2980, RFC\%3977, RFC\%4155, RFC\%4643, +.\" RFC\%5322, RFC\%5536, RFC\%5537, RFC\%6048 or whatever .\" .\" -\fBtin\fP does conform to the Base Definitions volume of IEEE Std 1003.1\-2001, +\fBtin\fP does conform to the Base Definitions volume of IEEE Std 1003.1\-2008, Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax Guidelines). .SH ANMERKUNGEN Regular expression support is provided by the PCRE library package -\fBpcre\fP(3), which is open source software, written by Philip Hazel, and +\fB\%pcre\fP(3), which is open source software, written by Philip Hazel, and copyright by the University of Cambridge, England. .br .\" .\" -ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ -.SH BUGS -\fBCNews\fP NNTPd, \fBnoffle\fP(1) (<= V1.0\-pre5) and \fBNewsCache\fP (<= + +.SH FEHLER +\fBCNews\fP NNTPd, \fB\%noffle\fP(1) (<= V1.0\-pre5) and \fBNewsCache\fP (<= V1.1.91) can't handle pipelined GROUP commands. If you run into trouble with any of the mentioned servers define DISABLE_PIPELINING in include/autoconf.h and recompile. @@ -3356,19 +3568,21 @@ found a bug, please use the \fBBugReport English. Please do NOT enclose a core\-file in your bugreport until we request it. .SH GESCHICHTE +\fBtin\fP basiert auf \fB\%tass\fP(1), einem Newsreader der von Rich Skrenta +entwickelt und dessen Code im März 1991 von ihm in alt.sources +veröffentlicht wurde. Die erste Version von \fBtin\fP wurde am 23. August 1991 +veröffentlicht. \fB\%tass\fP(1) orientiert sich stark an notesfiles, einer +Public Domain Version für UNIX von PLATO Notes, welches 1982 von Ray Essick +und Rob Kolstad an der University of Illinois entstand. Eine Ãœbersicht der +Versionen findet sich unter +.br .\" .\" -\fBtin\fP basiert auf \fBtass\fP(1), einem Newsreader der von Rich Skrenta -entwickelt und dessen Code im März 1991 von ihm in alt.sources -veröffentlicht wurde. Die erste Version von \fBtin\fP wurde am 23. August 1991 -veröffentlicht. \fBtass\fP(1) orientiert sich stark an notesfiles, einer Public -Domain Version für UNIX von PLATO Notes, welches 1982 von Ray Essick und Rob -Kolstad an der University of Illinois entstand. Eine Übersicht der Versionen -findet sich unter . +. .SH DANKSAGUNGEN .PP .IP "Rich Skrenta" -Autor von \fBtass\fP(1) v3.2, der Basis für diesen Newsreader. +Autor von \fB\%tass\fP(1) v3.2, der Basis für diesen Newsreader. .IP "Bill Davidsen" Autor von envarg.c, Umgebungsvariablenleseroutine. .IP "Mike Gleason" @@ -3380,17 +3594,17 @@ Autor von strftime.c, Datumsfromatierung .IP "Rich Salz" author of wildmat.c pattern matching and parsdate.y date parsing routines. .IP "Dave Taylor" -author of curses.c from the \fBelm\fP(1) mailreader. +Autor von curses.c aus dem Mailreader \fB\%elm\fP(1). .IP "Chris Thewalt" -author of getline.c \fBemacs\fP(1) style editing routine. +Autor von getline.c, \fB\%emacs\fP(1)\-artige Eingaberoutine. .IP "Steven Madsen" -for adding \fBpgp\fP(1) (Pretty Good Privacy) support. +für \fB\%pgp\fP(1) (Pretty Good Privacy) Unterstützung. .IP "Philip Hazel " -für \fBpcre\fP(3) (Library für Perl\-kompatible reguläre Ausdrücke). +für \fB\%pcre\fP(3) (Library für Perl\-kompatible reguläre Ausdrücke). .IP "Patrick Powell " .\" .\" -für \fBsnprintf\fP(3) und \fBvsnprintf\fP(3) Fallbacks. +für \fB\%snprintf\fP(3) und \fB\%vsnprintf\fP(3) Fallbacks. .SH AUTOR .TP 1i Iain Lea @@ -3398,21 +3612,23 @@ Iain Lea .\" .SH MAINTAINER .TP 1i -Urs Janßen +Urs Janßen .\" .\" -.SH ÜBERSETZUNG +.SH ÃœBERSETZUNG .TP 1i Erika Mustermann .\" .SH "SIEHE AUCH" -\fBcron\fP(1), \fBelm\fP(1), \fBemacs\fP(1), \fBgpg\fP(1), \fBinews\fP(1), \fBispell\fP(1), -\fBlp\fP(1), \fBlpr\fP(1), \fBmetamail\fP(1), \fBnoffle\fP(1), \fBperl\fP(1), \fBperlre\fP(1), -\fBpgp\fP(1), \fBrn\fP(1), \fBsendmail\fP(1), \fBshar\fP(1), \fBslrnface\fP(1), \fBtass\fP(1), -\fBunshar\fP(1), \fBuudecode\fP(1), \fBvi\fP(1), \fBxterm\fP(1x), \fBiconv\fP(3), -\fBiconv_open\fP(3), \fBnl_langinfo\fP(3), \fBpcre\fP(3), \fBpcrepattern\fP(3), -\fBsnprintf\fP(3), \fBstrftime\fP(3), \fBvsnprintf\fP(3), \fBwildmat\fP(3), -\fBenviron\fP(5), \fBlocale\fP(5), \fBmbox\fP(5), \fBmmdf\fP(5), \fBnewsoverview\fP(5), -\fBtin\fP(5), \fBRFC1524\fP, \fBRFC2045\fP, \fBRFC2046\fP, \fBRFC2047\fP, \fBRFC2048\fP, -\fBRFC2980\fP, \fBRFC3977\fP, \fBRFC4643\fP, \fBRFC5322\fP, \fBRFC5536\fP, \fBRFC5537\fP, -\fBRFC6048\fP +\fB\%cron\fP(1), \fB\%elm\fP(1), \fB\%emacs\fP(1), \fB\%gpg\fP(1), \fB\%inews\fP(1), +\fB\%ispell\fP(1), \fB\%lp\fP(1), \fB\%lpr\fP(1), \fB\%metamail\fP(1), \fB\%noffle\fP(1), +\fB\%perl\fP(1), \fB\%perlre\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%sendmail\fP(1), +\fB\%shar\fP(1), \fB\%slrnface\fP(1), \fB\%tass\fP(1), \fB\%unshar\fP(1), +\fB\%uudecode\fP(1), \fB\%vi\fP(1), \fB\%xterm\fP(1x), \fB\%heapsort\fP(3), +\fB\%iconv\fP(3), \fB\%iconv_open\fP(3), \fB\%nl_langinfo\fP(3), \fB\%pcre\fP(3), +\fB\%pcrepattern\fP(3), \fB\%qsort\fP(3), \fB\%snprintf\fP(3), \fB\%strftime\fP(3), +\fB\%vsnprintf\fP(3), \fB\%wildmat\fP(3), \fB\%environ\fP(5), \fB\%locale\fP(5), +\fB\%mailcap\fP(5), \fB\%mbox\fP(5), \fB\%mmdf\fP(5), \fB\%newsoverview\fP(5), +\fB\%tin\fP(5), \fBRFC\%1345\fP, \fBRFC\%1524\fP, \fBRFC\%2045\fP, \fBRFC\%2046\fP, +\fBRFC\%2047\fP, \fBRFC\%2048\fP, \fBRFC\%2980\fP, \fBRFC\%3977\fP, \fBRFC\%4155\fP, +\fBRFC\%4643\fP, \fBRFC\%5322\fP, \fBRFC\%5536\fP, \fBRFC\%5537\fP, \fBRFC\%6048\fP diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/l10n/de/tin.5 tin-2.2.0/doc/l10n/de/tin.5 --- tin-2.0.1/doc/l10n/de/tin.5 2011-12-24 15:50:12.000000000 +0100 +++ tin-2.2.0/doc/l10n/de/tin.5 2013-12-21 18:15:59.044640952 +0100 @@ -2,7 +2,7 @@ .\" Module : tin.5 .\" Author : U. Janssen .\" Created : 2000-07-10 -.\" Updated : 2011-12-24 +.\" Updated : 2013-12-24 .\" Notes : needs a some work .\" .\" @@ -11,13 +11,13 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 5 "24. December 2011" 2.0.1 "Usenet Newsreader" +.TH tin 5 "24. Dezember 2013" 2.2.0 "Usenet Newsreader" .SH NAME -tin, rtin \- zugehörige Dateien +tin, rtin \- zugehörige Dateien .SH BESCHREIBUNG -Diese Manpage beschreibt die vom Newsreader \fBtin\fP(1) benutzen +Diese Manpage beschreibt die vom Newsreader \fB\%tin\fP(1) benutzen (Konfigurations)\-Dateien und deren Formate. Alle Dateien sollten Unixartige Zeilenenden ('\en' aka LF) haben. @@ -28,6 +28,7 @@ Zeilenenden ('\en' aka LF) haben. .\" ${TIN_HOMEDIR:\-"$HOME"}/.article[.$$] .\" ${TIN_HOMEDIR:\-"$HOME"}/.cancel[.$$] .\" ${TIN_HOMEDIR:\-"$HOME"}/.letter[.$$] +.\" ${XDG_RUNTIME_DIR:\-"$HOME"}/.slrnfaces .\" $PWD/trace[.out] (--with-trace) .\" $TMPDIR/NNTP (-D 1) .\" $TMPDIR/FILTER (-D 2) @@ -43,7 +44,7 @@ Zeilenenden ('\en' aka LF) haben. .PP \fI$MAILCAPS\fP .br -\fI${TIN_HOMEDIR:\-"$HOME"}/.mailcap\fP +\fI~/.mailcap\fP .br \fI/etc/mailcap\fP .br @@ -54,9 +55,9 @@ Zeilenenden ('\en' aka LF) haben. \fI/etc/mail/mailcap\fP .sp .RS -\fBmailcap\fP(4) files as defined in \fBRFC1524\fP. The Mailcap files are read by -\fBtin\fP(1) to determine how to display non\-text messages at the local -site. Any line that starts with "#" is a comment. Blank lines are +\fB\%mailcap\fP(5) files as defined in \fBRFC\%1524\fP. The mailcap files are +read by \fB\%tin\fP(1) to determine how to display non\-text messages at the +local site. Any line that starts with "#" is a comment. Blank lines are ignored. Otherwise, each line defines a single mailcap entry for a single content type. Long lines may be continued by ending them with a backslash character, "\e". @@ -71,7 +72,7 @@ type field may specify a subtype or a wi .sp The "command" field is any UNIX command and is used to specify the interpreter for the given type of message. It will be passed to the shell -via the \fBsystem\fP(3) facility. +via the \fB\%system\fP(3) facility. .sp .\" .\" Two special codes can appear in the viewing command for objects of type @@ -177,9 +178,9 @@ environments where filename extensions a specify that a GIF file being passed to a gif viewer should have a name ending in ".gif" by using "nametemplate=%s.gif" .PP -\fBtin\fP(1) currently only respects the "test", "description", "nametemplate" -and partly the "needsterminal" flags, all other flags are internally -ignored. It also can't handle the "%F" and "%n" expansions yet. +\fB\%tin\fP(1) currently only respects the "test", "description", +"nametemplate" and partly the "needsterminal" flags, all other flags are +internally ignored. It also can't handle the "%F" and "%n" expansions yet. .TP Beispiel: .RS @@ -219,7 +220,7 @@ needsterminal \fI/etc/nntpserver\fP .sp .RS -default NNTP\-server to read news from if not reading from the local spool. +default NNTP\-server to read news from if not reading from the local spool. \&'\fB\-g\fP \fIserver\fP', $\fBNNTPSERVER\fP have higher priority (in that order), the default server given at compile time has lower priority. .RE @@ -228,7 +229,9 @@ the default server given at compile time \fI${TIN_HOMEDIR:\-"$HOME"}/.cancelsecret\fP .sp .RS -secret to be used for canlocks +secret to be used for cancel\-locks if \fB\%tin\fP(1) is build with support for +it. An empty secret file disables the cancel\-lock creation in that +case. This file should be readable only for the user. .RE .PP @@ -248,16 +251,16 @@ mime type / filename extension pairs .RS "\fInntpserver\fP \fIpassword\fP [\fIuser\fP]" pairs for NNTP servers that require authorization. If the password contains a space or a tab it must be enclosed -in doublequotes ("). Usernames must not be enclosed in doublequotes and thus -can't contain spaces or tabs. Any line that starts with "#" is a +in double quotes ("). Usernames must not be enclosed in double quotes and +thus can't contain spaces or tabs. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the user as it contains the user's uncrypted password for reading news! .TP \fBNNTPServer\fP -Vollständiger Name (FQDN) des Newsservers. +Vollständiger Name (FQDN) des Newsservers. .TP \fBPasswort\fP -Unverschlüsseltes Passwort für den Newsserver. +Unverschlüsseltes Passwort für den Newsserver. .TP \fBUser\fP Username auf dem Newsserver falls er vom lokalen Benutzernamen @@ -363,7 +366,7 @@ saved newsgroups index files .sp .RS active file ("\fImail_group_name\fP \fImaxnum\fP \fIminnum\fP \fImailspool\fP" -quadruples) of user's mailgroups (requires \fBtin\fP(1) to be build with +quadruples) of user's mailgroups (requires \fB\%tin\fP(1) to be build with mh\-mail\-handling support). .TP \fBmail_group_name\fP @@ -421,7 +424,7 @@ attributes are available: .TP \fBscope\fP This changes the list of groups to which the attributes that follow will be -applied. See the section NEWSGROUP LISTS & WILDCARDS in \fBtin\fP(1) for the +applied. See the section NEWSGROUP LISTS & WILDCARDS in \fB\%tin\fP(1) for the types of pattern that can be used here. .TP \fBadd_posted_to_filter\fP @@ -450,9 +453,9 @@ Automatically perform the \fBGroupMarkUn entering the group. .TP \fBbatch_save\fP -Can be used to override the global setting in tinrc on a per group -basis. For more information read section AUTOMATIC MAILING AND SAVING NEW -NEWS in \fBtin\fP(1). +Sende ungelesene Artikel an den angegebenen Benutzer um sie später lesen zu +können. Für weitere Informationen siehe den Abschnitt "AUTOMATISCHES MAILEN +UND SPEICHERN VON UNGELESENEN ARTIKELN" in \fB\%tin\fP(1). .TP \fBdate_format\fP Identisch mit der tinrc\-Variable gleichen Namens @@ -479,6 +482,9 @@ Identisch mit der tinrc\-Variable \fBmai \fBgroup_catchup_on_exit\fP Identisch mit der tinrc\-Variable gleichen Namens .TP +\fBgroup_format\fP +Identisch mit der tinrc\-Variable gleichen Namens +.TP \fBmail_8bit_header\fP Identisch mit der tinrc\-Variable gleichen Namens .TP @@ -607,6 +613,9 @@ Identisch mit der tinrc\-Variable gleich \fBthread_catchup_on_exit\fP Identisch mit der tinrc\-Variable gleichen Namens .TP +\fBthread_format\fP +Identisch mit der tinrc\-Variable gleichen Namens +.TP \fBthread_perc\fP Identisch mit der tinrc\-Variable gleichen Namens .TP @@ -665,7 +674,7 @@ Identisch mit der tinrc\-Variable \fBdef Identisch mit der tinrc\-Variable \fBdefault_filter_select_header\fP .TP \fBispell\fP -Path and options for \fBispell\fP(1)\-like spell\-checker, e.g. "aspell +Path and options for \fB\%ispell\fP(1)\-like spell\-checker, e.g. "aspell \-\-mode=email \-\-dont\-backup check" .TP \fBmm_network_charset\fP @@ -674,14 +683,14 @@ Identisch mit der tinrc\-Variable gleich \fBundeclared_charset\fP Assume (broken) articles without MIME charset declaration have this charset \- default is US\-ASCII. This attribute works only on systems with working -\fBiconv\fP(3), others might have to compile \fBtin\fP(1) with +\fB\%iconv\fP(3), others might have to compile \fB\%tin\fP(1) with \-\-disable\-mime\-strict\-charset. .PP .TP Beispiel: .RS .nf -# zusätzliche Header einfügen +# zusätzliche Header einfügen # ISO\-8859\-1 als Zeichensatz annehmen falls keiner angegeben wurde scope=* x_headers=~/.tin/headers @@ -698,17 +707,17 @@ post_process_type=2 delete_tmp_files=ON followup_to=poster -# in fido.* newsgroups change quote_chars -# and add X\-Comment\-To: line +# Anderes quote_chars in fido.* Newsgruppen +# und X\-Comment\-To: Zeile hinzufügen scope=fido.* quote_chars=%s>_ x_comment_to=ON -# in *.test newsgroups, don't append signature -# and preset Subject +# Keine Signatur in *.test Newsgruppen anhängen +# und Subject vorwählen scope=*.test sigfile=\-\-none -x_headers=Subject: test \- ignore \- no reply +x_headers=Subject: Test \- ignore \- no reply # ISO\-2022\-JP\-2 als Zeichensatz annehmen scope=fj.*,japan.* @@ -739,7 +748,7 @@ A comma\-separated list of newsgroup pat the filter rule will be applied. This line is mandatory! .TP \fBcase\fP -0=case\-sensitive, 1=case\-insensitive +0=Groß/Kleinschreibung beachten, 1=Groß/Kleinschreibung ignorieren .TP \fBscore\fP Score value of the rule; can also be one of the magic words "kill" or "hot". @@ -748,10 +757,10 @@ Score value of the rule; can also be one Vergleiche mit \*(rqSubject:\*(rq .TP \fBfrom\fP -Match against \*(rqFrom:\*(rq. \fBtin\fP(1) converts the contents of the \*(rqFrom:\*(rq -header to an old style e\-mail address, e.g. \*(rqsome@body.example (John Doe)\*(rq -instead of \*(rqJohn Doe \*(rq, before trying to match -the patterns in the filter rule. +Match against \*(rqFrom:\*(rq. \fB\%tin\fP(1) converts the contents of the +\&\*(rqFrom:\*(rq header to an old style e\-mail address, e.g. \*(rqsome@body.example +(John Doe)\*(rq instead of \*(rqJohn Doe \*(rq, before +trying to match the patterns in the filter rule. .TP \fBmsgid\fP Match against \*(rqMessage\-ID:\*(rq and full \*(rqReferences:\*(rq @@ -1037,15 +1046,15 @@ defaults. If a keyname is bound to NULL \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/mailgroups\fP .sp .RS -This file provides short descriptions of each mailgroup. (requires \fBtin\fP(1) -to be build with mh\-mail\-handling support). Each line consist of two -tab\-separated fields "\fImailgroupname\fP \fIone\-line description\fP". +This file provides short descriptions of each mailgroup. (requires +\fB\%tin\fP(1) to be build with mh\-mail\-handling support). Each line consist +of two tab\-separated fields "\fImailgroupname\fP \fIone\-line description\fP". .TP \fBmailgroupname\fP ist der Name der Newsgruppe .TP \fBdescription\fP -ist die zugehörige Kurzbeschreibung +ist die zugehörige Kurzbeschreibung .RE .PP @@ -1056,7 +1065,7 @@ ist die zugehörige Kurzbeschreibung \&\*(rq\fB\-g\fP\*(rq command\-line switch. .TP \fBNNTPServer\fP -Vollständiger Name (FQDN) des Newsservers. +Vollständiger Name (FQDN) des Newsservers. .TP \fBnewsrc\fP related newsrc. @@ -1085,7 +1094,7 @@ posting history \fI${TIN_HOMEDIR:\-"$HOME"}/Mail/posted\fP .sp .RS -Copy of all posted articles in \fBmbox\fP(5) format. The filename can be +Copy of all posted articles in \fB\%mbox\fP(5) format. The filename can be changed by setting \fBposted_articles_file\fP. .RE .PP @@ -1093,7 +1102,7 @@ changed by setting \fBposted_articles_fi \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/postponed.articles\fP .sp .RS -Vorrat an zurückgestellten Artikeln. Diese Datei benutzt das \fBmbox\fP(5) +Vorrat an zurückgestellten Artikeln. Diese Datei benutzt das \fB\%mbox\fP(5) Format. .RE .PP @@ -1113,7 +1122,7 @@ copy exists. Each line consist of two ta ist der Name der Newsgruppe .TP \fBKurzbeschreibung\fP -ist die zugehörige Kurzbeschreibung +ist die zugehörige Kurzbeschreibung .RE .PP @@ -1131,8 +1140,8 @@ are not meant to be changed by the user. Interne Versionsnummer. .TP \fBlast_newnews\fP -Internal timestamp used by \fBtin\fP(1) to keep track of new newsgroups on the -server. +Internal timestamp used by \fB\%tin\fP(1) to keep track of new newsgroups on +the server. .RE .PP @@ -1145,13 +1154,13 @@ server. \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP .sp .RS -At startup, \fBtin\fP(1) reads in the configuration file. This contains a list -of "\fIvariable\fP=\fIvalue\fP" pairs that can be used to configure the way -\fBtin\fP(1) works. If it exists, the global configuration file, +At startup, \fB\%tin\fP(1) reads in the configuration file. This contains a +list of "\fIvariable\fP=\fIvalue\fP" pairs that can be used to configure the way +\fB\%tin\fP(1) works. If it exists, the global configuration file, \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fP is read first. After that, the user's own -configuration file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP is read. The -global file is useful for distributing system\-wide defaults to new users who -have no private tinrc yet (see also \fB/etc/tin/tin.defaults\fP). +configuration file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP is read. The global +file is useful for distributing system\-wide defaults to new users who have +no private tinrc yet (see also \fB/etc/tin/tin.defaults\fP). .TP \fBabbreviate_groupname\fP If ON abbreviate long newsgroup names at group selection level and article @@ -1169,7 +1178,7 @@ Turn ON advertising in header (\*(rqUser If ON strip multipart/alternative messages automatically. Default is ON. .TP \fBart_marked_deleted\fP -Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'. +Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'. .TP \fBart_marked_inrange\fP The character used to show that an article is in a range. Default is '#'. @@ -1179,7 +1188,7 @@ The character used to show that an artic when the group is next entered. Default is '\-'. .TP \fBart_marked_selected\fP -The character used to show that an article/thread is auto\-selected (hot). +The character used to show that an article/thread is auto\-selected (hot). Default is '*'. .TP \fBart_marked_recent\fP @@ -1194,15 +1203,15 @@ The character used to show that an artic The character used to show that an article was read. Default is ' '. .TP \fBart_marked_killed\fP -The character used to show that an article was killed. Default is 'K'. +The character used to show that an article was killed. Default is 'K'. \fBkill_level\fP must be set accordingly. .TP \fBart_marked_read_selected\fP -The character used to show that an article was hot before it was read. +The character used to show that an article was hot before it was read. Default is ':'. \fBkill_level\fP must be set accordingly. .TP -\fBStart des MIME\-Viewers bestätigen (ask_for_metamail)\fP -If ON \fBtin\fP(1) will ask before using a MIME viewer (\fBmetamail_prog\fP) to +\fBStart des MIME\-Viewers bestätigen (ask_for_metamail)\fP +If ON \fB\%tin\fP(1) will ask before using a MIME viewer (\fBmetamail_prog\fP) to display MIME messages. This only occurs if a MIME viewer is set. Default is OFF. .TP @@ -1211,7 +1220,7 @@ Automatically put your name in the \*(rq mailing an article. Default is No. .TP \fBauto_list_thread\fP -If ON automatically list thread when entering it using right arrow key. +If ON automatically list thread when entering it using right arrow key. Default is ON. .TP \fBauto_reconnect\fP @@ -1234,7 +1243,7 @@ displayed after composing an article. De .TP \fBcache_overview_files\fP If ON, create local copies of NNTP overview files. This can be used to -considerably speed up accessing large groups when using a slow connection. +considerably speed up accessing large groups when using a slow connection. Default is OFF. .TP \fBcatchup_read_groups\fP @@ -1254,10 +1263,10 @@ Farbe der Artikelheaderzeilen Farbe des Hilfstext .TP \fBcol_invers_bg\fP -Hintergrundfarbe für inversen Text +Hintergrundfarbe für inversen Text .TP \fBcol_invers_fg\fP -Vordergrundfarbe für inversen Text +Vordergrundfarbe für inversen Text .TP \fBcol_markdash\fP Color of words emphasized like _this_. See also \fBword_h_display_marks\fP and @@ -1276,7 +1285,7 @@ Color of words emphasized like \-this\-. \fBword_highlight\fP. .TP \fBcol_minihelp\fP -Farbe des Minihilfemenü +Farbe des Minihilfemenü .TP \fBcol_newsheaders\fP Farbe des angezeigten Headers @@ -1316,7 +1325,7 @@ Farbe der Textzeilen Farbe des Hilfe/Mail\-Zeichens .TP \fBconfirm_choice\fP -\fBtin\fP(1) can ask for manual confirmation to protect the user. Available +\fB\%tin\fP(1) can ask for manual confirmation to protect the user. Available choices: .in +.5i .\" TODO: check if all affected commands are marked [after confirmation] @@ -1324,7 +1333,7 @@ choices: commands (e.g., \fBCatchup\fP ('\fBc\fP')). Commands that this affects are marked in this manual with '[after confirmation]'. .sp -\fBquit:\fP You'll be asked to confirm that you wish to exit \fBtin\fP(1) when +\fBquit:\fP You'll be asked to confirm that you wish to exit \fB\%tin\fP(1) when you use the \fBQuit\fP ('\fBq\fP') command. .sp \fBselect:\fP Ask for confirmation before marking all not selected (with @@ -1334,8 +1343,8 @@ Default is commands & quit. .TP \fBdate_format\fP Format string used for date representation. A description of the different -format options can be found at \fBstrftime\fP(3). \fBtin\fP(1) uses -\fBstrftime\fP(3) when available and supports most format options in his +format options can be found at \fB\%strftime\fP(3). \fB\%tin\fP(1) uses +\fB\%strftime\fP(3) when available and supports most format options in his fallback code. Default is "%a, %d %b %Y %H:%M:%S". .TP \fBdefault_art_search\fP @@ -1364,12 +1373,12 @@ OFF=apply to current group. Default is O Default for quick (1 key) kill filter header. .in +.3i .nf -.ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & last \'\'References:\'\' entry only'u -0 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) -1 \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) -2 \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) -3 \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) -4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge +.ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & letzter \'\'References:\'\' Eintrag'u +0 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) +1 \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) +2 \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) +3 \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) +4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge 5 \*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag 6 \*(rqMessage\-ID:\*(rq allein 7 \*(rqLines:\*(rq @@ -1392,12 +1401,12 @@ groups, OFF=apply to current group. Defa Default for quick (1 key) auto\-selection filter header. .in +.3i .nf -.ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & last \'\'References:\'\' entry only'u -0 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) -1 \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) -2 \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) -3 \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) -4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge +.ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & letzter \'\'References:\'\' Eintrag'u +0 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) +1 \*(rqSubject:\*(rq (Groß/Kleinschreibung ignorieren) +2 \*(rqFrom:\*(rq (Groß/Kleinschreibung beachten) +3 \*(rqFrom:\*(rq (Groß/Kleinschreibung ignorieren) +4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge 5 \*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag 6 \*(rqMessage\-ID:\*(rq allein 7 \*(rqLines:\*(rq @@ -1443,7 +1452,7 @@ Allows groups/articles to be selected by an highlighted bar if set OFF. .TP \fBeditor_format\fP -The format string used to create the editor start command with parameters. +The format string used to create the editor start command with parameters. Default is '%E +%N %F' with %E=Editor, %N=Linenumber and %F=Filename (e.g., /bin/vi +7 .article). .TP @@ -1453,21 +1462,42 @@ external commands. Default is OFF. .TP \fBgetart_limit\fP If \fBgetart_limit\fP is > 0 not more than \fBgetart_limit\fP articles/group -are fetched from the server. If \fBgetart_limit\fP is < 0 \fBtin\fP(1) will +are fetched from the server. If \fBgetart_limit\fP is < 0 \fB\%tin\fP(1) will start fetching articles from your first unread minus absolute value of \fBgetart_limit\fP. Default is 0, which means no limit. .TP \fBgoto_next_unread\fP -Which keys \fBtin\fP should accept to jump to the next unread article. +Which keys \fBtin\fP should accept to jump to the next unread article. Possible is any combination of \fBPageDown\fP and \fBPageNextUnread\fP. When \fBPageDown\fP is set \fBtin\fP jumps to the next article at the end of the current one. When \fBPageNextUnread\fP is set \fBtin\fP jumps immediately to the next article when \fBPageNextUnread\fP ('\fB\fP') is -pressed. Default is PageNextUnread. +pressed. Default is \fBPageNextUnread\fP. .TP \fBgroup_catchup_on_exit\fP If ON catchup group when leaving with the left arrow key. Default is ON. .TP +\fBgroup_format\fP +Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Gruppenebene +benutzt. Voreingestellt ist "%n\ %m\ %R\ %L\ \ %s\ \ %F". Folgende +Ersetzungen werden unterstützt: +.in +.3i +.nf +.ta \w'%G 'u +\w'Absender, Name und/oder E\-Mail Adresse'u +%D Datum +%F Absender, Name und/oder E\-Mail Adresse +%I Initialen des Absenders +%L Anzahl der Zeilen +%M Message\-ID +%R Anzahl der Antworten im Thread +%S Score +%m Artikelkennzeichnungen +%n aktuelle Threadnummer +%s Subject +%% % +.fi +.in -.3i +.TP \fBgroupname_max_length\fP Maximum length of the names of newsgroups to be displayed so that more of the newsgroup description can be displayed. Default is 32. @@ -1482,8 +1512,8 @@ article but can also lead to false posit toggled in the article viewer. Default is 'No'. .TP \fBinews_prog\fP -Path, name and options of external \fBinews\fP(1). If you are reading via NNTP -the default value is "\-\-internal" (use built\-in NNTP inews), else it is +Path, name and options of external \fB\%inews\fP(1). If you are reading via +NNTP the default value is "\-\-internal" (use built\-in NNTP inews), else it is "inews \-h". The article is passed to \fBinews_prog\fP on STDIN via '< article'. .TP @@ -1513,7 +1543,7 @@ This option controls the processing and killed. There are 3 options, default is 0 (\fBKill only unread arts\fP). .RS +1i .IP 0 3 -\fBKill only unread arts\fP is the 'traditional' behavior of \fBtin\fP(1). Only +\fBKill only unread arts\fP is the 'traditional' behavior of \fB\%tin\fP(1). Only unread articles are killed once only by marking them read. As filtering only happens on unread articles with \fBkill_level\fP set to 0, \fBart_marked_killed\fP and \fBart_marked_read_selected\fP are only shown once. When you reenter the @@ -1533,31 +1563,32 @@ articles simply does not get displayed a Allows 8bit characters unencoded in the header of mail message. Default is OFF. Turning it ON is effective only if \fBmail_mime_encoding\fP is also set to 8bit. Leaving it OFF is safe for most users and compliant to Internet Mail -Standard (\fBRFC5322\fP and \fBRFC2047\fP). Default is OFF. +Standard (\fBRFC\%5322\fP and \fBRFC\%2047\fP). Default is OFF. .TP \fBmail_address\fP User's mail address (and full name), if not username@host. This is used when -creating articles, sending mail and when \fBpgp\fP(1) signing. +creating articles, sending mail and when \fB\%pgp\fP(1) signing. .TP \fBmail_mime_encoding\fP MIME encoding of the body in mail message, if necessary (8bit, base64, quoted\-printable, 7bit). Default is quoted\-printable. .TP \fBmail_quote_format\fP -Format of quote line when replying (via mail) to an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, -%C=Firstname, %I=Initials). Default is "In article %M you wrote:" +Format der Einleitungszeile für Mailantworten (%A=Mailadresse, %D=Datum, +%F=Name und Adresse, %G=Name der Gruppe, %M=Message\-ID, %N=Name des Autors, +%C=Vorname des Autors, %I=Initialen des Autor). Voreinstellung ist "In +article %M you wrote:". .TP \fBmailbox_format\fP Select one of the following mailbox\-formats: MBOXO (default, except on SCO), -MBOXRD or MMDF (default on SCO). See \fBmbox\fP(5) for more details on MBOXO -and MBOXRD and \fBmmdf\fP(5) for more details about MMDF. +MBOXRD or MMDF (default on SCO). See \fB\%mbox\fP(5) and \fBRFC\%4155\fP for more +details on MBOXO and MBOXRD and \fB\%mmdf\fP(5) for more details about MMDF. .TP \fBmaildir\fP -The directory where articles/threads are to be saved in \fBmbox\fP(5) -format. This feature is mainly for use with the \fBelm\fP(1) mail program. It -allows the user to save articles/threads/groups simply by giving '=' as the -filename to save to. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. +The directory where articles/threads are to be saved in \fB\%mbox\fP(5) +format. This feature is mainly for use with the \fB\%elm\fP(1) mail +program. It allows the user to save articles/threads/groups simply by giving +\&'=' as the filename to save to. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. .TP \fBmailer_format\fP The format string used to create the mailer command with parameters that is @@ -1572,10 +1603,10 @@ claws\-mail \-\-compose "mailto:%T?subje .fi .in -.3i \fBinteractive_mailer\fP muss passend dazu gesetzt sein. Folgende Ersetzungen -werden unterstützt: +werden unterstützt: .in +.3i .nf -.ta \w'%S'u +\w'subject\-field'u +.ta \w'%S'u +\w'Subject\-Feld'u %F Dateiname %M default_mailer %S Subject\-Feld @@ -1597,9 +1628,9 @@ presents a menu with choices of the curr unread articles, or nothing. .TP \fBmetamail_prog\fP -Path, name and options of external \fBmetamail\fP(1) program used to view +Path, name and options of external \fB\%metamail\fP(1) program used to view non\-textual parts of articles. To use the built\-in viewer, set to -\-\-internal. This is the default value when \fBmetamail\fP(1) is not +\-\-internal. This is the default value when \fB\%metamail\fP(1) is not installed. Leave it blank if you don't want any automatic viewing of non\-textual attachments. The 'V' command can always be used to manually view any attachments. See also \fBask_for_metamail\fP. @@ -1612,13 +1643,13 @@ than the value of this parameter is cons represented as '?'. Otherwise, all character sets are regarded as compatible with the display. If it's not set, the value of the environment variable $\fBMM_CHARSET\fP is used. US\-ASCII or compile\-time default is used in case -neither of them is defined. If your system supports \fBiconv\fP(3), this option -is disabled and you should use \fBmm_network_charset\fP instead. +neither of them is defined. If your system supports \fB\%iconv\fP(3), this +option is disabled and you should use \fBmm_network_charset\fP instead. .TP \fBmm_network_charset\fP -Charset used for posting and MIME headers; replaces \fBmm_charset\fP. +Charset used for posting and MIME headers; replaces \fBmm_charset\fP. Conversion between \fBmm_network_charset\fP and local charset (determined via -\fBnl_langinfo\fP(3)) is done via \fBiconv\fP(3), if this function is not +\fB\%nl_langinfo\fP(3)) is done via \fB\%iconv\fP(3), if this function is not available on your system this option is disabled and you have to use \fBmm_charset\fP instead. \fBmm_network_charset\fP is limited to one of the following charsets: @@ -1626,7 +1657,7 @@ following charsets: US\-ASCII, ISO\-8859\-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8\-{R,U,RU} EUC\-{CN,JP,KR,TW}, ISO\-2022\-{CN,CN\-EXT,JP,JP\-1,JP\-2}, Big5, UTF\-8 .in -.3i -Not all values might work on your system, see \fBiconv_open\fP(3) for more +Not all values might work on your system, see \fB\%iconv_open\fP(3) for more details. If it's not set, the value of the environment variable $\fBMM_CHARSET\fP is used. US\-ASCII or compile\-time default is used in case neither of them is defined. @@ -1652,7 +1683,7 @@ terminal which attributes are usable. Se \fBword_highlight\fP. .TP \fBnewnews\fP -These are internal timers used by \fBtin\fP(1) to keep track of new +These are internal timers used by \fB\%tin\fP(1) to keep track of new newsgroups. Do not change them unless you understand what they are for. .TP \fBnews_headers_to_display\fP @@ -1671,9 +1702,13 @@ would do something like this: \fBnews_he this option. .TP \fBnews_quote_format\fP -Format of quote line when posting/following up an article (%A=Address, -%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message\-ID, %N=Fullname, -%C=Firstname, %I=Initials). Default is "%F wrote:". +Format der Einleitungszeile für Newsartikel (%A=Mailadresse, %D=Datum, +%F=Name und Adresse, %G=Name der Gruppe, %M=Message\-ID, %N=Name des Autors, +%C=Vorname des Autors, %I=Initialen des Autor). Voreinstellung ist "%F +wrote:". +.TP +\fBnntp_read_timeout_secs\fP +Time in seconds to wait for a response from the server. Default is 120. .TP \fBnormalization_form\fP The normalization form which should be used to normalize unicode input. The @@ -1691,7 +1726,8 @@ possible values are: \fBNFD\fP: Canonical Decomposition .RE Some normalization modes are only available if they are supported by the -library \fBtin\fP(1) uses to do the normalization. Default is NFKC. +library \fB\%tin\fP(1) uses to do the normalization. NFC should be used if +possible. .TP \fBpos_first_unread\fP If ON put cursor at first unread article in group otherwise at last @@ -1709,16 +1745,16 @@ local hierarchy of your interest to dete .TP \fBpost_mime_encoding\fP MIME encoding of the body in news message, if necessary. (8bit, base64, -quoted\-printable, 7bit). Default is 8bit, which leads to no encoding. +quoted\-printable, 7bit). Default is 8bit, which leads to no encoding. base64 and quoted\-printable are usually undesired on usenet. .TP \fBpost_process_view\fP -If ON, then \fBtin\fP(1) will start an appropriate viewer program to display +If ON, then \fB\%tin\fP(1) will start an appropriate viewer program to display any files that were post processed and uudecoded. The program is determined -using the mailcap file. Default is ON. +using the \fB\%mailcap\fP(5) file. Default is ON. .TP \fBpost_process_type\fP -This specifies whether to perform post processing on saved articles. +This specifies whether to perform post processing on saved articles. Because the shell archive may contain commands you may not want to be executed, be careful when extracting shell archives. The following values are allowed: @@ -1726,7 +1762,7 @@ are allowed: .IP 0 3 \fBNo\fP (default), no post processing is done. .IP 1 -\fBShell archives\fP, unpacking of multi\-part \fBshar\fP(1) files only. Because +\fBShell archives\fP, unpacking of multi\-part \fB\%shar\fP(1) files only. Because the shell archive may contain commands you may not want to be executed, be careful with this option. .IP 2 @@ -1744,12 +1780,12 @@ the \*(rqSubject:\*(rq and \*(rqFrom:\*( .TP \fBprinter\fP The printer program with options that is to be used to print articles. The -default is \fBlpr\fP(1) for BSD machines and \fBlp\fP(1) for SysV -machines. Printing from \fBtin\fP(1) may have been disabled by the System +default is \fB\%lpr\fP(1) for BSD machines and \fB\%lp\fP(1) for SysV +machines. Printing from \fB\%tin\fP(1) may have been disabled by the System Administrator. .TP \fBprocess_only_unread\fP -If ON only save/print/pipe/mail unread articles (tagged articles excepted). +If ON only save/print/pipe/mail unread articles (tagged articles excepted). Default is OFF. .TP \fBprompt_followupto\fP @@ -1778,23 +1814,23 @@ quoted regardless of this option when yo \fBPageToggleRaw\fP ('\fB^H\fP') and followup or reply to it. Signatures are never quoted regardless of this option when \fBshow_signatures\fP is off. .IP 4 -\fBLeerzeilen zitieren\fP Diese Option ist standardmäßig aktiviert. +\fBLeerzeilen zitieren\fP Diese Option ist standardmäßig aktiviert. .RE .TP \fBquote_regex\fP A regular expression that will be applied when reading articles. All matching lines are shown in \fBcol_quote\fP. If \fBquote_regex\fP is blank, then -\fBtin\fP(1) uses a built\-in default. +\fB\%tin\fP(1) uses a built\-in default. .TP \fBquote_regex2\fP A regular expression that will be applied when reading articles. All matching lines are shown in \fBcol_quote2\fP. If \fBquote_regex2\fP is blank, then -\fBtin\fP(1) uses a built\-in default. +\fB\%tin\fP(1) uses a built\-in default. .TP \fBquote_regex3\fP A regular expression that will be applied when reading articles. All matching lines are shown in \fBcol_quote3\fP. If \fBquote_regex3\fP is blank, then -\fBtin\fP(1) uses a built\-in default. +\fB\%tin\fP(1) uses a built\-in default. .TP \fBrecent_time\fP If set to 0, this feature is deactivated, otherwise it means the number of @@ -1837,6 +1873,32 @@ where the top/bottom line is carried ove supersedes show_last_line_prev_page=ON. Set to \-2 to get half\-page scrolling. This setting supersedes full_page_scroll=OFF. .TP +\fBselect_format\fP +Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Auswahlebene +benutzt. Voreingestellt ist "%f\ %n\ %U\ \ %G\ \ %d". Folgende Ersetzungen +werden unterstützt: +.in +.3i +.nf +.ta \w'%G 'u +\w'Anzahl ungelesener Artikel'u +%G Name der Gruppe +%U Anzahl ungelesener Artikel +%d Gruppenbeschreibung +%f Gruppenkennzeichnung +%n aktuelle Gruppennummer +%% % +.fi +.in -.3i +.TP +\fBsort_function\fP +Sortierfunktion für Artikel. Standard ist 0. +.RS +.5i +.IP 0 3 +Mit \fB\%qsort\fP(3) sortieren. +.IP 1 +Mit \fB\%heapsort\fP(3) sortieren. Kann in großen Gruppen mit langen Threads +schneller sein. +.RE +.TP \fBshow_author\fP Which information about the author should be shown. Default is 2, authors full name. @@ -1859,7 +1921,7 @@ If ON show a short group description tex selection level. The \*(rq\fB\-d\fP\*(rq command\-line flag will override the setting and turn descriptions off. The text used is taken from the \fI${TIN_LIBDIR:\-NEWSLIBDIR}/newsgroups\fP file and if supported (requires -\fBtin\fP(1) to be build with mh\-mail\-handling support) from +\fB\%tin\fP(1) to be build with mh\-mail\-handling support) from \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/mailgroups\fP for mailgroups. Default is ON. .TP \fBshow_info\fP @@ -1877,7 +1939,7 @@ displayed. in thread listing the score of the thread will be displayed \- see also \fBthread_score\fP. .IP 3 -\fBZeilen und Bewertung\fP, Zeilenzahl und Bewertung zusätzlich anzeigen. +\fBZeilen und Bewertung\fP, Zeilenzahl und Bewertung zusätzlich anzeigen. .RE .TP \fBshow_only_unread_arts\fP @@ -1899,7 +1961,7 @@ The path that specifies the signature fi to or replying to an article. If the path is a directory then the signature will be randomly generated from files that are in the specified directory. If the path starts with a ! the program the path points to will -be executed to generate a signature. \fBtin\fP(1) will pass the name of the +be executed to generate a signature. \fB\%tin\fP(1) will pass the name of the current newsgroup as argument to the program. \-\-none will suppress any signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. .TP @@ -1909,14 +1971,14 @@ If ON add signature to reposted articles \fBslashes_regex\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markslash\fP or \fBmono_markslash\fP. If -\fBslashes_regex\fP is blank, then \fBtin\fP(1) uses a built\-in default. +\fBslashes_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. .TP \fBsort_article_type\fP This specifies how articles should be sorted. Sort by ascending Date (6) is the default. The following sort types are allowed: .RS +1i .IP 0 3 -\fBNothing\fP, don't sort articles. +\fBNichts\fP, keine Sortierung. .IP 1 \fBSubject: (absteigend)\fP, Artikel absteigend nach \*(rqSubject:\*(rq sortieren. .IP 2 @@ -1965,7 +2027,7 @@ these strings. The matching is case\-ins \fBstars_regex\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstar\fP or \fBmono_markstar\fP. If -\fBstars_regex\fP is blank, then \fBtin\fP(1) uses a built\-in default. +\fBstars_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. .TP \fBstart_editor_offset\fP Set ON if the editor used for posting, follow\-ups and bug reports has the @@ -1979,7 +2041,7 @@ display when reading on a slow terminal \fBstrip_bogus\fP Bogus groups are groups that are present in your \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP file that no longer exist on the news -server. There are 3 options. 0 means do nothing & always keep bogus groups. +server. There are 3 options. 0 means do nothing & always keep bogus groups. 1 means bogus groups will be permanently removed. 2 means that bogus groups will appear on the Group Selection Menu, prefixed with a 'D'. This allows you to unsubscribe from them as and when you wish. Default is 0 (Always @@ -1992,7 +2054,7 @@ If ON, then unsubscribed groups will be \fBstrokes_regex\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markstroke\fP or \fBmono_markstroke\fP. If -\fBstrokes_regex\fP is blank, then \fBtin\fP(1) uses a built\-in default. +\fBstrokes_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. .TP \fBtex2iso_conv\fP Decode German style TeX umlaut codes to ISO If ON, show "a as Umlaut\-a, @@ -2008,6 +2070,26 @@ type on a per group basis by setting the \fBthread_articles\fP to 0 \- 5 in the file \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/attributes\fP. .TP +\fBthread_format\fP +Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Threadebene +benutzt. Voreingestellt ist "%n\ %m\ \ [%L]\ \ %T\ \ %F". Folgende +Ersetzungen werden unterstützt: +.in +.3i +.nf +.ta \w'%G 'u +\w'Subject und/oder Baumdarstellung des Thread'u +%D Datum +%F Absender, Name und/oder E\-Mail Adresse +%I Initialen des Absenders +%L Anzahl der Zeilen +%M Message\-ID +%S Score +%T Subject und/oder Baumdarstellung des Thread +%m Artikelkennzeichnungen +%n aktuelle Artikelnummer +%% % +.fi +.in -.3i +.TP \fBthread_perc\fP Defines how close the subjects must match while threading by Percentage Match for threads to be considered part of a single thread. This value is in @@ -2022,30 +2104,30 @@ How the total score of a thread is compu in this thread. .RS +1i .IP 0 3 -\fBMax\fP, the maximum score in this thread. +\fBMax\fP, Maximalwert im Diskussionsfaden. .IP 1 -\fBSum\fP, the sum of all scores in this thread. +\fBSum\fP, Summer aller Bewertungen im Diskussionsfaden. .IP 2 -\fBAverage\fP, the average score in this thread. +\fBAverage\fP, Durchschnitt aller Bewertungen im Diskussionsfaden. .RE .TP \fBtranslit\fP -If ON append //TRANSLIT to the first argument of \fBiconv_open\fP(3) to enable -transliteration. This means that when a character cannot be represented in -the target character set, it can be approximated through one or several -similarly looking characters. On systems where this extension doesn't exist, -this option is disabled. Default is OFF. +If ON append //TRANSLIT to the first argument of \fB\%iconv_open\fP(3) to +enable transliteration. This means that when a character cannot be +represented in the target character set, it can be approximated through one +or several similarly looking characters. On systems where this extension +doesn't exist, this option is disabled. Default is OFF. .TP \fBtrim_article_body\fP -Allows you to select how \fBtin\fP treats blank lines in article bodies. +Allows you to select how \fBtin\fP treats blank lines in article bodies. Default is 0. This option does not affect lines within verbatim blocks. .RS +1i .IP 0 3 \fBDon't trim article body\fP, do nothing. .IP 1 -\fBFührende Leerzeilen überspringen\fP. +\fBFührende Leerzeilen überspringen\fP. .IP 2 -\fBAbschliessende Leerzeilen überspr.\fP. +\fBAbschließende Leerzeilen überspr.\fP. .IP 3 \fBSkip leading and trailing blank l.\fP, skip leading and trailing blank lines. @@ -2063,7 +2145,7 @@ textblocks with one blank line. \fBunderscores_regex\fP A regular expression that will be applied when reading articles. All matching words are shown in \fBcol_markdash\fP or \fBmono_markdash\fP. If -\fBundescores_regex\fP is blank, then \fBtin\fP(1) uses a built\-in default. +\fBunderscores_regex\fP is blank, then \fB\%tin\fP(1) uses a built\-in default. .TP \fBunlink_article\fP If ON remove \fI${TIN_HOMEDIR:\-"$HOME"}/.article\fP after posting. Default is @@ -2078,19 +2160,20 @@ The program that will be run when launch Enable highlighting URLs in message body. Default is ON. .TP \fBuse_color\fP -If enabled \fBtin\fP(1) uses ANSI\-colors. Default is OFF. +If enabled \fB\%tin\fP(1) uses ANSI\-colors. Default is OFF. .TP \fBuse_keypad\fP Use scroll keys on keypad. Default is OFF. .TP \fBuse_mouse\fP -Allows the mouse button support in a \fBxterm\fP(1x) to be enabled/disabled. -Default is OFF. +Allows the mouse button support in a \fB\%xterm\fP(1x) to be +enabled/disabled. Default is OFF. .TP \fBuse_slrnface\fP -If enabled \fBslrnface\fP(1) will be used to interpret the \*(rqX\-Face:\*(rq -header. For this option to have any effect, \fBtin\fP(1) must be running in an -\fBxterm\fP(1x) and \fBslrnface\fP(1) must be in your $\fBPATH\fP. Default is OFF. +If enabled \fB\%slrnface\fP(1) will be used to interpret the \*(rqX\-Face:\*(rq +header. For this option to have any effect, \fB\%tin\fP(1) must be running in +an \fB\%xterm\fP(1x) and \fB\%slrnface\fP(1) must be in your $\fBPATH\fP. Default +is OFF. .TP \fButf8_graphics\fP If ON use UTF\-8 characters for indicator ('\->'), thread/attachment tree @@ -2101,19 +2184,19 @@ A regular expression that tin will use t block. Default is #v+ .TP \fBverbatim_end_regex\fP -A regular expression that tin will use to find the end of a verbatim block. +A regular expression that tin will use to find the end of a verbatim block. Default is #v\- .TP \fBverbatim_handling\fP If ON verbatim blocks will be detected. Default is ON .TP \fBwildcard\fP -Allows you to select how \fBtin\fP(1) matches strings. The default is 0 and +Allows you to select how \fB\%tin\fP(1) matches strings. The default is 0 and uses the wildmat notation, which is how this has traditionally been -handled. Setting this to 1 allows you to use \fBperl\fP(1) compatible regular -expressions \fBpcre\fP(3). You will probably want to update your filter file -if you use this regularly. NB: Newsgroup names will always be matched using -the wildmat notation. +handled. Setting this to 1 allows you to use \fB\%perl\fP(1) compatible +regular expressions \fB\%pcre\fP(3). You will probably want to update your +filter file if you use this regularly. NB: Newsgroup names will always be +matched using the wildmat notation. .TP \fBword_h_display_marks\fP Should the leading and ending stars, slashes, strokes and dashes also be @@ -2184,17 +2267,17 @@ at tin.org. You might want to change thi administration if you want to deal with your lusers problems on your own. .TP \fBinewsdir\fP -Defines the directory containing of the \fBinews\fP(1) executable +Defines the directory containing of the \fB\%inews\fP(1) executable .TP \fBmm_charset\fP Default charset to be used in MIME's \*(rqContent\-Type:\*(rq header. $\fBMM_CHARSET\fP overrides any specified value. .TP \fBpost_mime_encoding\fP -Default encoding scheme use in MIME articles. 8bit might be the best value. +Default encoding scheme used in MIME articles. 8bit might be the best value. .TP \fBmail_mime_encoding\fP -Default encoding scheme use in MIME letters. quoted\-printable is a good +Default encoding scheme used in MIME letters. quoted\-printable is a good choice here. .TP \fBdisable_gnksa_domain_check\fP @@ -2206,18 +2289,18 @@ steht wird die Einstellung ignoriert. .TP \fBspooldir\fP Base of your newsspool (Bnews, Cnews and INN traditional spool style), -common values are \fI/var/spool/news\fP, \fI/usr/spool/news\fP, \fI/news/spool\fP. +common values are \fI/var/spool/news\fP, \fI/usr/spool/news\fP, \fI/news/spool\fP. $\fBTIN_SPOOLDIR\fP overrides any specified value. .TP \fBoverviewdir\fP -Base of your NOV database \fBnewsoverview\fP(5) (tradspool style; might be the -same dir as \fIspooldir\fP), common values are \fI/var/spool/overview\fP, +Base of your NOV database \fB\%newsoverview\fP(5) (tradspool style; might be +the same dir as \fIspooldir\fP), common values are \fI/var/spool/overview\fP, \fI/usr/spool/overview\fP, \fI/news/overview\fP. $\fBTIN_NOVROOTDIR\fP overrides any specified value. .TP \fBoverviewfile\fP -Name einer Overview\-Datei, übliche Namen sind \fI.overview\fP oder -\fIover.view\fP. +Name einer Overview\-Datei, übliche Namen sind \fI.overview\fP oder +\fIover.view\fP. $\fBTIN_NOVFILENAME\fP übersteuert den angegebenen Wert. .TP \fBoverviewfmtfile\fP Full pathname of your newssystem's overview.fmt file; usually the @@ -2250,7 +2333,7 @@ setting if your configuration differs. \fI/usr/local/share/locale/$LC_MESSAGES/LC_MESSAGES/tin.mo\fP .sp .RS -Übersetzung in die in $\fBLC_ALL\fP, $\fBLC_MESSAGES\fP oder $\fBLANG\fP angegebene +Ãœbersetzung in die in $\fBLC_ALL\fP, $\fBLC_MESSAGES\fP oder $\fBLANG\fP angegebene Sprache .RE .PP @@ -2279,13 +2362,13 @@ Each line consists of four space\-separa ist der Name der Newsgruppe .TP \fBhighmark\fP -die höchste Artikelnummer die je in der Gruppe benutzt wurde +die höchste Artikelnummer die je in der Gruppe benutzt wurde .TP \fBlowmark\fP is the lowest article number in the group; this number is not guaranteed to be accurate, and should only be taken to be a hint. Note that because of article cancellations, there may be gaps in the numbering sequence. If the -lowest article number is greater then the highest article number, then there +lowest article number is greater than the highest article number, then there are no articles in the newsgroup. .TP \fBflags\fP @@ -2299,7 +2382,7 @@ local postings are allowed no local postings are allowed, only remote ones .TP \fBm\fP -die Gruppe ist moderiert und alle Postings müssen approved werden +die Gruppe ist moderiert und alle Postings müssen approved werden .TP \fBj\fP articles in this group are not kept, but only passed on @@ -2311,10 +2394,10 @@ in diese Gruppe darf nicht geposted werd Artikel werden auf dem Server in der Gruppe \*(rqfoo.bar\*(rq abgelegt .RE .TP -\fBtin\fP(1) +\fB\%tin\fP(1) only tries to read the file if you read directly from the local spool, if -you read news via NNTP, \fBtin\fP(1) uses the LIST (\fBRFC3977\fP) command -instead. +you read news via NNTP, \fB\%tin\fP(1) uses the LIST (\fBRFC\%3977\fP) or LIST +COUNTS (\fBRFC\%6048\fP) command instead. .RE .PP @@ -2322,7 +2405,7 @@ instead. .sp .RS This file provides a chronological record of when newsgroups are created. It -is normally updated by the local newsserver (e.g. \fBinnd\fP(8)) whenever a +is normally updated by the local newsserver (e.g. \fB\%innd\fP(8)) whenever a new group is created. Each line consist of three space\-separated fields "\fIname\fP \fItime\fP \fIcreator\fP". .TP @@ -2336,10 +2419,10 @@ since the epoch. \fBcreator\fP die Mailadresse der Person die die Gruppe angelegt hat. .TP -\fBtin\fP(1) +\fB\%tin\fP(1) only tries to read the file if you read directly from the local spool, if -you read news via NNTP, \fBtin\fP(1) uses the NEWGROUPS (\fBRFC3977\fP) command -instead. +you read news via NNTP, \fB\%tin\fP(1) uses the NEWGROUPS (\fBRFC\%3977\fP) +command instead. .RE .PP @@ -2347,19 +2430,19 @@ instead. .sp .RS This file provides short descriptions of each newsgroup. It is normally -updated by the local newsserver (e.g. \fBinnd\fP(8)) whenever a new group is -created. Each line consist of two tab\-separated fields +updated by the local newsserver (e.g. \fB\%innd\fP(8)) whenever a new group +is created. Each line consist of two tab\-separated fields "\fIgroup.name\fP \fIone\-line description\fP". .TP \fBgroup.name\fP ist der Name der Newsgruppe .TP \fBKurzbeschreibung\fP -ist die zugehörige Kurzbeschreibung +ist die zugehörige Kurzbeschreibung .TP -\fBtin\fP(1) +\fB\%tin\fP(1) only tries to read the file if you read directly from the local spool, if -you read news via NNTP, \fBtin\fP(1) uses the LIST NEWSGROUPS (\fBRFC3977\fP) +you read news via NNTP, \fB\%tin\fP(1) uses the LIST NEWSGROUPS (\fBRFC\%3977\fP) command instead. .RE .PP @@ -2377,11 +2460,11 @@ This file specifies might hold a default .sp .RS This file specifies the organization of the news overview database (see also -\fBnewsoverview\fP(5)). The order of lines in this file is important; it +\fB\%newsoverview\fP(5)). The order of lines in this file is important; it determines the order in which the fields will appear in the database. See -also \fBoverview.fmt\fP(5). \fBtin\fP(1) only tries to read the file if you read -directly from the local spool, if you read news via NNTP, \fBtin\fP(1) uses -the LIST OVERVIEW.FMT (\fBRFC3977\fP) command instead. +also \fB\%overview.fmt\fP(5). \fB\%tin\fP(1) only tries to read the file if you +read directly from the local spool, if you read news via NNTP, \fB\%tin\fP(1) +uses the LIST OVERVIEW.FMT (\fBRFC\%3977\fP) command instead. .RE .PP @@ -2391,17 +2474,20 @@ the LIST OVERVIEW.FMT (\fBRFC3977\fP) co .RS This file contains a list of newsgroups \- one per line \- which the client should subscribe to when the user has no ${TIN_HOMEDIR:\-"$HOME"}/.newsrc for -the newsserver. \fBtin\fP(1) only tries to read the file if you read directly -from the local spool, if you read news via NNTP, \fBtin\fP(1) uses the LIST -SUBSCRIPTIONS (\fBRFC6048\fP) command instead. +the newsserver. \fB\%tin\fP(1) only tries to read the file if you read +directly from the local spool, if you read news via NNTP, \fB\%tin\fP(1) uses +the LIST SUBSCRIPTIONS (\fBRFC\%6048\fP) command instead. .RE .PP .SH "SIEHE AUCH" -\fBelm\fP(1), \fBinews\fP(1), \fBispell\fP(1), \fBlp\fP(1), \fBlpr\fP(1), \fBmetamail\fP(1) -\fBperl\fP(1), \fBpgp\fP(1), \fBrn\fP(1), \fBshar\fP(1), \fBslrnface\fP(1), \fBtin\fP(1), -\fBxterm\fP(1x), \fBiconv\fP(3), \fBiconv_open\fP(3), \fBnl_langinfo\fP(3), \fBpcre\fP(3), -\fBstrftime\fP(3), \fBsystem\fP(3), \fBmailcap\fP(4), \fBactive\fP(5), \fBmbox\fP(5), -\fBmmdf\fP(5), \fBnewsoverview\fP(5), \fBoverview.fmt\fP(5), \fBinnd\fP(8), \fBRFC1524\fP, -\fBRFC2045\fP, \fBRFC2046\fP, \fBRFC2047\fP, \fBRFC2048\fP, \fBRFC2980\fP, \fBRFC3977\fP, -\fBRFC4643\fP, \fBRFC5322\fP, \fBRFC5536\fP, \fBRFC5537\fP, \fBRFC6048\fP +\fB\%elm\fP(1), \fB\%inews\fP(1), \fB\%ispell\fP(1), \fB\%lp\fP(1), \fB\%lpr\fP(1), +\fB\%metamail\fP(1), \fB\%perl\fP(1), \fB\%pgp\fP(1), \fB\%rn\fP(1), \fB\%shar\fP(1), +\fB\%slrnface\fP(1), \fB\%tin\fP(1), \fB\%xterm\fP(1x), \fB\%heapsort\fP(3), +\fB\%iconv\fP(3), \fB\%iconv_open\fP(3), \fB\%nl_langinfo\fP(3), \fB\%pcre\fP(3), +\fB\%qsort\fP(3), \fB\%strftime\fP(3), \fB\%system\fP(3), \fB\%active\fP(5), +\fB\%mailcap\fP(5), \fB\%mbox\fP(5), \fB\%mmdf\fP(5), \fB\%newsoverview\fP(5), +\fB\%overview.fmt\fP(5), \fB\%innd\fP(8), \fBRFC\%1524\fP, \fBRFC\%2045\fP, +\fBRFC\%2046\fP, \fBRFC\%2047\fP, \fBRFC\%2048\fP, \fBRFC\%2980\fP, \fBRFC\%3977\fP, +\fBRFC\%4155\fP, \fBRFC\%4643\fP, \fBRFC\%5322\fP, \fBRFC\%5536\fP, \fBRFC\%5537\fP, +\fBRFC\%6048\fP diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/l10n/de.add tin-2.2.0/doc/l10n/de.add --- tin-2.0.1/doc/l10n/de.add 2011-04-17 16:04:28.000000000 +0200 +++ tin-2.2.0/doc/l10n/de.add 2013-08-28 19:09:38.078949682 +0200 @@ -1,5 +1,5 @@ PO4A-HEADER: mode=after; position=MAINTAINER;beginboundary=^\.SH -.SH ÜBERSETZUNG +.SH ÃœBERSETZUNG .TP 1i Erika Mustermann .\" diff -Nurp '--exclude=.bzr*' tin-2.0.1/doc/l10n/de.po tin-2.2.0/doc/l10n/de.po --- tin-2.0.1/doc/l10n/de.po 2011-12-24 15:50:01.000000000 +0100 +++ tin-2.2.0/doc/l10n/de.po 2013-12-21 18:14:41.805024122 +0100 @@ -1,61 +1,62 @@ -# German translations for tin manpages +# German translations for the tin manpages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2008-2011. +# Urs Janssen , 2008-2014. # msgid "" msgstr "" -"Project-Id-Version: tin 1.9.5\n" -"POT-Creation-Date: 2011-12-24 15:48+0100\n" -"PO-Revision-Date: 2009-10-01 16:17+0200\n" +"Project-Id-Version: tin-man 2.2.0\n" +"Report-Msgid-Bugs-To: translation@tin.org\n" +"POT-Creation-Date: 2013-12-21 01:42+0100\n" +"PO-Revision-Date: 2013-12-21 18:15+0100\n" "Last-Translator: Urs Janssen \n" -"Language-Team: LANGUAGE \n" +"Language-Team: German \n" +"Language: de\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -# type: TH -#: ../tin.1:12 ../tin.5:9 +#. type: TH +#: doc/tin.1:12 doc/tin.5:9 #, no-wrap msgid "tin" msgstr "tin" -# type: TH -#: ../tin.1:12 ../tin.5:9 -#, no-wrap -msgid "December 24th, 2011" -msgstr "24. December 2011" +#. type: TH +#: doc/tin.1:12 doc/tin.5:9 +msgid "December 24th, 2013" +msgstr "24. Dezember 2013" -# type: TH -#: ../tin.1:12 ../tin.5:9 +#. type: TH +#: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.0.1" -msgstr "2.0.1" +msgid "2.2.0" +msgstr "2.2.0" -# type: TH -#: ../tin.1:12 ../tin.5:9 +#. type: TH +#: doc/tin.1:12 doc/tin.5:9 #, no-wrap msgid "A Usenet newsreader" msgstr "Usenet Newsreader" -# type: SH -#: ../tin.1:15 ../tin.5:11 +#. type: SH +#: doc/tin.1:15 doc/tin.5:11 #, no-wrap msgid "NAME" msgstr "NAME" -# type: Plain text -#: ../tin.1:19 +#. type: Plain text +#: doc/tin.1:19 msgid "tin, rtin - A Usenet newsreader" msgstr "tin, rtin - Ein Usenet Newsreader" -# type: SH -#: ../tin.1:19 +#. type: SH +#: doc/tin.1:19 #, no-wrap msgid "SYNOPSIS" -msgstr "ÜBERSICHT" +msgstr "ÃœBERSICHT" -# type: Plain text -#: ../tin.1:49 +#. type: Plain text +#: doc/tin.1:49 msgid "" "B [\\|[\\|B<-h>\\||\\|B<-H>\\||\\|B<-V>\\|]\\ \\|| [\\|[\\|[\\|B<-a>" "\\|] [\\|B<-dlnq>\\||\\|B<-Q>\\|] [\\|B<-ArzxX>\\|]\\|] [\\|[\\|B<-R>\\||\\|" @@ -68,47 +69,47 @@ msgid "" msgstr "" "B [\\|[\\|B<-h>\\||\\|B<-H>\\||\\|B<-V>\\|]\\ \\|| [\\|[\\|[\\|B<-a>" "\\|] [\\|B<-dlnq>\\||\\|B<-Q>\\|] [\\|B<-ArzxX>\\|]\\|] [\\|[\\|B<-R>\\||\\|" -"B<-S>\\|] \\|\\|B<-s> I\\|] [\\|B<-cuvZ>\\|] [\\|B<-4>\\||\\|B<-" -"6>\\|] [\\|B<-N>\\||\\|B<-M> I\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] " +"B<-S>\\|] \\|\\|B<-s> I\\|] [\\|B<-cuvZ>\\|] [\\|B<-4>\\||\\|" +"B<-6>\\|] [\\|B<-N>\\||\\|B<-M> I\\|] [\\|B<-o>\\||\\|B<-w>\\|]\\|] " "[\\|B<-D> I\\|] [\\|B<-G> I\\|] [\\|B<-f> I\\|] [\\|B<-g> I\\|] [\\|B<-m> I\\|] [\\|B<-p> " "I\\|] [\\|B<-I> I\\|]\\ \\|[I\\|[\\|,.\\|.\\|." "\\|]\\|]\\|]" -# type: SH -#: ../tin.1:49 ../tin.5:14 +#. type: SH +#: doc/tin.1:49 doc/tin.5:14 #, no-wrap msgid "DESCRIPTION" msgstr "BESCHREIBUNG" -# type: Plain text -#: ../tin.1:58 +#. type: Plain text +#: doc/tin.1:58 msgid "" "B is a full-screen easy to use Usenet newsreader. It can read news " "locally (e.g., I) or remotely (B or B option) " "via a NNTP (Network News Transport Protocol) server. It will automatically " -"utilize NOV B(5) style index files if available locally or " -"via the NNTP [X]OVER command (B, B)." +"utilize NOV B<\\%newsoverview>(5) style index files if available locally or " +"via the NNTP [X]OVER command (B, B)." msgstr "" -"B ist ein einfach zu bedienender Newsreader für das Usenet. Er kann " +"B ist ein einfach zu bedienender Newsreader für das Usenet. Er kann " "Artikel von einem lokalen (z. B. aus I) oder entfernten " "Server (B oder B Option) mittels NNTP (Network News Transport " -"Protocol) lesen. Er benutzt, sofern vorhanden, lokale NOV B(5) " -"Indexdateien bzw. den [X]OVER NNTP-Befehl (B, B)." +"Protocol) lesen. Er benutzt, sofern vorhanden, lokale NOV B<\\%newsoverview>" +"(5) Indexdateien bzw. den [X]OVER NNTP-Befehl (B, B)." -# type: Plain text -#: ../tin.1:64 +#. type: Plain text +#: doc/tin.1:64 msgid "" "B has four separate levels of operation: Selection level, Group level, " "Thread level and Article level. Use the B ('B') command to view a " "list of the commands available at a particular level." msgstr "" "B hat vier unterschiedliche Arbeitsebenen: Auswahlebene, Gruppenebene, " -"Threadebene und Artikelebene. Mit dem B ('B') Befehl können die " -"jeweils verfügbaren Befehle angezeigt werden." +"Threadebene und Artikelebene. Mit dem B ('B') Befehl können die " +"jeweils verfügbaren Befehle angezeigt werden." -# type: Plain text -#: ../tin.1:72 +#. type: Plain text +#: doc/tin.1:72 msgid "" "On startup B will show a list of the newsgroups found in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>. An arrow '-E' or highlighted bar " @@ -120,162 +121,166 @@ msgid "" msgstr "" "Am Anfang zeigt B eine Liste der Gruppen in I<${TIN_HOMEDIR:-\"$HOME" "\"}/.newsrc>. Ein Pfeil '-E' oder ein inverser Balken zeigt auf die " -"erste Newsgruppe. Um zu einer Gruppe zu navigieren können die Cursor-Tasten " -"(hängt vom verwendetem Terminal ab) oder B ('B') und B ('B') " -"benutzt werden. Mit Bildhoch/Bildrunter (hängt vom verwendetem Terminal ab) " +"erste Newsgruppe. Um zu einer Gruppe zu navigieren können die Cursor-Tasten " +"(hängt vom verwendetem Terminal ab) oder B ('B') und B ('B') " +"benutzt werden. Mit Bildhoch/Bildrunter (hängt vom verwendetem Terminal ab) " "oder B ('B<^U>') (CTRL-U) und B ('B<^D>') (CTRL-D) kann " -"Seitenweise navigiert werden. Die ausgewählte Gruppe wird durch Drücken von " +"Seitenweise navigiert werden. Die ausgewählte Gruppe wird durch Drücken von " "'BCRE>' betreten." -# type: Plain text -#: ../tin.1:77 +#. type: Plain text +#: doc/tin.1:77 msgid "" "The B ('BTABE>') key enters the next " "newsgroup with unread articles." msgstr "" -"Durch Drücken der B ('BTABE>') Taste wird " -"die nächste Newsgruppe mit ungelesenen Artikeln betreten." +"Durch Drücken der B ('BTABE>') Taste wird " +"die nächste Newsgruppe mit ungelesenen Artikeln betreten." -# type: SH -#: ../tin.1:77 +#. type: SH +#: doc/tin.1:77 #, no-wrap msgid "EXIT STATUS" msgstr "EXIT-STATUS" -# type: Plain text -#: ../tin.1:79 +#. type: Plain text +#: doc/tin.1:79 msgid "Interactive mode:" msgstr "Interaktiver-Modus:" -# type: TP -#: ../tin.1:80 ../tin.1:90 ../tin.1:1066 ../tin.1:3230 +#. type: TP +#: doc/tin.1:80 doc/tin.1:90 doc/tin.1:1080 doc/tin.1:3407 #, no-wrap msgid "B<0>" msgstr "B<0>" -# type: Plain text -#: ../tin.1:83 +#. type: Plain text +#: doc/tin.1:83 msgid "Successful program execution." msgstr "Programm erfolgreich beendet." -# type: TP -#: ../tin.1:83 ../tin.1:93 ../tin.1:3233 +#. type: TP +#: doc/tin.1:83 doc/tin.1:93 doc/tin.1:3410 #, no-wrap msgid "B<1>" msgstr "B<1>" -# type: Plain text -#: ../tin.1:86 ../tin.1:96 +#. type: Plain text +#: doc/tin.1:86 doc/tin.1:96 msgid "Usage, syntax, configuration file or network error." msgstr "Bedien-, Syntax-, Konfigurations- oder Netzwerk-Fehler." -# type: Plain text -#: ../tin.1:89 +#. type: Plain text +#: doc/tin.1:89 msgid "Batch mode (''B<-Z>''):" msgstr "Batch-Modus (''B<-Z>''):" -# type: Plain text -#: ../tin.1:93 +#. type: Plain text +#: doc/tin.1:93 msgid "No unread news" msgstr "Keine ungelesenen Nachrichten vorhanden" -# type: TP -#: ../tin.1:96 ../tin.1:3236 +#. type: TP +#: doc/tin.1:96 doc/tin.1:3413 #, no-wrap msgid "B<2>" msgstr "B<2>" -# type: Plain text -#: ../tin.1:99 +#. type: Plain text +#: doc/tin.1:99 msgid "Unread news" msgstr "Ungelesene Nachrichten vorhanden" -# type: SH -#: ../tin.1:102 +#. type: SH +#: doc/tin.1:102 #, no-wrap msgid "OPTIONS" msgstr "OPTIONEN" -# type: TP -#: ../tin.1:103 +#. type: TP +#: doc/tin.1:103 #, no-wrap msgid "B<-4>" msgstr "B<-4>" -# type: Plain text -#: ../tin.1:106 +#. type: Plain text +#: doc/tin.1:106 msgid "Force connecting via IPv4 to the remote NNTP server." msgstr "Verbindung via IPv4 zum NNTP Server erzwingen." -# type: TP -#: ../tin.1:106 +#. type: TP +#: doc/tin.1:106 #, no-wrap msgid "B<-6>" msgstr "B<-6>" -# type: Plain text -#: ../tin.1:109 +#. type: Plain text +#: doc/tin.1:109 msgid "Force connecting via IPv6 to the remote NNTP server." msgstr "Verbindung via IPv6 zum NNTP Server erzwingen." -# type: TP -#: ../tin.1:109 +#. type: TP +#: doc/tin.1:109 #, no-wrap msgid "B<-a>" msgstr "B<-a>" -# type: Plain text -#: ../tin.1:112 +#. type: Plain text +#: doc/tin.1:112 msgid "Toggle ANSI color (default is off)." msgstr "ANSI-Farben ein/-ausschalten (Standard ist aus)." -# type: TP -#: ../tin.1:112 +#. type: TP +#: doc/tin.1:112 #, no-wrap msgid "B<-A>" msgstr "B<-A>" -# type: Plain text -#: ../tin.1:115 +#. type: Plain text +#: doc/tin.1:115 msgid "Force authentication on initial connect." msgstr "Erzwinge Authentifikation beim Verbindungsaufbau." -# type: TP -#: ../tin.1:115 +#. type: TP +#: doc/tin.1:115 #, no-wrap msgid "B<-c>" msgstr "B<-c>" -# type: Plain text -#: ../tin.1:120 +#. type: Plain text +#: doc/tin.1:120 msgid "" "Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." "newsrc> or file specified by the ''B<-f>'' option and mark all articles as " "read." msgstr "" -"Erstelle bzw. aktualisiere Index-Dateien für alle Gruppen in I<" +"Erstelle bzw. aktualisiere Index-Dateien für alle Gruppen in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> bzw. der mittels ''B<-f>'' angegebenen " "Datei und markiere alle Artikel als gelesen." -# type: TP -#: ../tin.1:120 +#. type: TP +#: doc/tin.1:120 #, no-wrap msgid "B<-d>" msgstr "B<-d>" -# type: Plain text -#: ../tin.1:123 -msgid "Don't load newsgroup descriptions (interactive mode)." -msgstr "Keine Gruppenbeschreibungen laden (Interaktiver-Modus)." +#. type: Plain text +#: doc/tin.1:123 +msgid "" +"Don't load newsgroup descriptions and servers message of the day " +"(interactive mode)." +msgstr "" +"Keine Gruppenbeschreibungen und die Server Meldung des Tages laden " +"(Interaktiver-Modus)." -# type: TP -#: ../tin.1:123 +#. type: TP +#: doc/tin.1:123 #, no-wrap msgid "B<-D>I< debug-level>" msgstr "B<-D>I< Debuggrad>" -# type: Plain text -#: ../tin.1:127 +#. type: Plain text +#: doc/tin.1:127 msgid "" "Enter debug-level (1 = NNTP, 2 = filter, 4 = newsrc, 8 = threading, 16 = " "memory, 32 = attributes, 64 = misc)." @@ -283,14 +288,14 @@ msgstr "" "Debuggrad angeben (1 = NNTP, 2 = Filter, 4 = newsrc, 8 = Threading, 16 = " "Speicher, 32 = attributes, 64 = Diverses)." -# type: TP -#: ../tin.1:127 +#. type: TP +#: doc/tin.1:127 #, no-wrap msgid "B<-f>I< file>" msgstr "B<-f>I< Datei>" -# type: Plain text -#: ../tin.1:131 +#. type: Plain text +#: doc/tin.1:131 msgid "" "Use the specified file of subscribed to newsgroups in place of I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." @@ -298,64 +303,64 @@ msgstr "" "Benutze die angegebene newsrc-Datei anstelle von I<${TIN_HOMEDIR:-\"$HOME" "\"}/.newsrc>." -# type: TP -#: ../tin.1:131 +#. type: TP +#: doc/tin.1:131 #, no-wrap msgid "B<-g>I< server>" msgstr "B<-g>I< Server>" -# type: Plain text -#: ../tin.1:135 +#. type: Plain text +#: doc/tin.1:135 msgid "" "Use the server and newsrc specified in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "newsrctable>." msgstr "" -"Zugehörigen Newsserver und newsrc-Datei aus I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" +"Zugehörigen Newsserver und newsrc-Datei aus I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "newsrctable> benutzen." -# type: TP -#: ../tin.1:135 +#. type: TP +#: doc/tin.1:135 #, no-wrap msgid "B<-G>I< article-limit>" msgstr "B<-G>I< Artikellimit>" -# type: Plain text -#: ../tin.1:138 +#. type: Plain text +#: doc/tin.1:138 msgid "Limit the number of articles/group to retrieve from the server." -msgstr "Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe." +msgstr "Beschränkt die Anzahl der zu ladenden Artikel pro Gruppe." -# type: TP -#: ../tin.1:138 +#. type: TP +#: doc/tin.1:138 #, no-wrap msgid "B<-h>" msgstr "B<-h>" -# type: Plain text -#: ../tin.1:141 +#. type: Plain text +#: doc/tin.1:141 msgid "Help listing all command-line options." -msgstr "Kurzübersicht der verfügbaren Komandozeilenoptionen." +msgstr "Kurzübersicht der verfügbaren Komandozeilenoptionen." -# type: TP -#: ../tin.1:141 +#. type: TP +#: doc/tin.1:141 #, no-wrap msgid "B<-H>" msgstr "B<-H>" -# type: Plain text -#: ../tin.1:145 +#. type: Plain text +#: doc/tin.1:145 msgid "" "Brief introduction to B that is also shown the first time it is started." msgstr "" -"Kurzeinführung in B welche auch beim allerersten Start ausgegeben wird." +"Kurzeinführung in B welche auch beim allerersten Start ausgegeben wird." -# type: TP -#: ../tin.1:145 +#. type: TP +#: doc/tin.1:145 #, no-wrap msgid "B<-I>I< dir>" msgstr "B<-I>I< Verzeichnis>" -# type: Plain text -#: ../tin.1:151 +#. type: Plain text +#: doc/tin.1:151 msgid "" "Directory in which to store newsgroup index files. Default is I<" "${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news>. This " @@ -363,199 +368,205 @@ msgid "" "B is turned off." msgstr "" -# type: TP -#: ../tin.1:151 +#. type: TP +#: doc/tin.1:151 #, no-wrap msgid "B<-l>" msgstr "B<-l>" -# type: Plain text -#: ../tin.1:161 +#. type: Plain text +#: doc/tin.1:163 msgid "" "Get number of articles per group from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/" "\"${TIN_ACTIVEFILE:-active}> file. If reading via NNTP this is done with the " -"LIST command (B). This might result in incorrect article counts but " -"is usually faster than the default which is to read the I<${TIN_LIBDIR:-" +"LIST command (B ). This might result in incorrect article counts " +"but is usually faster than the default which is to read the I<${TIN_LIBDIR:-" "NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file (either directly or via " -"LIST) and then check the article count via NNTP GROUP command (B) " -"''B<-ln>''." +"LIST) and then check the article count via NNTP GROUP command (B ) ''B<-ln>''. If reading via NNTP and LIST COUNTS (B ) is " +"available that is used instead as it gives more accurate article counts." msgstr "" -# type: TP -#: ../tin.1:161 +#. type: TP +#: doc/tin.1:163 #, no-wrap msgid "B<-m>I< dir>" msgstr "B<-m>I< Verzeichnis>" -# type: Plain text -#: ../tin.1:164 +#. type: Plain text +#: doc/tin.1:166 msgid "Mailbox directory to use. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." msgstr "" "Zu benutzendes Mailbox-Verzeichnis. Standard ist I<${TIN_HOMEDIR:-\"$HOME\"}/" "Mail>." -# type: TP -#: ../tin.1:164 +#. type: TP +#: doc/tin.1:166 #, no-wrap msgid "B<-M>I< user>" msgstr "B<-M>I< Benutzer>" -# type: Plain text -#: ../tin.1:168 +#. type: Plain text +#: doc/tin.1:170 msgid "" "Mail unread articles to specified user for later reading. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." msgstr "" -"Sende ungelesene Artikel an den angegebenen Benutzer um sie später lesen zu " -"können. Für weitere Informationen siehe den Abschnitt \"AUTOMATISCHES MAILEN " +"Sende ungelesene Artikel an den angegebenen Benutzer um sie später lesen zu " +"können. Für weitere Informationen siehe den Abschnitt \"AUTOMATISCHES MAILEN " "UND SPEICHERN VON UNGELESENEN ARTIKELN\"." -# type: TP -#: ../tin.1:168 +#. type: TP +#: doc/tin.1:170 #, no-wrap msgid "B<-n>" msgstr "B<-n>" -# type: Plain text -#: ../tin.1:175 +#. type: Plain text +#: doc/tin.1:177 msgid "" "Only load groups from the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-" "active}> file that are subscribed to in the user's I<${TIN_HOMEDIR:-\"$HOME" "\"}/.newsrc>. This allows a noticeable speedup when connecting via a slow " -"line, but B can not tell which groups are moderated. See also ''B<-l>''." +"line, but B may not be able detect which groups are moderated. See also " +"''B<-l>''." msgstr "" -# type: TP -#: ../tin.1:175 +#. type: TP +#: doc/tin.1:177 #, no-wrap msgid "B<-N>" msgstr "B<-N>" -# type: Plain text -#: ../tin.1:179 +#. type: Plain text +#: doc/tin.1:181 msgid "" "Mail unread articles to yourself for later reading. For more information " "read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." msgstr "" -"Sende ungelesene Artikel an dich selbst um sie später lesen zu können. Für " +"Sende ungelesene Artikel an dich selbst um sie später lesen zu können. Für " "weitere Informationen siehe den Abschnitt \"AUTOMATISCHES MAILEN UND " "SPEICHERN VON UNGELESENEN ARTIKELN\"." -# type: TP -#: ../tin.1:179 +#. type: TP +#: doc/tin.1:181 #, no-wrap msgid "B<-o>" msgstr "B<-o>" -# type: Plain text -#: ../tin.1:183 +#. type: Plain text +#: doc/tin.1:185 msgid "" "Quick post all postponed articles and exit. In order for this to be really " "quick, it should be used with ''B<-n>'' if possible." msgstr "" -# type: TP -#: ../tin.1:183 +#. type: TP +#: doc/tin.1:185 #, no-wrap msgid "B<-p>I< port>" msgstr "B<-p>I< Port>" -# type: Plain text -#: ../tin.1:187 +#. type: Plain text +#: doc/tin.1:189 msgid "" "Port to use if reading via NNTP (default is 119). This also overrides the " "environment variable $B if set." msgstr "" "Zu benutzende Portnummer falls per NNTP gelesen wird (Standard ist 119). " -"Übersteuert die Umgebungsvariable $B." +"Ãœbersteuert die Umgebungsvariable $B." -# type: TP -#: ../tin.1:187 +#. type: TP +#: doc/tin.1:189 #, no-wrap msgid "B<-q>" msgstr "B<-q>" -# type: Plain text -#: ../tin.1:190 -msgid "Don't check for new newsgroups." -msgstr "Nicht prüfen ob neue Newsgruppen vorhanden sind." +#. type: Plain text +#: doc/tin.1:192 +msgid "" +"Don't check for new newsgroups and skip loading the servers message of the " +"day." +msgstr "" +"Nicht prüfen ob neue Newsgruppen vorhanden sind und die Server Meldung des " +"Tages nicht laden." -# type: TP -#: ../tin.1:190 +#. type: TP +#: doc/tin.1:192 #, no-wrap msgid "B<-Q>" msgstr "B<-Q>" -# type: Plain text -#: ../tin.1:194 +#. type: Plain text +#: doc/tin.1:196 msgid "" "Quick start. Start B as quickly as possible. Currently this is " "equivalent to ''B<-nqd>''." msgstr "" -"Schnellstart. B so schnell wie möglich starten, zur Zeit entspricht " +"Schnellstart. B so schnell wie möglich starten, zur Zeit entspricht " "diese Option ''B<-nqd>''." -# type: TP -#: ../tin.1:194 +#. type: TP +#: doc/tin.1:196 #, no-wrap msgid "B<-r>" msgstr "B<-r>" -# type: Plain text -#: ../tin.1:199 +#. type: Plain text +#: doc/tin.1:201 msgid "" "Read news remotely from the default NNTP server specified in the environment " "variable $B or contained in the file I." msgstr "" -# type: TP -#: ../tin.1:199 +#. type: TP +#: doc/tin.1:201 #, no-wrap msgid "B<-R>" msgstr "B<-R>" -# type: Plain text -#: ../tin.1:202 +#. type: Plain text +#: doc/tin.1:204 msgid "Read news saved by the ''B<-S>'' option." msgstr "Lese mittels ''B<-S>'' gespeicherte Artikel." -# type: TP -#: ../tin.1:202 +#. type: TP +#: doc/tin.1:204 #, no-wrap msgid "B<-s>I< dir>" msgstr "B<-s>I< Verzeichnis>" -# type: Plain text -#: ../tin.1:206 +#. type: Plain text +#: doc/tin.1:208 msgid "" "Save/read articles to/in directory. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/" "News>." msgstr "" -# type: TP -#: ../tin.1:206 +#. type: TP +#: doc/tin.1:208 #, no-wrap msgid "B<-S>" msgstr "B<-S>" -# type: Plain text -#: ../tin.1:210 +#. type: Plain text +#: doc/tin.1:212 msgid "" "Save unread articles for later reading by the ''B<-R>'' option. For more " "information read section \"AUTOMATIC MAILING AND SAVING NEW NEWS\"." msgstr "" -"Speichere ungelesene Artikel zum späteren Lesen mittels ''B<-R>''. Für " +"Speichere ungelesene Artikel zum späteren Lesen mittels ''B<-R>''. Für " "weitere Informationen siehe den Abschnitt \"AUTOMATISCHES MAILEN UND " "SPEICHERN VON UNGELESENEN ARTIKELN\"." -# type: TP -#: ../tin.1:210 +#. type: TP +#: doc/tin.1:212 #, no-wrap msgid "B<-u>" msgstr "B<-u>" -# type: Plain text -#: ../tin.1:216 +#. type: Plain text +#: doc/tin.1:218 msgid "" "Create/update index files for every group in I<${TIN_HOMEDIR:-\"$HOME\"}/." "newsrc> or file specified by the ''B<-f>'' option. This option is disabled " @@ -563,94 +574,95 @@ msgid "" "B is turned off." msgstr "" -# type: TP -#: ../tin.1:216 +#. type: TP +#: doc/tin.1:218 #, no-wrap msgid "B<-v>" msgstr "B<-v>" -# type: Plain text -#: ../tin.1:220 +#. type: Plain text +#: doc/tin.1:222 msgid "" "Verbose mode for ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-u>'' " "and ''B<-Z>'' options." msgstr "" -"Ausführliche Ausgabe für ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-" +"Ausführliche Ausgabe für ''B<-c>'', ''B<-M>'', ''B<-N>'', ''B<-S>'', \\&''B<-" "u>'' und ''B<-Z>''-Optionen." -# type: TP -#: ../tin.1:220 +#. type: TP +#: doc/tin.1:222 #, no-wrap msgid "B<-V>" msgstr "B<-V>" -# type: Plain text -#: ../tin.1:223 +#. type: Plain text +#: doc/tin.1:225 msgid "Print version and date information." msgstr "Versionsinformationen ausgeben." -# type: TP -#: ../tin.1:223 +#. type: TP +#: doc/tin.1:225 #, no-wrap msgid "B<-w>" msgstr "B<-w>" -# type: Plain text -#: ../tin.1:227 +#. type: Plain text +#: doc/tin.1:229 msgid "" "Quick mode to post an article and then exit. In order for this to be really " "quick, it should be used with ''B<-n>'' if possible." msgstr "" -"Schnell-Modus um nur einen Artikel zu posten. Nach Möglichkeit mit ''B<-n>'' " +"Schnell-Modus um nur einen Artikel zu posten. Nach Möglichkeit mit ''B<-n>'' " "kombinieren." -# type: TP -#: ../tin.1:227 +#. type: TP +#: doc/tin.1:229 #, no-wrap msgid "B<-x>" msgstr "B<-x>" -# type: Plain text -#: ../tin.1:230 -msgid "No posting mode. You cannot post articles if you use this option." +#. type: Plain text +#: doc/tin.1:232 +msgid "No-posting mode. You cannot post articles if you use this option." msgstr "" +"Sie können keine Artikel veröffentlichen, wenn Sie diese Option verwenden." -# type: TP -#: ../tin.1:230 +#. type: TP +#: doc/tin.1:232 #, no-wrap msgid "B<-X>" msgstr "B<-X>" -# type: Plain text -#: ../tin.1:235 +#. type: Plain text +#: doc/tin.1:237 msgid "" "No overwrite mode. I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> and files in I<" "${TIN_HOMEDIR:-\"$HOME\"}/.tin> will not be overwritten but may be created " "if they don't exist." msgstr "" -# type: TP -#: ../tin.1:235 +#. type: TP +#: doc/tin.1:237 #, no-wrap msgid "B<-z>" msgstr "B<-z>" -# type: Plain text -#: ../tin.1:240 +#. type: Plain text +#: doc/tin.1:242 msgid "" "Only start B if there is any new/unread news. If there is news B " "will position cursor at first group with unread news. Useful for putting in " "login file." msgstr "" -# type: TP -#: ../tin.1:240 +#. type: TP +#: doc/tin.1:242 #, no-wrap msgid "B<-Z>" msgstr "B<-Z>" -# type: Plain text -#: ../tin.1:246 +#. type: Plain text +#: doc/tin.1:248 msgid "" "Check if there is any new/unread news and exit with appropriate status. If " "\\&''B<-v>'' option is specified the number of unread articles in each group " @@ -658,17 +670,17 @@ msgid "" "that new/unread news exists. Useful for writing scripts." msgstr "" -# type: Plain text -#: ../tin.1:252 +#. type: Plain text +#: doc/tin.1:254 msgid "" "B can also dynamically change its options by the B ('B') " "command. Any changes are written to I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. " "For more information see section \"GLOBAL OPTIONS MENU AND TINRC " -"CONFIGURABLE VARIABLES\" and B(5)." +"CONFIGURABLE VARIABLES\" and B<\\%tin>(5)." msgstr "" -# type: Plain text -#: ../tin.1:257 +#. type: Plain text +#: doc/tin.1:259 msgid "" "A list of groups can be specified after the other command-line options. This " "can be useful if you wish to yank in or subscribe to a hand-picked subset of " @@ -676,8 +688,8 @@ msgid "" "the types of pattern that B understands." msgstr "" -# type: Plain text -#: ../tin.1:262 +#. type: Plain text +#: doc/tin.1:264 msgid "" "If you specify a single group-name, or a wildcard that matches a single " "group, then you will automatically enter that group. Otherwise the normal " @@ -685,16 +697,16 @@ msgid "" "too, as though you had yanked just those groups in." msgstr "" -# type: Plain text -#: ../tin.1:266 +#. type: Plain text +#: doc/tin.1:268 msgid "" "With the ''B<-w>'' flag a given group-name is used as default group to post " "to. If more than one group or a wildcard is specified only the first group " "respectively the first group that matches is used." msgstr "" -# type: Plain text -#: ../tin.1:273 +#. type: Plain text +#: doc/tin.1:275 msgid "" "Once you use B ('B') to yank in all active groups, or " "B ('B') to toggle the read/unread status, then " @@ -703,8 +715,8 @@ msgid "" "active}> file and get them back." msgstr "" -# type: Plain text -#: ../tin.1:278 +#. type: Plain text +#: doc/tin.1:280 msgid "" "NB: With the ''B<-n>'' flag, only unsubscribed groups in the I<" "${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file (or the newsrc-file given by the " @@ -712,55 +724,55 @@ msgid "" "newsrctable>) can be matched." msgstr "" -# type: Plain text -#: ../tin.1:283 +#. type: Plain text +#: doc/tin.1:285 msgid "" "Command-line options have higher priority than attributes and tinrc " "options. Thus, command-line option takes precedence over configured values." msgstr "" -"Komandozeilenoptionen haben eine höhere Priorität als attributes und tinrc " -"Optionen und übersteuern daher die konfigurierten Werte." +"Komandozeilenoptionen haben eine höhere Priorität als attributes und tinrc " +"Optionen und übersteuern daher die konfigurierten Werte." -# type: SH -#: ../tin.1:283 +#. type: SH +#: doc/tin.1:285 #, no-wrap msgid "USAGE" msgstr "GEBRAUCH" -# type: SS -#: ../tin.1:286 +#. type: SS +#: doc/tin.1:288 #, no-wrap msgid "NEWS ADMINISTRATION" msgstr "" -# type: Plain text -#: ../tin.1:290 +#. type: Plain text +#: doc/tin.1:292 msgid "" "Maintaining Netnews on large networks of machines can be a pretty time " "consuming job as I discovered when I was given the job of maintaining our " "news system and news users." msgstr "" -# type: Plain text -#: ../tin.1:300 +#. type: Plain text +#: doc/tin.1:302 msgid "" "A user starting B for the first time can be automatically subscribed to " "a list of newsgroups that are deemed appropriate by the news administrator. " "The subscriptions file should be created in your news lib directory (i.e., I<" "${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>) and should have file permissions " "set to 0644. If you read news via NNTP, then your news server must support " -"the LIST SUBSCRIPTIONS command. It is part of the NNTP List Extensions " -"(B) and all modern servers should understand it." +"the LIST SUBSCRIPTIONS command. It is part of the NNTP List Extensions (B ) and all modern servers should understand it." msgstr "" -# type: SS -#: ../tin.1:300 +#. type: SS +#: doc/tin.1:302 #, no-wrap msgid "SCREEN FORMAT" msgstr "" -# type: Plain text -#: ../tin.1:303 +#. type: Plain text +#: doc/tin.1:305 msgid "" "B has four separate levels of operation: Selection level, Group level, " "Thread level and Article level." @@ -768,17 +780,18 @@ msgstr "" "B hat vier unterschiedliche Arbeitsebenen: Auswahlebene, Gruppenebene, " "Threadebene und Artikelebene." -# type: Plain text -#: ../tin.1:308 +#. type: Plain text +#: doc/tin.1:311 msgid "" "At the Selection level the title displays (the name of the newsserver and) " "the number of subscribed groups (containing new unread articles). The " -"newsgroups are displayed in the middle of the screen with the number of " -"unread articles displayed on the same line in front." +"newsgroups are displayed in the middle of the screen usually with the number " +"of unread articles displayed on the same line in front, but it can be " +"customized via B." msgstr "" -# type: Plain text -#: ../tin.1:316 +#. type: Plain text +#: doc/tin.1:319 #, no-wrap msgid "" "-EM 1 2 comp.security.announce Announcements from the CERT abou\n" @@ -793,48 +806,48 @@ msgstr "" " 4 1475 news.software.nntp The Network News Transfer Protoc\n" " X 5 124 news.software.readers Discussion of software used to r\n" -# type: Plain text -#: ../tin.1:319 +#. type: Plain text +#: doc/tin.1:322 msgid "" "There may also be a character prefixing the line. An explanation follows:" msgstr "Eventuell steht am Anfang der Zeile noch eines der folgende Zeichen:" -# type: TP -#: ../tin.1:319 +#. type: TP +#: doc/tin.1:322 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:324 +#. type: Plain text +#: doc/tin.1:327 msgid "" "This group is unsubscribed. To see only your subscribed groups use the " "B ('B') or B ('B') toggle " "keys." msgstr "" -# type: TP -#: ../tin.1:324 +#. type: TP +#: doc/tin.1:327 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:329 +#. type: Plain text +#: doc/tin.1:332 msgid "" "This is a moderated group. Any posts you make will have to be approved by " "the group administrator before it will be made public. B will ask for " "confirmation before you post to a moderated group." msgstr "" -# type: TP -#: ../tin.1:329 +#. type: TP +#: doc/tin.1:332 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:338 +#. type: Plain text +#: doc/tin.1:341 msgid "" "This is a new newsgroup which has been created since you last used B. " "New newsgroups are not subscribed to by default (However, see the " @@ -845,65 +858,69 @@ msgid "" "in a later session." msgstr "" -# type: TP -#: ../tin.1:338 +#. type: TP +#: doc/tin.1:341 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:343 +#. type: Plain text +#: doc/tin.1:346 msgid "" "This group no longer exists. If you no longer wish to see this group then " "unsubscribe from it in the normal way. This flag will only appear if you " "have set B to \"ask\" in the Options Menu." msgstr "" -# type: TP -#: ../tin.1:343 +#. type: TP +#: doc/tin.1:346 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:347 +#. type: Plain text +#: doc/tin.1:350 msgid "" "You may no longer make posts to this group. Often a group will be superseded " "by a more appropriately named one." msgstr "" -# type: TP -#: ../tin.1:347 +#. type: TP +#: doc/tin.1:350 #, no-wrap msgid "B<=>" msgstr "B<=>" -# type: Plain text -#: ../tin.1:352 +#. type: Plain text +#: doc/tin.1:355 msgid "" "This group has been renamed and you may no longer post to it. If you do, " "then you will receive an error from your newsserver telling you the correct " "group to post to." msgstr "" -# type: Plain text -#: ../tin.1:357 +#. type: Plain text +#: doc/tin.1:365 msgid "" "At the Group level the title contains the name of the group, the number of " -"conversation threads, the threading method, the limit of articles to get, " -"the total number of articles, the number of hot articles, the number of " -"recent articles and the number of killed articles. I.e.:" +"conversation threads, the abbreviated threading method (B), " +"the limit of articles to get (if set; B), the total number of " +"(unread) articles (B or B), the number " +"of hot articles B, the number of read hot articles (if " +"any; B), the number of recent articles " +"(B) and the number of killed articles " +"(B). I.e.:" msgstr "" -# type: Plain text #. FIXME - make this autocenter -#: ../tin.1:361 +#. type: Plain text +#: doc/tin.1:369 #, no-wrap msgid " alt.sources (5B -50/23+ 0* 3o 0K)\n" msgstr " alt.sources (5B -50/23+ 0* 3o 0K)\n" -# type: Plain text -#: ../tin.1:369 +#. type: Plain text +#: doc/tin.1:377 msgid "" "The characters after the numbers are depending to the configuration and if " "your are in B mode or not. Some numbers could be " @@ -913,29 +930,29 @@ msgid "" "redirected." msgstr "" -# type: Plain text -#: ../tin.1:380 +#. type: Plain text +#: doc/tin.1:388 msgid "" -"If a thread has unread articles in it it's marked with a " -"B in front of the total number of articles in the thread. " -"If there are recent articles within the thread it might be marked with " -"B in front of the total number of articles in the thread " -"- this is controlled by the B option. If a thread has hot " -"articles in it (see also section \"FILTERING ARTICLES\") it's marked with " -"B in front of the total number of articles in the " -"thread. The number of lines of the first (unread) article in the thread " -"might also be shown right before the subject - this is controlled by the " -"B option." +"If a thread has unread articles it is marked with B in " +"front of the total number of articles in the thread. If there are recent " +"articles within the thread it might be marked with B in " +"front of the total number of articles in the thread - this is controlled by " +"the B option. If a thread has hot articles in it (see also " +"section \"FILTERING ARTICLES\") it's marked with B in " +"front of the total number of articles in the thread. The number of lines of " +"the first (unread) article in the thread might also be shown right before " +"the subject - this is controlled by the B option. The display can " +"be customized via B." msgstr "" -# type: Plain text -#: ../tin.1:384 +#. type: Plain text +#: doc/tin.1:392 #, no-wrap msgid " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" msgstr " de.admin.net-abuse.announce (11B 13+ 1* 1o 0K) M\n" -# type: Plain text -#: ../tin.1:389 +#. type: Plain text +#: doc/tin.1:397 #, no-wrap msgid "" "-E 1 + 3 108 bincancels in de.talk.sex Christopher Lueg El\n" @@ -948,16 +965,16 @@ msgstr "" " 3 o 93 EMP gecancelt. SouthBeach/Palms Henning Weede Ehwee\n" " 4 * 368 E1997-11-12E Fremdcancel-FAQ Thomas Roessler Ero\n" -# type: Plain text #. FIXME - add description of fields -#: ../tin.1:394 +#. type: Plain text +#: doc/tin.1:402 msgid "" "At the Thread level the screen usually (depends on the threading method " -"used) looks like this:" +"used) looks like this, but can be customized via B:" msgstr "" -# type: Plain text -#: ../tin.1:401 +#. type: Plain text +#: doc/tin.1:409 #, no-wrap msgid "" "-E 1 [ 7] What is this funny tree in the thr Robert F. Simmig\n" @@ -970,14 +987,14 @@ msgstr "" " 3 [ 230] | `-ETin thread-level (was: What is Bob Johnson Ebob\n" " 4 [ 22] `-Etin threading menu Brian Richardson\n" -# type: Plain text #. FIXME - add description of fields -#: ../tin.1:406 +#. type: Plain text +#: doc/tin.1:414 msgid "At the Article level the page header has the following format:" msgstr "" -# type: Plain text -#: ../tin.1:412 +#. type: Plain text +#: doc/tin.1:420 #, no-wrap msgid "" "Sun, 28 Dec 1997 21:21:01 de.admin.news.groups Thread 20 of 86\n" @@ -988,33 +1005,42 @@ msgstr "" "Zeilen 50 Re: EINSPRUCH zu RESULT:de.comm.mobil.ALL Artikel 47 von 59\n" "Urs Janssen Eurs@akk.orgE bei Arbeitskreis Kultur und Kommunikati\n" -# type: Plain text -#: ../tin.1:414 +#. type: Plain text +#: doc/tin.1:422 #, no-wrap msgid "article-body\n" -msgstr "Artikel-Körper\n" +msgstr "Artikel-Körper\n" -# type: SS -#: ../tin.1:417 +#. type: Plain text +#: doc/tin.1:428 +msgid "" +"The look of the Selection, Group and Thread level can be customized. See the " +"section \"CUSTOMIZING THE SCREEN FORMAT\"." +msgstr "" +"Das Aussehen der Auswahl-, Gruppen- und Threadebene kann individuell " +"angepasst werden. Siehe hierzu den Abschnitt \"ANSICHTEN ANPASSEN\"." + +#. type: SS +#: doc/tin.1:428 #, no-wrap msgid "COMMON MOVING KEYS" msgstr "" -# type: Plain text -#: ../tin.1:420 +#. type: Plain text +#: doc/tin.1:431 msgid "" "This table shows the common keys used for moving around all levels within " "B." msgstr "" -# type: ta -#: ../tin.1:422 +#. type: ta +#: doc/tin.1:433 #, no-wrap msgid "\\w'Beg. of list/article 'u +\\w'ANSI/vt100 'u" msgstr "" -# type: Plain text -#: ../tin.1:430 +#. type: Plain text +#: doc/tin.1:441 #, no-wrap msgid "" "\tANSI/vt100\tOther Terminals\n" @@ -1026,14 +1052,14 @@ msgid "" "Line Down\tB\tB (B or B<^N>)\n" msgstr "" -# type: SS -#: ../tin.1:434 +#. type: SS +#: doc/tin.1:445 #, no-wrap msgid "COMMON EDITING COMMANDS" msgstr "" -# type: Plain text -#: ../tin.1:439 +#. type: Plain text +#: doc/tin.1:450 msgid "" "An emacs style editing package allows the easy editing of input strings. An " "history list allows the easy reuse of previously entered strings. In " @@ -1041,190 +1067,190 @@ msgid "" "editing a string:" msgstr "" -# type: TP -#: ../tin.1:440 +#. type: TP +#: doc/tin.1:451 #, no-wrap msgid "B<^A, ^E>" msgstr "B<^A, ^E>" -# type: Plain text -#: ../tin.1:443 +#. type: Plain text +#: doc/tin.1:454 msgid "move to beginning or end of line, respectively." -msgstr "" +msgstr "An den Zeillenanfang bzw. das Zeilenende springen." -# type: TP -#: ../tin.1:443 +#. type: TP +#: doc/tin.1:454 #, no-wrap msgid "B<^F, ^B>" msgstr "B<^F, ^B>" -# type: Plain text -#: ../tin.1:446 +#. type: Plain text +#: doc/tin.1:457 msgid "non-destructive move forward or back one location, respectively." msgstr "" -# type: TP -#: ../tin.1:446 +#. type: TP +#: doc/tin.1:457 #, no-wrap msgid "B<^D>" msgstr "B<^D>" -# type: Plain text -#: ../tin.1:450 +#. type: Plain text +#: doc/tin.1:461 msgid "" "delete the character currently under the cursor, or send EOF if no " "characters in the buffer." msgstr "" -# type: TP -#: ../tin.1:450 +#. type: TP +#: doc/tin.1:461 #, no-wrap msgid "B<^H, EDELE>" msgstr "B<^H, EENTFE>" -# type: Plain text -#: ../tin.1:453 +#. type: Plain text +#: doc/tin.1:464 msgid "delete character left of the cursor." -msgstr "Zeichen links vom Cursor löschen." +msgstr "Zeichen links vom Cursor löschen." -# type: TP -#: ../tin.1:453 +#. type: TP +#: doc/tin.1:464 #, no-wrap msgid "B<^K>" msgstr "B<^K>" -# type: Plain text -#: ../tin.1:456 +#. type: Plain text +#: doc/tin.1:467 msgid "delete from cursor to end of line." -msgstr "Lösche vom Cursor bis zum Zeilenende." +msgstr "Lösche vom Cursor bis zum Zeilenende." -# type: TP -#: ../tin.1:456 +#. type: TP +#: doc/tin.1:467 #, no-wrap msgid "B<^P, ^N>" msgstr "B<^P, ^N>" -# type: Plain text -#: ../tin.1:459 +#. type: Plain text +#: doc/tin.1:470 msgid "move through history, previous and next, respectively." msgstr "" -# type: TP -#: ../tin.1:459 +#. type: TP +#: doc/tin.1:470 #, no-wrap msgid "B<^L, ^R>" msgstr "B<^L, ^R>" -# type: Plain text -#: ../tin.1:462 +#. type: Plain text +#: doc/tin.1:473 msgid "redraw the current line." -msgstr "" +msgstr "Aktuelle Zeile neu aufbauen." -# type: TP -#: ../tin.1:462 +#. type: TP +#: doc/tin.1:473 #, no-wrap msgid "BCRE>" msgstr "BCRE>" -# type: Plain text -#: ../tin.1:466 +#. type: Plain text +#: doc/tin.1:477 msgid "" "places line on history list if non-blank, appends newline and returns to the " "caller." msgstr "" -# type: TP -#: ../tin.1:466 +#. type: TP +#: doc/tin.1:477 #, no-wrap msgid "BESCE>" msgstr "BESCE>" -# type: Plain text -#: ../tin.1:471 +#. type: Plain text +#: doc/tin.1:482 msgid "aborts the present editing operation." msgstr "" -# type: SS -#: ../tin.1:471 +#. type: SS +#: doc/tin.1:482 #, no-wrap msgid "GLOBAL COMMANDS" msgstr "ALLGEMEINE BEFEHLE" -# type: Plain text -#: ../tin.1:474 +#. type: Plain text +#: doc/tin.1:485 msgid "" "The following commands are available at all 4 menu levels and always have " "the same effect." msgstr "" -"Die folgenden Befehle stehen in allen vier Ebenen zur Verfügung und bewirken " -"überall das Gleichen." +"Die folgenden Befehle stehen in allen vier Ebenen zur Verfügung und bewirken " +"überall das Gleichen." -# type: TP -#: ../tin.1:475 ../tin.1:1338 ../tin.1:1391 +#. type: TP +#: doc/tin.1:486 doc/tin.1:1352 doc/tin.1:1405 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:480 +#. type: Plain text +#: doc/tin.1:491 msgid "" "Shell escape. B by itself will launch a shell, B " "EcommandE will run an external EcommandE. This facility may " "have been disabled by the System Administrator." msgstr "" -# type: TP -#: ../tin.1:480 +#. type: TP +#: doc/tin.1:491 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:483 +#. type: Plain text +#: doc/tin.1:494 msgid "Toggle use of ANSI color." -msgstr "" +msgstr "ANSI Farben ein-/ausschalten." -# type: TP -#: ../tin.1:483 +#. type: TP +#: doc/tin.1:494 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:486 +#. type: Plain text +#: doc/tin.1:497 msgid "Redraw the current screen." msgstr "Bildschirminhalt neu aufbauen." -# type: TP -#: ../tin.1:486 +#. type: TP +#: doc/tin.1:497 #, no-wrap msgid "B'>" msgstr "B'>" -# type: Plain text -#: ../tin.1:489 +#. type: Plain text +#: doc/tin.1:500 msgid "Scroll screen up by one line." -msgstr "Eine Zeile nach oben blättern (scrollen)." +msgstr "Eine Zeile nach oben blättern (scrollen)." -# type: TP -#: ../tin.1:489 +#. type: TP +#: doc/tin.1:500 #, no-wrap msgid "B'>" msgstr "B'>" -# type: Plain text -#: ../tin.1:492 +#. type: Plain text +#: doc/tin.1:503 msgid "Scroll screen down by one line." -msgstr "Eine Zeile nach unten blättern (scrollen)." +msgstr "Eine Zeile nach unten blättern (scrollen)." -# type: TP -#: ../tin.1:492 +#. type: TP +#: doc/tin.1:503 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:506 +#. type: Plain text +#: doc/tin.1:517 msgid "" "Reload postponed article. If your system blocks the B key you " "must quote it by pressing 'B<^V>' (CTRL-V) first. The postpone-menu offers " @@ -1239,39 +1265,39 @@ msgid "" "('B<^O>''B''B'). See also ''B<-o>'' command-line switch." msgstr "" -# type: TP -#: ../tin.1:506 ../tin.1:1344 ../tin.1:1398 +#. type: TP +#: doc/tin.1:517 doc/tin.1:1358 doc/tin.1:1412 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:512 +#. type: Plain text +#: doc/tin.1:523 msgid "" "Help screen of commands available on the current menu. You can use " "B ('B'), B ('B') and B ('B<" "\\e>') to search on this screen. B ('B') returns to the menu." msgstr "" -# type: TP -#: ../tin.1:512 ../tin.1:1347 ../tin.1:1401 +#. type: TP +#: doc/tin.1:523 doc/tin.1:1361 doc/tin.1:1415 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:515 ../tin.1:1350 ../tin.1:1404 +#. type: Plain text +#: doc/tin.1:526 doc/tin.1:1364 doc/tin.1:1418 msgid "Toggle the display of help mini menu at the bottom of the screen." -msgstr "" +msgstr "Mini-Hilfe am unterem Bildschirrand ein-/ausschalten." -# type: TP -#: ../tin.1:515 +#. type: TP +#: doc/tin.1:526 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:521 +#. type: Plain text +#: doc/tin.1:532 msgid "" "List articles posted by user. The date posted, the newsgroup and the subject " "are listed. You can use B ('B'), B ('B') and " @@ -1279,231 +1305,235 @@ msgid "" "returns to the menu." msgstr "" -# type: TP -#: ../tin.1:521 +#. type: TP +#: doc/tin.1:532 #, no-wrap msgid "B" msgstr "B" -# type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:526 +#. type: Plain text +#: doc/tin.1:537 msgid "Print B version information." msgstr "Versions-Informationen ausgeben." -# type: SS -#: ../tin.1:526 +#. type: SS +#: doc/tin.1:537 #, no-wrap msgid "NEWSGROUP SELECTION COMMANDS" -msgstr "" +msgstr "BEFEHLE ZUR GRUPPENAUSWAHL" -# type: TP -#: ../tin.1:527 ../tin.1:655 ../tin.1:905 ../tin.1:1069 ../tin.1:3242 +#. type: TP +#: doc/tin.1:538 doc/tin.1:669 doc/tin.1:919 doc/tin.1:1083 doc/tin.1:3419 #, no-wrap msgid "B<4>" msgstr "B<4>" -# type: Plain text -#: ../tin.1:530 +#. type: Plain text +#: doc/tin.1:541 msgid "Select group 4." -msgstr "Gruppe 4 auswählen." +msgstr "Gruppe 4 auswählen." -# type: TP -#: ../tin.1:530 +#. type: TP +#: doc/tin.1:541 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:534 +#. type: Plain text +#: doc/tin.1:545 msgid "" "Reset I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. This will destroy all " "records of which articles have been read, so use this carefully." msgstr "" -# type: TP -#: ../tin.1:534 ../tin.1:676 ../tin.1:926 +#. type: TP +#: doc/tin.1:545 doc/tin.1:690 doc/tin.1:940 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:538 ../tin.1:680 ../tin.1:930 +#. type: Plain text +#: doc/tin.1:549 doc/tin.1:694 doc/tin.1:944 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." msgstr "" -"Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet " -"wird. Siehe Abschnitt \"BEREICHE\" für weitere Informationen." +"Wählen Sie eine Reihe von Artikeln auf die der nächste Befehl angewendet " +"wird. Siehe Abschnitt \"BEREICHE\" für weitere Informationen." -# type: TP -#: ../tin.1:538 +#. type: TP +#: doc/tin.1:549 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:541 +#. type: Plain text +#: doc/tin.1:552 msgid "Sort the list of newsgroups." msgstr "Liste vorhandener Newsgroups sortieren." -# type: TP -#: ../tin.1:541 ../tin.1:683 ../tin.1:933 ../tin.1:1123 ../tin.1:1335 -#: ../tin.1:1385 +#. type: TP +#: doc/tin.1:552 doc/tin.1:697 doc/tin.1:947 doc/tin.1:1137 doc/tin.1:1349 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:544 ../tin.1:936 ../tin.1:1126 ../tin.1:1338 ../tin.1:1388 +#. type: Plain text +#: doc/tin.1:555 doc/tin.1:950 doc/tin.1:1140 doc/tin.1:1352 doc/tin.1:1402 msgid "Repeat the previous search." msgstr "Vorherige Suche wiederholen." -# type: TP -#: ../tin.1:544 ../tin.1:686 ../tin.1:936 ../tin.1:1126 ../tin.1:1329 -#: ../tin.1:1379 +#. type: TP +#: doc/tin.1:555 doc/tin.1:700 doc/tin.1:950 doc/tin.1:1140 doc/tin.1:1343 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:547 +#. type: Plain text +#: doc/tin.1:558 msgid "Search for a group by name and description (if displayed)." msgstr "" +"Vorwärts nach einer Gruppe anhand des Namens und/oder der Kurzbeschreibung " +"(falls angezeigt) suchen." -# type: TP -#: ../tin.1:547 ../tin.1:689 ../tin.1:939 ../tin.1:1129 ../tin.1:1332 -#: ../tin.1:1382 +#. type: TP +#: doc/tin.1:558 doc/tin.1:703 doc/tin.1:953 doc/tin.1:1143 doc/tin.1:1346 +#: doc/tin.1:1396 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:550 +#. type: Plain text +#: doc/tin.1:561 msgid "Backward search through the group names and descriptions." msgstr "" +"Rückwärts mach einer Gruppe anhand des Namens und/oder der Kurzbeschreibung " +"(falls angezeigt) suchen." -# type: TP -#: ../tin.1:550 +#. type: TP +#: doc/tin.1:561 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" -# type: Plain text -#: ../tin.1:553 +#. type: Plain text +#: doc/tin.1:564 msgid "Read current group." msgstr "" -# type: TP -#: ../tin.1:553 +#. type: TP +#: doc/tin.1:564 #, no-wrap msgid "BTABE' 'n'>" msgstr "BTABE' 'n'>" -# type: Plain text -#: ../tin.1:557 +#. type: Plain text +#: doc/tin.1:568 msgid "" "Enter next group with unread news. Will wrap around to the beginning of the " "group selection list looking for unread groups." msgstr "" -# type: TP -#: ../tin.1:557 ../tin.1:764 ../tin.1:977 ../tin.1:1187 +#. type: TP +#: doc/tin.1:568 doc/tin.1:778 doc/tin.1:991 doc/tin.1:1201 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:561 +#. type: Plain text +#: doc/tin.1:572 msgid "" "Make current group as all read [after confirmation] and move to the next " "group in the group selection list." msgstr "" -# type: TP -#: ../tin.1:561 ../tin.1:768 ../tin.1:981 ../tin.1:1191 +#. type: TP +#: doc/tin.1:572 doc/tin.1:782 doc/tin.1:995 doc/tin.1:1205 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:565 +#. type: Plain text +#: doc/tin.1:576 msgid "" "Mark current group as all read [after confirmation] and enter the next " "unread group in the group selection list." msgstr "" -# type: TP -#: ../tin.1:565 +#. type: TP +#: doc/tin.1:576 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:569 +#. type: Plain text +#: doc/tin.1:580 msgid "" "Toggle display to show just the group name or the group name and the group " "descriptions." msgstr "" -# type: TP -#: ../tin.1:569 ../tin.1:781 ../tin.1:994 ../tin.1:1203 +#. type: TP +#: doc/tin.1:580 doc/tin.1:795 doc/tin.1:1008 doc/tin.1:1217 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:572 ../tin.1:784 ../tin.1:997 ../tin.1:1206 +#. type: Plain text +#: doc/tin.1:583 doc/tin.1:798 doc/tin.1:1011 doc/tin.1:1220 msgid "Edit the filter file and reload it afterwards." msgstr "Filter-Datei bearbeiten und danach anwenden." -# type: TP -#: ../tin.1:572 +#. type: TP +#: doc/tin.1:583 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:576 ../tin.1:788 +#. type: Plain text +#: doc/tin.1:587 doc/tin.1:802 msgid "" "Choose a new group by name. This command can be used to access any group, " "even those not currently yanked in." msgstr "" -# type: TP -#: ../tin.1:576 ../tin.1:791 ../tin.1:997 ../tin.1:1219 ../tin.1:1341 -#: ../tin.1:1394 +#. type: TP +#: doc/tin.1:587 doc/tin.1:805 doc/tin.1:1011 doc/tin.1:1233 doc/tin.1:1355 +#: doc/tin.1:1408 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:581 +#. type: Plain text +#: doc/tin.1:592 msgid "" "Toggle the display of the description of the current newsgroup in the last " "line. This will not be available if B was started with the \\&''B<-d>'' " "option." msgstr "" -# type: TP -#: ../tin.1:581 ../tin.1:795 ../tin.1:1000 ../tin.1:1222 +#. type: TP +#: doc/tin.1:592 doc/tin.1:809 doc/tin.1:1014 doc/tin.1:1236 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:584 ../tin.1:798 ../tin.1:1003 ../tin.1:1225 +#. type: Plain text +#: doc/tin.1:595 doc/tin.1:812 doc/tin.1:1017 doc/tin.1:1239 msgid "Toggle inverse video." msgstr "" -# type: TP -#: ../tin.1:584 +#. type: TP +#: doc/tin.1:595 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:590 +#. type: Plain text +#: doc/tin.1:601 msgid "" "Move the current group within the group selection list. By entering '1' the " "group will become the first displayed group in the list, by entering '8' the " @@ -1511,76 +1541,76 @@ msgid "" "group displayed." msgstr "" -# type: TP -#: ../tin.1:590 ../tin.1:815 ../tin.1:1239 +#. type: TP +#: doc/tin.1:601 doc/tin.1:829 doc/tin.1:1253 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:594 ../tin.1:819 ../tin.1:1243 +#. type: Plain text +#: doc/tin.1:605 doc/tin.1:833 doc/tin.1:1257 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." msgstr "" -# type: TP -#: ../tin.1:594 +#. type: TP +#: doc/tin.1:605 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:597 +#. type: Plain text +#: doc/tin.1:608 msgid "Positions the cursor on the next group with unread articles in it." msgstr "" -# type: TP -#: ../tin.1:597 ../tin.1:836 ../tin.1:1022 ../tin.1:1260 +#. type: TP +#: doc/tin.1:608 doc/tin.1:850 doc/tin.1:1036 doc/tin.1:1274 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:601 +#. type: Plain text +#: doc/tin.1:612 msgid "" "Quit B - ask the user to confirm if B is set " "accordingly." msgstr "" -# type: TP -#: ../tin.1:601 ../tin.1:839 ../tin.1:1025 ../tin.1:1263 +#. type: TP +#: doc/tin.1:612 doc/tin.1:853 doc/tin.1:1039 doc/tin.1:1277 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:604 ../tin.1:842 ../tin.1:1028 ../tin.1:1266 +#. type: Plain text +#: doc/tin.1:615 doc/tin.1:856 doc/tin.1:1042 doc/tin.1:1280 msgid "Quit B - don't ask the user to confirm." -msgstr "Beendet B sofort, ohne Bestätigungsnachfrage." +msgstr "Beendet B sofort, ohne Bestätigungsnachfrage." -# type: TP -#: ../tin.1:604 +#. type: TP +#: doc/tin.1:615 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:609 +#. type: Plain text +#: doc/tin.1:620 msgid "" "Toggle display of all subscribed to groups and just those groups containing " "unread articles. Command has no effect if groups were specified on the " "command-line when B was started." msgstr "" -# type: TP -#: ../tin.1:609 ../tin.1:845 ../tin.1:1028 +#. type: TP +#: doc/tin.1:620 doc/tin.1:859 doc/tin.1:1042 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:613 ../tin.1:849 ../tin.1:1032 +#. type: Plain text +#: doc/tin.1:624 doc/tin.1:863 doc/tin.1:1046 msgid "" "Mail a bug report or comment to Etin-bugs@tin.orgE. This is the best " "way of getting bugs fixed and features added/changed." @@ -1589,67 +1619,67 @@ msgstr "" "Dies ist der sinnvollste Weg um Fehler zu melden und behoben zu bekommen " "bzw. nach neuen Funktionen zu fragen." -# type: TP -#: ../tin.1:613 +#. type: TP +#: doc/tin.1:624 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:616 +#. type: Plain text +#: doc/tin.1:627 msgid "Subscribe to current group." -msgstr "Ausgewählte Gruppe abonnieren." +msgstr "Ausgewählte Gruppe abonnieren." -# type: TP -#: ../tin.1:616 +#. type: TP +#: doc/tin.1:627 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:621 +#. type: Plain text +#: doc/tin.1:632 msgid "" "Subscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " "understands." msgstr "" -# type: TP -#: ../tin.1:621 +#. type: TP +#: doc/tin.1:632 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:626 +#. type: Plain text +#: doc/tin.1:637 msgid "" "Unsubscribe to current group. This can be used to remove bogus groups. See " "B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" "\" section." msgstr "" -# type: TP -#: ../tin.1:626 +#. type: TP +#: doc/tin.1:637 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:631 +#. type: Plain text +#: doc/tin.1:642 msgid "" "Unsubscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " "understands." msgstr "" -# type: TP -#: ../tin.1:631 ../tin.1:873 ../tin.1:1047 ../tin.1:1300 +#. type: TP +#: doc/tin.1:642 doc/tin.1:887 doc/tin.1:1061 doc/tin.1:1314 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:637 +#. type: Plain text +#: doc/tin.1:648 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to B ('B') the article again, B " @@ -1657,207 +1687,216 @@ msgid "" "discard it via B ('B')." msgstr "" -# type: TP -#: ../tin.1:637 +#. type: TP +#: doc/tin.1:648 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:640 +#. type: Plain text +#: doc/tin.1:651 msgid "Quit B without saving any changes to the configuration." msgstr "" +"B beenden ohne ggf. gemachte Änderungen an den Einstellung zu speichern." -# type: TP -#: ../tin.1:640 +#. type: TP +#: doc/tin.1:651 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:645 +#. type: Plain text +#: doc/tin.1:656 msgid "" "Yanks in all groups. Toggles the displayed groups between all the groups in " "the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file and just " "those that are subscribed to in I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." msgstr "" -# type: TP -#: ../tin.1:645 +#. type: TP +#: doc/tin.1:656 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:649 +#. type: Plain text +#: doc/tin.1:660 msgid "" "Reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file " "to see if any new news has arrived since starting B." msgstr "" -# type: TP -#: ../tin.1:649 +#. type: TP +#: doc/tin.1:660 #, no-wrap msgid "B" msgstr "B" -# type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:654 +#. type: Plain text +#: doc/tin.1:665 msgid "Mark all articles in the current group as unread." msgstr "Alle Artikel in der aktuellen Gruppe als ungelesen markieren." -# type: SS -#: ../tin.1:654 +#. type: SS +#: doc/tin.1:665 #, no-wrap msgid "GROUP INDEX COMMANDS" msgstr "" -# type: Plain text -#: ../tin.1:658 +#. type: Plain text +#: doc/tin.1:669 +msgid "" +"All searches in this level are limited to unread articles if in " +"B mode. B ('B') can be use " +"toggle the setting right before/after the search." +msgstr "" + +#. type: Plain text +#: doc/tin.1:672 msgid "Select article 4." -msgstr "Artikel 4 auswählen." +msgstr "Artikel 4 auswählen." -# type: TP -#: ../tin.1:658 ../tin.1:908 ../tin.1:1072 +#. type: TP +#: doc/tin.1:672 doc/tin.1:922 doc/tin.1:1086 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:662 ../tin.1:912 ../tin.1:1076 +#. type: Plain text +#: doc/tin.1:676 doc/tin.1:926 doc/tin.1:1090 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." msgstr "" -# type: TP -#: ../tin.1:662 ../tin.1:912 ../tin.1:1088 +#. type: TP +#: doc/tin.1:676 doc/tin.1:926 doc/tin.1:1102 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:666 ../tin.1:916 ../tin.1:1092 +#. type: Plain text +#: doc/tin.1:680 doc/tin.1:930 doc/tin.1:1106 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." msgstr "" -# type: TP -#: ../tin.1:666 ../tin.1:916 +#. type: TP +#: doc/tin.1:680 doc/tin.1:930 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:671 ../tin.1:921 +#. type: Plain text +#: doc/tin.1:685 doc/tin.1:935 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " "be marked." msgstr "" -# type: TP -#: ../tin.1:671 ../tin.1:921 +#. type: TP +#: doc/tin.1:685 doc/tin.1:935 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:676 ../tin.1:926 +#. type: Plain text +#: doc/tin.1:690 doc/tin.1:940 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " "should be marked." msgstr "" -# type: TP -#: ../tin.1:680 ../tin.1:930 ../tin.1:1120 +#. type: TP +#: doc/tin.1:694 doc/tin.1:944 doc/tin.1:1134 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:683 ../tin.1:933 ../tin.1:1123 +#. type: Plain text +#: doc/tin.1:697 doc/tin.1:947 doc/tin.1:1137 msgid "Re-enter the last message that was viewed." msgstr "" -# type: Plain text -#: ../tin.1:686 +#. type: Plain text +#: doc/tin.1:700 msgid "Repeat the previous search" msgstr "Vorherige Suche wiederholen." -# type: Plain text -#: ../tin.1:689 +#. type: Plain text +#: doc/tin.1:703 msgid "Search forward for specified subject." -msgstr "" +msgstr "Vorwärts nach dem angegebenem Subject suchen." -# type: Plain text -#: ../tin.1:692 +#. type: Plain text +#: doc/tin.1:706 msgid "Search backward for specified subject." -msgstr "" +msgstr "Rückwärts nach dem angegebenem Subject suchen." -# type: TP -#: ../tin.1:692 +#. type: TP +#: doc/tin.1:706 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:695 +#. type: Plain text +#: doc/tin.1:709 msgid "Select current thread for later processing." msgstr "" -# type: TP -#: ../tin.1:695 +#. type: TP +#: doc/tin.1:709 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:699 +#. type: Plain text +#: doc/tin.1:713 msgid "" "Selects all threads in current group. It is a shortcut for calling " "B with a pattern of ''*''." msgstr "" -# type: TP -#: ../tin.1:699 +#. type: TP +#: doc/tin.1:713 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:704 +#. type: Plain text +#: doc/tin.1:718 msgid "" "Toggle selection of current thread. If at least one unread article, (but not " "every unread article) in the current thread is selected, then all unread " "articles become selected." msgstr "" -# type: TP -#: ../tin.1:704 +#. type: TP +#: doc/tin.1:718 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:709 +#. type: Plain text +#: doc/tin.1:723 msgid "" "For each thread in current group, if it at least one unread article is " "selected, all unread articles become selected. This is useful for auto-" "selection on author where reader wants to see entire thread." msgstr "" -# type: TP -#: ../tin.1:709 +#. type: TP +#: doc/tin.1:723 #, no-wrap msgid "B" -# type: Plain text -#: ../tin.1:715 +#. type: Plain text +#: doc/tin.1:729 msgid "" "Prompts for a pattern with which to match on. All threads whose subjects " "match the pattern will be marked selected. A pattern of ''*'' will match all " @@ -1865,25 +1904,25 @@ msgid "" "was entered." msgstr "" -# type: TP -#: ../tin.1:715 +#. type: TP +#: doc/tin.1:729 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:718 +#. type: Plain text +#: doc/tin.1:732 msgid "Reverse all selections on all articles." msgstr "" -# type: TP -#: ../tin.1:718 +#. type: TP +#: doc/tin.1:732 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:724 +#. type: Plain text +#: doc/tin.1:738 msgid "" "Undo all selections on all articles. It clears the toggle effect of " "B ('B') command. Thus after first doing a " @@ -1891,28 +1930,28 @@ msgid "" "Thus, one can iteratively whittle down uninteresting threads." msgstr "" -# type: TP -#: ../tin.1:724 ../tin.1:954 ../tin.1:1146 +#. type: TP +#: doc/tin.1:738 doc/tin.1:968 doc/tin.1:1160 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:729 ../tin.1:959 ../tin.1:1151 +#. type: Plain text +#: doc/tin.1:743 doc/tin.1:973 doc/tin.1:1165 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." msgstr "" -# type: TP -#: ../tin.1:729 ../tin.1:1151 +#. type: TP +#: doc/tin.1:743 doc/tin.1:1165 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:738 +#. type: Plain text +#: doc/tin.1:752 msgid "" "Auto select article(s) with a single key [after confirmation]. The defaults " "used for selection are based upon the following four tinrc config variables: " @@ -1923,14 +1962,14 @@ msgid "" "information on filtering." msgstr "" -# type: TP -#: ../tin.1:738 ../tin.1:1160 +#. type: TP +#: doc/tin.1:752 doc/tin.1:1174 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:747 +#. type: Plain text +#: doc/tin.1:761 msgid "" "Kill article(s) with a single key [after confirmation]. The defaults used " "for killing are based upon the following four tinrc config variables: " @@ -1941,138 +1980,138 @@ msgid "" "information on filtering." msgstr "" -# type: TP -#: ../tin.1:747 +#. type: TP +#: doc/tin.1:761 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" -# type: Plain text -#: ../tin.1:750 +#. type: Plain text +#: doc/tin.1:764 msgid "Read current article." msgstr "" -# type: TP -#: ../tin.1:750 +#. type: TP +#: doc/tin.1:764 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" -# type: Plain text -#: ../tin.1:753 +#. type: Plain text +#: doc/tin.1:767 msgid "View next unread article or group." msgstr "" -# type: TP -#: ../tin.1:753 ../tin.1:965 ../tin.1:1177 +#. type: TP +#: doc/tin.1:767 doc/tin.1:979 doc/tin.1:1191 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:757 +#. type: Plain text +#: doc/tin.1:771 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line." msgstr "" -# type: TP -#: ../tin.1:757 ../tin.1:970 ../tin.1:1180 +#. type: TP +#: doc/tin.1:771 doc/tin.1:984 doc/tin.1:1194 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:760 ../tin.1:973 +#. type: Plain text +#: doc/tin.1:774 doc/tin.1:987 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "" -# type: TP -#: ../tin.1:760 ../tin.1:973 ../tin.1:1183 +#. type: TP +#: doc/tin.1:774 doc/tin.1:987 doc/tin.1:1197 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:764 ../tin.1:977 ../tin.1:1187 +#. type: Plain text +#: doc/tin.1:778 doc/tin.1:991 doc/tin.1:1201 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." msgstr "" -# type: Plain text -#: ../tin.1:768 +#. type: Plain text +#: doc/tin.1:782 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." msgstr "" -# type: Plain text -#: ../tin.1:772 +#. type: Plain text +#: doc/tin.1:786 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." msgstr "" -# type: TP -#: ../tin.1:772 +#. type: TP +#: doc/tin.1:786 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:776 ../tin.1:989 +#. type: Plain text +#: doc/tin.1:790 doc/tin.1:1003 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." msgstr "" -# type: TP -#: ../tin.1:776 +#. type: TP +#: doc/tin.1:790 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:781 ../tin.1:994 ../tin.1:1200 +#. type: Plain text +#: doc/tin.1:795 doc/tin.1:1008 doc/tin.1:1214 msgid "" "Cancel (delete) or supersede (overwrite) the current article. It must have " "been posted by the same user. The cancel message can be seen in the " "newsgroup 'control' or 'control.cancel'." msgstr "" -# type: TP -#: ../tin.1:784 +#. type: TP +#: doc/tin.1:798 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:788 +#. type: TP +#: doc/tin.1:802 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:791 +#. type: Plain text +#: doc/tin.1:805 msgid "Toggle article/group limit." -msgstr "" +msgstr "Artikel/Gruppe Beschränkungen ein-/ausschalten." -# type: Plain text -#: ../tin.1:795 +#. type: Plain text +#: doc/tin.1:809 msgid "" "Display the subject of the first article in the current thread in the last " "line." msgstr "" -# type: TP -#: ../tin.1:798 +#. type: TP +#: doc/tin.1:812 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:804 +#. type: Plain text +#: doc/tin.1:818 msgid "" "Mark article/thread as read and move onto the next unread article/thread. If " "a range of articles/threads is set, the range will be marked as read instead " @@ -2080,194 +2119,194 @@ msgid "" "prompt asks how to proceed." msgstr "" -# type: TP -#: ../tin.1:804 +#. type: TP +#: doc/tin.1:818 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:807 +#. type: Plain text +#: doc/tin.1:821 msgid "Open the thread under the current cursor position." msgstr "" -# type: TP -#: ../tin.1:807 ../tin.1:1009 ../tin.1:1231 +#. type: TP +#: doc/tin.1:821 doc/tin.1:1023 doc/tin.1:1245 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:810 ../tin.1:1012 ../tin.1:1234 +#. type: Plain text +#: doc/tin.1:824 doc/tin.1:1026 doc/tin.1:1248 msgid "Look up article by ''Message-ID:''." msgstr "Artikel anhand der ''Message-ID:'' nachschlagen." -# type: TP -#: ../tin.1:810 +#. type: TP +#: doc/tin.1:824 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:815 ../tin.1:1017 ../tin.1:1239 +#. type: Plain text +#: doc/tin.1:829 doc/tin.1:1031 doc/tin.1:1253 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." msgstr "" -# type: TP -#: ../tin.1:819 +#. type: TP +#: doc/tin.1:833 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:822 +#. type: Plain text +#: doc/tin.1:836 msgid "Go to next group." msgstr "" -# type: TP -#: ../tin.1:822 +#. type: TP +#: doc/tin.1:836 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:825 +#. type: Plain text +#: doc/tin.1:839 msgid "Go to next unread article." msgstr "" -# type: TP -#: ../tin.1:825 ../tin.1:1017 ../tin.1:1249 +#. type: TP +#: doc/tin.1:839 doc/tin.1:1031 doc/tin.1:1263 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:830 ../tin.1:1022 ../tin.1:1254 +#. type: Plain text +#: doc/tin.1:844 doc/tin.1:1036 doc/tin.1:1268 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." msgstr "" -# type: TP -#: ../tin.1:830 +#. type: TP +#: doc/tin.1:844 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:833 +#. type: Plain text +#: doc/tin.1:847 msgid "Go to previous group." msgstr "" -# type: TP -#: ../tin.1:833 +#. type: TP +#: doc/tin.1:847 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:836 +#. type: Plain text +#: doc/tin.1:850 msgid "Go to previous unread article." msgstr "" -# type: Plain text -#: ../tin.1:839 ../tin.1:1025 +#. type: Plain text +#: doc/tin.1:853 doc/tin.1:1039 msgid "Return to previous level." msgstr "" -# type: TP -#: ../tin.1:842 +#. type: TP +#: doc/tin.1:856 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:845 +#. type: Plain text +#: doc/tin.1:859 msgid "Toggle the display between all articles and unread articles." msgstr "" -# type: TP -#: ../tin.1:849 +#. type: TP +#: doc/tin.1:863 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:854 ../tin.1:1037 ../tin.1:1279 +#. type: Plain text +#: doc/tin.1:868 doc/tin.1:1051 doc/tin.1:1293 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " "PRINTING REPOSTING AND SAVING ARTICLES\" for more information." msgstr "" -# type: TP -#: ../tin.1:854 +#. type: TP +#: doc/tin.1:868 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:857 ../tin.1:1040 ../tin.1:1282 +#. type: Plain text +#: doc/tin.1:871 doc/tin.1:1054 doc/tin.1:1296 msgid "Save marked articles automatically without further prompting." msgstr "Markierte Artikel automatisch ohne weiteres Nachfragen speichern." -# type: TP -#: ../tin.1:857 +#. type: TP +#: doc/tin.1:871 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:862 +#. type: Plain text +#: doc/tin.1:876 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " "B ('B')." msgstr "" -# type: TP -#: ../tin.1:862 +#. type: TP +#: doc/tin.1:876 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:865 +#. type: Plain text +#: doc/tin.1:879 msgid "" "Automatically tag in order all the parts of the current multi-part message." msgstr "" -# type: TP -#: ../tin.1:865 +#. type: TP +#: doc/tin.1:879 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:870 +#. type: Plain text +#: doc/tin.1:884 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " "multipart articles into a thread (''Subject:'' based)." msgstr "" -# type: TP -#: ../tin.1:870 +#. type: TP +#: doc/tin.1:884 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:873 +#. type: Plain text +#: doc/tin.1:887 msgid "Untag all articles that were tagged." msgstr "" -# type: Plain text -#: ../tin.1:879 +#. type: Plain text +#: doc/tin.1:893 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to edit the article again via B ('B'), postpone " @@ -2275,14 +2314,14 @@ msgid "" "command-line switch) or discard it via B ('B')." msgstr "" -# type: TP -#: ../tin.1:879 +#. type: TP +#: doc/tin.1:893 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:885 +#. type: Plain text +#: doc/tin.1:899 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -2290,14 +2329,14 @@ msgid "" "your own articles." msgstr "" -# type: TP -#: ../tin.1:885 +#. type: TP +#: doc/tin.1:899 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:893 +#. type: Plain text +#: doc/tin.1:907 msgid "" "Mark all unread articles that have not been selected as read, redraw screen " "to reflect changes and put index at the first thread to begin reading. " @@ -2307,216 +2346,216 @@ msgid "" "changes permanent." msgstr "" -# type: TP -#: ../tin.1:893 ../tin.1:1054 ../tin.1:1313 +#. type: TP +#: doc/tin.1:907 doc/tin.1:1068 doc/tin.1:1327 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:896 +#. type: Plain text +#: doc/tin.1:910 msgid "Mark current article as unread." msgstr "Aktuellen Artikel als ungelesen markieren." -# type: TP -#: ../tin.1:896 ../tin.1:1059 ../tin.1:1316 +#. type: TP +#: doc/tin.1:910 doc/tin.1:1073 doc/tin.1:1330 #, no-wrap msgid "B" msgstr "B" -# type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:903 +#. type: Plain text +#: doc/tin.1:917 msgid "" "Mark current thread as unread. If a range of threads is set, the range will " "be marked as unread instead of the current thread. When tagged threads are " "present, a prompt asks how to proceed." msgstr "" -# type: SS -#: ../tin.1:903 +#. type: SS +#: doc/tin.1:917 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" -# type: Plain text -#: ../tin.1:908 +#. type: Plain text +#: doc/tin.1:922 msgid "Select article 4 within thread." -msgstr "Artikel 4 aus dem Thread auswählen." +msgstr "Artikel 4 aus dem Thread auswählen." -# type: Plain text -#: ../tin.1:939 +#. type: Plain text +#: doc/tin.1:953 msgid "Search forward for a specified subject." msgstr "" -# type: Plain text -#: ../tin.1:942 +#. type: Plain text +#: doc/tin.1:956 msgid "Search backwards for a specified subject." msgstr "" -# type: TP -#: ../tin.1:942 +#. type: TP +#: doc/tin.1:956 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:945 +#. type: Plain text +#: doc/tin.1:959 msgid "Select the current thread for later processing." msgstr "" -# type: TP -#: ../tin.1:945 +#. type: TP +#: doc/tin.1:959 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:948 +#. type: Plain text +#: doc/tin.1:962 msgid "Toggle selection of current article." msgstr "" -# type: TP -#: ../tin.1:948 +#. type: TP +#: doc/tin.1:962 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:951 +#. type: Plain text +#: doc/tin.1:965 msgid "Reverse article selections." msgstr "Artikelauswahl invertieren." -# type: TP -#: ../tin.1:951 +#. type: TP +#: doc/tin.1:965 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:954 +#. type: Plain text +#: doc/tin.1:968 msgid "Undo all selections on current thread." msgstr "" -# type: TP -#: ../tin.1:959 +#. type: TP +#: doc/tin.1:973 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" -# type: Plain text -#: ../tin.1:962 +#. type: Plain text +#: doc/tin.1:976 msgid "Read current article within thread." msgstr "" -# type: TP -#: ../tin.1:962 +#. type: TP +#: doc/tin.1:976 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" -# type: Plain text -#: ../tin.1:965 +#. type: Plain text +#: doc/tin.1:979 msgid "View next unread article within thread." -msgstr "Nächsten ungelesenen Artikel im Thread anzeigen." +msgstr "Nächsten ungelesenen Artikel im Thread anzeigen." -# type: Plain text -#: ../tin.1:970 +#. type: Plain text +#: doc/tin.1:984 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line. The search will wrap over into the next thread if nothing is found in " "the current one." msgstr "" -# type: Plain text -#: ../tin.1:981 +#. type: Plain text +#: doc/tin.1:995 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." msgstr "" -# type: Plain text -#: ../tin.1:985 +#. type: Plain text +#: doc/tin.1:999 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" -# type: TP -#: ../tin.1:985 +#. type: TP +#: doc/tin.1:999 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:989 +#. type: TP +#: doc/tin.1:1003 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1000 ../tin.1:1222 +#. type: Plain text +#: doc/tin.1:1014 doc/tin.1:1236 msgid "Display the subject of the current article in the last line." -msgstr "Subject des geöffneten Artikels in der untersten Zeile anzeigen." +msgstr "Subject des geöffneten Artikels in der untersten Zeile anzeigen." -# type: TP -#: ../tin.1:1003 +#. type: TP +#: doc/tin.1:1017 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1009 +#. type: Plain text +#: doc/tin.1:1023 msgid "" "Mark article as read and move onto the next unread article. If a range of " "articles is set, the range will be marked as read instead of the current " "article. When tagged articles are present, a prompt asks how to proceed." msgstr "" -# type: TP -#: ../tin.1:1012 +#. type: TP +#: doc/tin.1:1026 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1032 +#. type: TP +#: doc/tin.1:1046 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1037 +#. type: TP +#: doc/tin.1:1051 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1040 +#. type: TP +#: doc/tin.1:1054 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1044 ../tin.1:1286 +#. type: Plain text +#: doc/tin.1:1058 doc/tin.1:1300 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" -# type: TP -#: ../tin.1:1044 +#. type: TP +#: doc/tin.1:1058 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1047 +#. type: Plain text +#: doc/tin.1:1061 msgid "Untag all tagged threads." msgstr "" -# type: Plain text -#: ../tin.1:1054 +#. type: Plain text +#: doc/tin.1:1068 msgid "" "Post an article to current group. If posting fails for some reason, you'll " "get the chance to edit the article again via B ('B'), postpone " @@ -2524,152 +2563,152 @@ msgid "" "command-line switch) or discard it via B ('B')." msgstr "" -# type: Plain text -#: ../tin.1:1059 +#. type: Plain text +#: doc/tin.1:1073 msgid "" "Mark current article in thread as unread. If a range of articles is set, the " "range will be marked as unread instead of the current article. When tagged " "articles are present, a prompt asks how to proceed." msgstr "" -# type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:1064 +#. type: Plain text +#: doc/tin.1:1078 msgid "Mark all articles in thread as unread." msgstr "Alle Artikel im aktuellen Thread as ungelesen markieren." -# type: SS -#: ../tin.1:1064 +#. type: SS +#: doc/tin.1:1078 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" -# type: Plain text -#: ../tin.1:1069 +#. type: Plain text +#: doc/tin.1:1083 msgid "Read the first (base) article in this thread." msgstr "" -# type: Plain text -#: ../tin.1:1072 +#. type: Plain text +#: doc/tin.1:1086 msgid "Read response 4 in this thread." msgstr "Antwort 4 im diesem Thread lesen." -# type: TP -#: ../tin.1:1076 +#. type: TP +#: doc/tin.1:1090 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1080 +#. type: Plain text +#: doc/tin.1:1094 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." msgstr "" -# type: TP -#: ../tin.1:1080 +#. type: TP +#: doc/tin.1:1094 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1085 -msgid "Perform B(1) operations on article." +#. type: Plain text +#: doc/tin.1:1099 +msgid "Perform B<\\%pgp>(1) operations on article." msgstr "" -# type: TP -#: ../tin.1:1085 +#. type: TP +#: doc/tin.1:1099 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1088 +#. type: Plain text +#: doc/tin.1:1102 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" -# type: TP -#: ../tin.1:1092 +#. type: TP +#: doc/tin.1:1106 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1095 +#. type: Plain text +#: doc/tin.1:1109 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "Tabulatorbreite zwischen 4 und 8 Zeichen Umschalten." -# type: TP -#: ../tin.1:1095 +#. type: TP +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1099 +#. type: Plain text +#: doc/tin.1:1113 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" -# type: TP -#: ../tin.1:1099 +#. type: TP +#: doc/tin.1:1113 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1103 +#. type: Plain text +#: doc/tin.1:1117 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." msgstr "" -# type: TP -#: ../tin.1:1103 +#. type: TP +#: doc/tin.1:1117 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1106 +#. type: Plain text +#: doc/tin.1:1120 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" -# type: TP -#: ../tin.1:1106 +#. type: TP +#: doc/tin.1:1120 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1109 +#. type: Plain text +#: doc/tin.1:1123 msgid "Toggle ROT-13 decoding for this article." -msgstr "" +msgstr "ROT-13 Entschlüsseln ein-/ausschalten." -# type: TP -#: ../tin.1:1109 +#. type: TP +#: doc/tin.1:1123 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1113 +#. type: Plain text +#: doc/tin.1:1127 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." msgstr "" -# type: TP -#: ../tin.1:1113 +#. type: TP +#: doc/tin.1:1127 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1120 +#. type: Plain text +#: doc/tin.1:1134 msgid "" "The formfeed character (^L) is often used to hide 'spoilers' that the reader " "may not initially wish to see when viewing an article. Any text after a " @@ -2678,65 +2717,65 @@ msgid "" "up will hide it again." msgstr "" -# type: Plain text -#: ../tin.1:1129 +#. type: Plain text +#: doc/tin.1:1143 msgid "Forward search the text of this article." msgstr "" -# type: Plain text -#: ../tin.1:1132 +#. type: Plain text +#: doc/tin.1:1146 msgid "Backward search the text of this article." msgstr "" -# type: TP -#: ../tin.1:1132 +#. type: TP +#: doc/tin.1:1146 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1137 +#. type: Plain text +#: doc/tin.1:1151 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " "B." msgstr "" -# type: TP -#: ../tin.1:1137 +#. type: TP +#: doc/tin.1:1151 #, no-wrap msgid "B'>" msgstr "B'>" -# type: Plain text -#: ../tin.1:1140 +#. type: Plain text +#: doc/tin.1:1154 msgid "Go to the first article in the current thread." msgstr "" -# type: TP -#: ../tin.1:1140 +#. type: TP +#: doc/tin.1:1154 #, no-wrap msgid "B'>" msgstr "B'>" -# type: Plain text -#: ../tin.1:1143 +#. type: Plain text +#: doc/tin.1:1157 msgid "Go to the last article in the current thread." msgstr "" -# type: TP -#: ../tin.1:1143 +#. type: TP +#: doc/tin.1:1157 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1146 +#. type: Plain text +#: doc/tin.1:1160 msgid "Toggle word highlighting on/off." msgstr "" -# type: Plain text -#: ../tin.1:1160 +#. type: Plain text +#: doc/tin.1:1174 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2747,8 +2786,8 @@ msgid "" "information on filtering." msgstr "" -# type: Plain text -#: ../tin.1:1169 +#. type: Plain text +#: doc/tin.1:1183 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2758,291 +2797,291 @@ msgid "" "\"FILTERING ARTICLES\" for more information on filtering." msgstr "" -# type: TP -#: ../tin.1:1169 +#. type: TP +#: doc/tin.1:1183 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" -# type: Plain text -#: ../tin.1:1172 +#. type: Plain text +#: doc/tin.1:1186 msgid "Go to next base article." msgstr "" -# type: TP -#: ../tin.1:1172 +#. type: TP +#: doc/tin.1:1186 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" -# type: Plain text -#: ../tin.1:1177 +#. type: Plain text +#: doc/tin.1:1191 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " "article." msgstr "" -# type: Plain text -#: ../tin.1:1180 +#. type: Plain text +#: doc/tin.1:1194 msgid "Author forward search." -msgstr "Suche nach Autor (vorwärts)." +msgstr "Suche nach Autor (vorwärts)." -# type: Plain text -#: ../tin.1:1183 +#. type: Plain text +#: doc/tin.1:1197 msgid "Author backward search." -msgstr "Suche nach Autor (rückwärts)." +msgstr "Suche nach Autor (rückwärts)." -# type: Plain text -#: ../tin.1:1191 +#. type: Plain text +#: doc/tin.1:1205 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." msgstr "" -# type: Plain text -#: ../tin.1:1195 +#. type: Plain text +#: doc/tin.1:1209 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." msgstr "" -# type: TP -#: ../tin.1:1195 +#. type: TP +#: doc/tin.1:1209 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1200 +#. type: TP +#: doc/tin.1:1214 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1203 +#. type: Plain text +#: doc/tin.1:1217 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" -# type: TP -#: ../tin.1:1206 +#. type: TP +#: doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1209 +#. type: Plain text +#: doc/tin.1:1223 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" -# type: TP -#: ../tin.1:1209 +#. type: TP +#: doc/tin.1:1223 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1213 +#. type: Plain text +#: doc/tin.1:1227 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" -# type: TP -#: ../tin.1:1213 +#. type: TP +#: doc/tin.1:1227 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1216 +#. type: Plain text +#: doc/tin.1:1230 msgid "Go to the start of the article." msgstr "Zum Anfang des Artikels springen." -# type: TP -#: ../tin.1:1216 +#. type: TP +#: doc/tin.1:1230 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1219 +#. type: Plain text +#: doc/tin.1:1233 msgid "Go to the end of the article." msgstr "Zum Ende des Artikels springen." -# type: TP -#: ../tin.1:1225 +#. type: TP +#: doc/tin.1:1239 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1228 +#. type: Plain text +#: doc/tin.1:1242 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" -# type: TP -#: ../tin.1:1228 +#. type: TP +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1231 +#. type: Plain text +#: doc/tin.1:1245 msgid "Show the thread menu that the current article is a part of." msgstr "" -# type: TP -#: ../tin.1:1234 +#. type: TP +#: doc/tin.1:1248 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1243 +#. type: TP +#: doc/tin.1:1257 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1246 +#. type: Plain text +#: doc/tin.1:1260 msgid "Go to the next article." msgstr "" -# type: TP -#: ../tin.1:1246 +#. type: TP +#: doc/tin.1:1260 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1249 +#. type: Plain text +#: doc/tin.1:1263 msgid "Go to the next unread article." msgstr "" -# type: TP -#: ../tin.1:1254 +#. type: TP +#: doc/tin.1:1268 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1257 +#. type: Plain text +#: doc/tin.1:1271 msgid "Go to the previous article." msgstr "" -# type: TP -#: ../tin.1:1257 +#. type: TP +#: doc/tin.1:1271 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1260 +#. type: Plain text +#: doc/tin.1:1274 msgid "Go to the previous unread article." msgstr "" -# type: Plain text -#: ../tin.1:1263 +#. type: Plain text +#: doc/tin.1:1277 msgid "Return to the previous level." msgstr "" -# type: TP -#: ../tin.1:1266 +#. type: TP +#: doc/tin.1:1280 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1270 +#. type: Plain text +#: doc/tin.1:1284 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" -# type: TP -#: ../tin.1:1270 +#. type: TP +#: doc/tin.1:1284 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1274 +#. type: Plain text +#: doc/tin.1:1288 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" -# type: TP -#: ../tin.1:1274 +#. type: TP +#: doc/tin.1:1288 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1279 +#. type: TP +#: doc/tin.1:1293 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1282 +#. type: TP +#: doc/tin.1:1296 #, no-wrap msgid "B" msgstr "B" -# type: TP -#: ../tin.1:1286 +#. type: TP +#: doc/tin.1:1300 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1289 +#. type: Plain text +#: doc/tin.1:1303 msgid "Return to group selection level." msgstr "" -# type: TP -#: ../tin.1:1289 +#. type: TP +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1292 +#. type: Plain text +#: doc/tin.1:1306 msgid "Go to parent article." msgstr "" -# type: TP -#: ../tin.1:1292 +#. type: TP +#: doc/tin.1:1306 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1296 +#. type: Plain text +#: doc/tin.1:1310 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." msgstr "" -# type: TP -#: ../tin.1:1296 +#. type: TP +#: doc/tin.1:1310 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1300 +#. type: Plain text +#: doc/tin.1:1314 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" -# type: Plain text -#: ../tin.1:1307 +#. type: Plain text +#: doc/tin.1:1321 msgid "" "Post an article to the current group. If posting fails for some reason, " "you'll get the chance to edit the article again via B ('B'), " @@ -3050,14 +3089,14 @@ msgid "" "o>'' command-line switch) or discard it via B ('B')." msgstr "" -# type: TP -#: ../tin.1:1307 +#. type: TP +#: doc/tin.1:1321 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1313 +#. type: Plain text +#: doc/tin.1:1327 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " @@ -3065,213 +3104,213 @@ msgid "" "your own articles." msgstr "" -# type: Plain text -#: ../tin.1:1316 +#. type: Plain text +#: doc/tin.1:1330 msgid "Mark article as unread." msgstr "Alle Artikel als ungelesen markieren." -# type: Plain text #. -------------------------------------------------------------------- -#: ../tin.1:1321 +#. type: Plain text +#: doc/tin.1:1335 msgid "Mark the current thread as unread." msgstr "Markiere den aktuellen Thread als ungelesen." -# type: SS -#: ../tin.1:1321 +#. type: SS +#: doc/tin.1:1335 #, no-wrap msgid "URL LISTING" msgstr "URL LISTE" -# type: Plain text -#: ../tin.1:1324 +#. type: Plain text +#: doc/tin.1:1338 msgid "" "B ('B') displays a list of URLs in the current article. " "Besides the common moving keys, the following commands are available:" msgstr "" -# type: TP -#: ../tin.1:1325 +#. type: TP +#: doc/tin.1:1339 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" -# type: Plain text -#: ../tin.1:1329 +#. type: Plain text +#: doc/tin.1:1343 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." msgstr "" -# type: Plain text -#: ../tin.1:1332 +#. type: Plain text +#: doc/tin.1:1346 msgid "URL forward search." -msgstr "Suche nach URL (vorwärts)." +msgstr "Suche nach URL (vorwärts)." -# type: Plain text -#: ../tin.1:1335 +#. type: Plain text +#: doc/tin.1:1349 msgid "URL backward search." -msgstr "Suche nach URL (rückwärts)." +msgstr "Suche nach URL (rückwärts)." -# type: TP -#: ../tin.1:1341 ../tin.1:1394 +#. type: Plain text +#: doc/tin.1:1355 doc/tin.1:1408 msgid "Shell escape." msgstr "" -# type: Plain text -#: ../tin.1:1344 +#. type: Plain text +#: doc/tin.1:1358 msgid "Toggle the display of the current URL in the last line." msgstr "" -# type: Plain text -#: ../tin.1:1347 ../tin.1:1401 +#. type: Plain text +#: doc/tin.1:1361 doc/tin.1:1415 msgid "Help screen of commands available." msgstr "" -# type: SS #. -------------------------------------------------------------------- -#: ../tin.1:1353 +#. type: SS +#: doc/tin.1:1367 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" -# type: Plain text -#: ../tin.1:1356 +#. type: Plain text +#: doc/tin.1:1370 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " "available:" msgstr "" -# type: TP -#: ../tin.1:1357 +#. type: TP +#: doc/tin.1:1371 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1360 +#. type: Plain text +#: doc/tin.1:1374 msgid "Pipe attachment into command." msgstr "" -# type: TP -#: ../tin.1:1360 +#. type: TP +#: doc/tin.1:1374 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1363 +#. type: Plain text +#: doc/tin.1:1377 msgid "Save current attachment / tagged attachments to disk." msgstr "" -# type: TP -#: ../tin.1:1363 +#. type: TP +#: doc/tin.1:1377 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" -# type: Plain text -#: ../tin.1:1366 +#. type: Plain text +#: doc/tin.1:1380 msgid "View attachment." -msgstr "Multimediaanhänge anzeigen." +msgstr "Multimediaanhänge anzeigen." -# type: TP -#: ../tin.1:1366 +#. type: TP +#: doc/tin.1:1380 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1369 +#. type: Plain text +#: doc/tin.1:1383 msgid "Tag one or more attachments for saving." msgstr "" -# type: TP -#: ../tin.1:1369 +#. type: TP +#: doc/tin.1:1383 #, no-wrap msgid "B" -# type: Plain text -#: ../tin.1:1373 +#. type: Plain text +#: doc/tin.1:1387 msgid "" "Prompts for a pattern to match. All attachments whose name/description or " "content type/transfer encoding match the pattern will be tagged." msgstr "" -# type: TP -#: ../tin.1:1373 +#. type: TP +#: doc/tin.1:1387 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1376 +#. type: Plain text +#: doc/tin.1:1390 msgid "Reverse tagging of all attachments." msgstr "" -# type: TP -#: ../tin.1:1376 +#. type: TP +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1379 +#. type: Plain text +#: doc/tin.1:1393 msgid "Untag all tagged attachments." msgstr "" -# type: Plain text -#: ../tin.1:1382 +#. type: Plain text +#: doc/tin.1:1396 msgid "Attachment forward search." msgstr "" -# type: Plain text -#: ../tin.1:1385 +#. type: Plain text +#: doc/tin.1:1399 msgid "Attachment backward search." msgstr "" -# type: TP -#: ../tin.1:1388 +#. type: TP +#: doc/tin.1:1402 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1391 +#. type: Plain text +#: doc/tin.1:1405 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" -# type: Plain text -#: ../tin.1:1398 +#. type: Plain text +#: doc/tin.1:1412 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." -msgstr "Names oder Beschreibung des Anhangs in der untersten Zeile anzeigen." +msgstr "Name oder Beschreibung des Anhangs in der untersten Zeile anzeigen." -# type: SS #. -------------------------------------------------------------------- -#: ../tin.1:1407 +#. type: SS +#: doc/tin.1:1421 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" -# type: Plain text #. FIXME - add missing descriptions -#: ../tin.1:1417 +#. type: Plain text +#: doc/tin.1:1431 msgid "" -"At startup, B reads in the configuration files (see also B(5)). " -"They contain a list of variables that can be used to configure the way " -"B works. If it exists, the global configuration file, I<${TIN_LIBDIR:-" -"NEWSLIBDIR}/tinrc> is read. After that, the user's own configuration file is " -"read from I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. The global file is useful " -"for distributing system-wide defaults to new users who have no private tinrc " -"yet." +"At startup, B reads in the configuration files (see also B<\\%tin>" +"(5)). They contain a list of variables that can be used to configure the " +"way B works. If it exists, the global configuration file, I<" +"${TIN_LIBDIR:-NEWSLIBDIR}/tinrc> is read. After that, the user's own " +"configuration file is read from I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>. The " +"global file is useful for distributing system-wide defaults to new users who " +"have no private tinrc yet." msgstr "" -# type: Plain text -#: ../tin.1:1425 +#. type: Plain text +#: doc/tin.1:1439 msgid "" "The variables are user configurable by editing I<${TIN_HOMEDIR:-\"$HOME\"}/." "tin/tinrc> directly. Most of them can also be set in the GLOBAL OPTIONS MENU " @@ -3281,8 +3320,8 @@ msgid "" "don't edit the file directly whilst B is running." msgstr "" -# type: Plain text -#: ../tin.1:1431 +#. type: Plain text +#: doc/tin.1:1445 msgid "" "In the options menu use the cursor keys in the usual way to move around. Use " "B ('B<^J>' or 'BCRE>') to 'open' the option you wish " @@ -3291,8 +3330,8 @@ msgid "" "\\&'BESCE>' will abort without saving changes." msgstr "" -# type: Plain text -#: ../tin.1:1438 +#. type: Plain text +#: doc/tin.1:1452 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3301,8 +3340,8 @@ msgid "" "keeping your changes." msgstr "" -# type: Plain text -#: ../tin.1:1443 +#. type: Plain text +#: doc/tin.1:1457 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3310,1023 +3349,1024 @@ msgid "" "information see section \"ATTRIBUTES MENU AND GROUP ATTRIBUTES\"." msgstr "" -# type: Plain text -#: ../tin.1:1446 +#. type: Plain text +#: doc/tin.1:1460 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" -# type: Plain text -#: ../tin.1:1450 +#. type: Plain text +#: doc/tin.1:1464 msgid "" "Here is a full list of all the available variables. The name in braces is " "the name of the corresponding setting in I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/" "tinrc>." msgstr "" -# type: TP -#: ../tin.1:1450 +#. type: TP +#: doc/tin.1:1464 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1456 ../tin.5:1185 +#. type: Plain text +#: doc/tin.1:1470 doc/tin.5:1196 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." "readers -E n.s.readers -E n.s.r. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1456 +#. type: TP +#: doc/tin.1:1470 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1460 ../tin.5:1189 +#. type: Plain text +#: doc/tin.1:1474 doc/tin.5:1200 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1460 +#. type: TP +#: doc/tin.1:1474 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1463 ../tin.5:1192 +#. type: Plain text +#: doc/tin.1:1477 doc/tin.5:1203 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "" -# type: TP -#: ../tin.1:1463 +#. type: TP +#: doc/tin.1:1477 #, no-wrap msgid "B" -msgstr "B<Übersp. multipart/alternative-Teile (alternative_handling)>" +msgstr "B<Ãœbersp. multipart/alternative-Teile (alternative_handling)>" -# type: Plain text -#: ../tin.1:1466 ../tin.5:1195 +#. type: Plain text +#: doc/tin.1:1480 doc/tin.5:1206 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1466 +#. type: TP +#: doc/tin.1:1480 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1469 ../tin.5:1198 +#. type: Plain text +#: doc/tin.1:1483 doc/tin.5:1209 msgid "The character used to show that an article was deleted. Default is 'D'." -msgstr "Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'." +msgstr "Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'." -# type: TP -#: ../tin.1:1469 +#. type: TP +#: doc/tin.1:1483 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1472 ../tin.5:1201 +#. type: Plain text +#: doc/tin.1:1486 doc/tin.5:1212 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" -# type: TP -#: ../tin.1:1472 +#. type: TP +#: doc/tin.1:1486 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1476 ../tin.5:1205 +#. type: Plain text +#: doc/tin.1:1490 doc/tin.5:1216 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." msgstr "" -# type: TP -#: ../tin.1:1476 +#. type: TP +#: doc/tin.1:1490 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1480 ../tin.5:1209 +#. type: Plain text +#: doc/tin.1:1494 doc/tin.5:1220 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." msgstr "" -# type: TP -#: ../tin.1:1480 +#. type: TP +#: doc/tin.1:1494 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1484 ../tin.5:1213 +#. type: Plain text +#: doc/tin.1:1498 doc/tin.5:1224 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." msgstr "" -# type: TP -#: ../tin.1:1484 +#. type: TP +#: doc/tin.1:1498 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1488 +#. type: Plain text +#: doc/tin.1:1502 msgid "" "The character used to show that an article has not been read. Default is " "\\&'+'." msgstr "" -# type: TP -#: ../tin.1:1488 +#. type: TP +#: doc/tin.1:1502 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1491 ../tin.5:1220 +#. type: Plain text +#: doc/tin.1:1505 doc/tin.5:1231 msgid "The character used to show that an article was read. Default is ' '." msgstr "" -# type: TP -#: ../tin.1:1491 +#. type: TP +#: doc/tin.1:1505 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1495 ../tin.5:1224 +#. type: Plain text +#: doc/tin.1:1509 doc/tin.5:1235 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." msgstr "" -# type: TP -#: ../tin.1:1495 +#. type: TP +#: doc/tin.1:1509 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1499 ../tin.5:1228 +#. type: Plain text +#: doc/tin.1:1513 doc/tin.5:1239 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." msgstr "" -# type: TP -#: ../tin.1:1499 ../tin.5:1228 +#. type: TP +#: doc/tin.1:1513 doc/tin.5:1239 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1504 +#. type: Plain text +#: doc/tin.1:1518 msgid "" "If ON B will ask before using a MIME viewer (B) to " "display MIME messages. This only occurs if a MIME viewer is set. Default is " "OFF." msgstr "" -# type: TP -#: ../tin.1:1504 +#. type: TP +#: doc/tin.1:1518 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1508 ../tin.5:1239 +#. type: Plain text +#: doc/tin.1:1522 doc/tin.5:1250 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." msgstr "" -# type: TP -#: ../tin.1:1508 +#. type: TP +#: doc/tin.1:1522 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1512 ../tin.5:1243 +#. type: Plain text +#: doc/tin.1:1526 doc/tin.5:1254 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." msgstr "" -# type: TP -#: ../tin.1:1512 +#. type: TP +#: doc/tin.1:1526 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1515 ../tin.1:2430 +#. type: Plain text +#: doc/tin.1:1529 doc/tin.1:2479 msgid "Default is OFF." msgstr "Standard ist OFF." -# type: TP -#: ../tin.1:1515 +#. type: TP +#: doc/tin.1:1529 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1521 ../tin.5:1252 +#. type: Plain text +#: doc/tin.1:1535 doc/tin.5:1263 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " "if B is set to something other than 'No'. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1521 +#. type: TP +#: doc/tin.1:1535 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1526 ../tin.5:1257 +#. type: Plain text +#: doc/tin.1:1540 doc/tin.5:1268 msgid "" "If set ON articles/threads will be saved in batch mode when save \\&''B<-" "S>'' or mail ''B<-M>, B<-N>'' is specified on the command line. Default is " "ON." msgstr "" -# type: TP -#: ../tin.1:1526 +#. type: TP +#: doc/tin.1:1540 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1531 ../tin.5:1262 +#. type: Plain text +#: doc/tin.1:1545 doc/tin.5:1273 msgid "" "If set ON a mini menu of the most useful commands will be displayed at the " "bottom of the screen for each level. Also a short posting etiquette will be " "displayed after composing an article. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1531 +#. type: TP +#: doc/tin.1:1545 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1536 +#. type: Plain text +#: doc/tin.1:1550 msgid "" "If ON, create local copies of NNTP overview files. This can be used to " "considerably speed up accessing large groups when using a slow connection. " "See also \"INDEX FILES\". Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1536 +#. type: TP +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1542 ../tin.5:1271 +#. type: Plain text +#: doc/tin.1:1556 doc/tin.5:1282 msgid "" "If set ON the user is asked when quitting if all groups read during the " "current session should be marked read. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1542 +#. type: TP +#: doc/tin.1:1556 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1545 ../tin.5:1274 +#. type: Plain text +#: doc/tin.1:1559 doc/tin.5:1285 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" -# type: TP -#: ../tin.1:1545 +#. type: TP +#: doc/tin.1:1559 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1548 ../tin.5:1277 +#. type: Plain text +#: doc/tin.1:1562 doc/tin.5:1288 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" -# type: TP -#: ../tin.1:1548 +#. type: TP +#: doc/tin.1:1562 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1551 ../tin.5:1280 +#. type: Plain text +#: doc/tin.1:1565 doc/tin.5:1291 msgid "Color of header-lines" msgstr "Farbe der Artikelheaderzeilen" -# type: TP -#: ../tin.1:1551 +#. type: TP +#: doc/tin.1:1565 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1554 ../tin.5:1283 +#. type: Plain text +#: doc/tin.1:1568 doc/tin.5:1294 msgid "Color of help pages" msgstr "Farbe des Hilfstext" -# type: TP -#: ../tin.1:1554 +#. type: TP +#: doc/tin.1:1568 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1557 ../tin.5:1286 +#. type: Plain text +#: doc/tin.1:1571 doc/tin.5:1297 msgid "Color of background for inverse text" -msgstr "Hintergrundfarbe für inversen Text" +msgstr "Hintergrundfarbe für inversen Text" -# type: TP -#: ../tin.1:1557 +#. type: TP +#: doc/tin.1:1571 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1560 ../tin.5:1289 +#. type: Plain text +#: doc/tin.1:1574 doc/tin.5:1300 msgid "Color of foreground for inverse text" -msgstr "Vordergrundfarbe für inversen Text" +msgstr "Vordergrundfarbe für inversen Text" -# type: TP -#: ../tin.1:1560 +#. type: TP +#: doc/tin.1:1574 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1564 ../tin.5:1293 +#. type: Plain text +#: doc/tin.1:1578 doc/tin.5:1304 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1564 +#. type: TP +#: doc/tin.1:1578 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1568 ../tin.5:1297 +#. type: Plain text +#: doc/tin.1:1582 doc/tin.5:1308 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1568 +#. type: TP +#: doc/tin.1:1582 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1572 ../tin.5:1301 +#. type: Plain text +#: doc/tin.1:1586 doc/tin.5:1312 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1572 +#. type: TP +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1576 ../tin.5:1305 +#. type: Plain text +#: doc/tin.1:1590 doc/tin.5:1316 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1576 +#. type: TP +#: doc/tin.1:1590 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1579 ../tin.5:1308 +#. type: Plain text +#: doc/tin.1:1593 doc/tin.5:1319 msgid "Color of mini help menu" -msgstr "Farbe des Minihilfemenü" +msgstr "Farbe des Minihilfemenü" -# type: TP -#: ../tin.1:1579 +#. type: TP +#: doc/tin.1:1593 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1582 ../tin.5:1311 +#. type: Plain text +#: doc/tin.1:1596 doc/tin.5:1322 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" -# type: TP -#: ../tin.1:1582 +#. type: TP +#: doc/tin.1:1596 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1585 ../tin.5:1314 +#. type: Plain text +#: doc/tin.1:1599 doc/tin.5:1325 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" -# type: TP -#: ../tin.1:1585 +#. type: TP +#: doc/tin.1:1599 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1588 ../tin.5:1317 +#. type: Plain text +#: doc/tin.1:1602 doc/tin.5:1328 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" -# type: TP -#: ../tin.1:1588 +#. type: TP +#: doc/tin.1:1602 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1591 ../tin.5:1320 +#. type: Plain text +#: doc/tin.1:1605 doc/tin.5:1331 msgid "Color of twice quoted lines" msgstr "Farbe von zweifach zitierten Zeilen" -# type: TP -#: ../tin.1:1591 +#. type: TP +#: doc/tin.1:1605 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3-fach zitierten Zeilen (col_quote3)>" -# type: Plain text -#: ../tin.1:1594 ../tin.5:1323 +#. type: Plain text +#: doc/tin.1:1608 doc/tin.5:1334 msgid "Color of E=3 times quoted lines" msgstr "Farbe von =E3-fach zitierten Zeilen" -# type: TP -#: ../tin.1:1594 +#. type: TP +#: doc/tin.1:1608 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1598 +#. type: Plain text +#: doc/tin.1:1612 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." msgstr "" -# type: TP -#: ../tin.1:1598 +#. type: TP +#: doc/tin.1:1612 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1601 ../tin.5:1330 +#. type: Plain text +#: doc/tin.1:1615 doc/tin.5:1341 msgid "Color of signatures" msgstr "Farbe von Signaturen" -# type: TP -#: ../tin.1:1601 +#. type: TP +#: doc/tin.1:1615 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1604 ../tin.5:1333 +#. type: Plain text +#: doc/tin.1:1618 doc/tin.5:1344 msgid "Color of urls highlight" msgstr "Farbe der hervorgehobenen URLs" -# type: TP -#: ../tin.1:1604 +#. type: TP +#: doc/tin.1:1618 #, no-wrap msgid "B" msgstr "B" -# type: Plain text # -#: ../tin.1:1607 ../tin.5:1336 +#. type: Plain text +#: doc/tin.1:1621 doc/tin.5:1347 msgid "Color of verbatim blocks" msgstr "Farbe des wortgetreu darzustellenden Textes" -# type: TP -#: ../tin.1:1607 +#. type: TP +#: doc/tin.1:1621 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1610 ../tin.5:1339 +#. type: Plain text +#: doc/tin.1:1624 doc/tin.5:1350 msgid "Color of article subject" msgstr "Farbe der Subjectzeile" -# type: TP -#: ../tin.1:1610 +#. type: TP +#: doc/tin.1:1624 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1613 ../tin.5:1342 +#. type: Plain text +#: doc/tin.1:1627 doc/tin.5:1353 msgid "Color of text-lines" msgstr "Farbe der Textzeilen" -# type: TP -#: ../tin.1:1613 +#. type: TP +#: doc/tin.1:1627 #, no-wrap msgid "B" msgstr "B" -# type: Plain text -#: ../tin.1:1616 ../tin.5:1345 +#. type: Plain text +#: doc/tin.1:1630 doc/tin.5:1356 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichens" -# type: TP -#: ../tin.1:1616 +#. type: TP +#: doc/tin.1:1630 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" -# type: Plain text -#: ../tin.1:1619 +#. type: Plain text +#: doc/tin.1:1633 msgid "Ask for manual confirmation to protect the user." msgstr "" -# type: IP -#: ../tin.1:1620 ../tin.1:1626 ../tin.1:1630 +#. type: IP +#: doc/tin.1:1634 doc/tin.1:1640 doc/tin.1:1644 #, no-wrap msgid "\\(bu" msgstr "\\(bu" -# type: Plain text #. TODO: check if all affected commands are marked [after confirmation] -#: ../tin.1:1626 +#. type: Plain text +#: doc/tin.1:1640 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " "manual with '[after confirmation]'. Default is commands & quit." msgstr "" -# type: Plain text -#: ../tin.1:1630 +#. type: Plain text +#: doc/tin.1:1644 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." msgstr "" -# type: Plain text -#: ../tin.1:1634 +#. type: Plain text +#: doc/tin.1:1648 msgid "" "B Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." @@ -4376,85 +4415,84 @@ msgstr "" "B Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" -# type: TP -#: ../tin.1:1635 +#. type: TP +#: doc/tin.1:1649 #, no-wrap msgid "B" msgstr "" @@ -3845,394 +3874,394 @@ msgstr "" # #. most of these default_* settings are not available from the menu #. as they are intended for internal use only. -# type: Plain text -#: ../tin.1:1647 +#. type: Plain text +#: doc/tin.1:1661 msgid "" "Format string B uses for date representation. A description of the " -"different format options can be found at B(3). B uses " -"B(3) when available and supports most format options in his " +"different format options can be found at B<\\%strftime>(3). B uses " +"B<\\%strftime>(3) when available and supports most format options in his " "fallback code. Default is \"%a, %d %b %Y %H:%M:%S\"." msgstr "" -# type: TP -#: ../tin.1:1647 +#. type: TP +#: doc/tin.1:1661 #, no-wrap msgid "B<(default_art_search)>" msgstr "" -# type: TP -#: ../tin.1:1649 +#. type: TP +#: doc/tin.1:1663 #, no-wrap msgid "B<(default_author_search)>" msgstr "" -# type: TP -#: ../tin.1:1651 +#. type: TP +#: doc/tin.1:1665 #, no-wrap msgid "B<(default_config_search)>" msgstr "" -# type: Plain text -#: ../tin.1:1654 ../tin.5:1384 +#. type: Plain text +#: doc/tin.1:1668 doc/tin.5:1395 msgid "The last article/author/config option that was searched for." msgstr "" -# type: TP -#: ../tin.1:1654 +#. type: TP +#: doc/tin.1:1668 #, no-wrap msgid "B<(default_filter_days)>" msgstr "" -# type: Plain text -#: ../tin.1:1657 ../tin.5:1387 +#. type: Plain text +#: doc/tin.1:1671 doc/tin.5:1398 msgid "Default is 28." msgstr "" -# type: TP -#: ../tin.1:1657 +#. type: TP +#: doc/tin.1:1671 #, no-wrap msgid "B<(default_filter_kill_case)>" msgstr "" -# type: Plain text -#: ../tin.1:1661 +#. type: Plain text +#: doc/tin.1:1675 msgid "" "Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF " "= ignore case. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1661 +#. type: TP +#: doc/tin.1:1675 #, no-wrap msgid "B<(default_filter_kill_expire)>" msgstr "" -# type: Plain text -#: ../tin.1:1666 +#. type: Plain text +#: doc/tin.1:1680 msgid "" "Default for quick (1 key) kill filter expire. ON = limit to " "B, OFF = don't ever expire. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1666 +#. type: TP +#: doc/tin.1:1680 #, no-wrap msgid "B<(default_filter_kill_global)>" msgstr "" -# type: Plain text -#: ../tin.1:1670 +#. type: Plain text +#: doc/tin.1:1684 msgid "" "Default for quick (1 key) kill filter global. ON=apply to all groups, " "OFF=apply to current group. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1670 +#. type: TP +#: doc/tin.1:1684 #, no-wrap msgid "B<(default_filter_kill_header)>" msgstr "" -# type: Plain text -#: ../tin.1:1673 ../tin.5:1402 +#. type: Plain text +#: doc/tin.1:1687 doc/tin.5:1413 msgid "Default for quick (1 key) kill filter header." msgstr "" -# type: IP -#: ../tin.1:1674 ../tin.1:1708 ../tin.1:1839 ../tin.1:2009 ../tin.1:2052 ../tin.1:2164 ../tin.1:2190 ../tin.1:2241 ../tin.1:2271 ../tin.1:2342 ../tin.1:2370 ../tin.1:2390 ../tin.1:2478 ../tin.5:1555 ../tin.5:1744 ../tin.5:1793 ../tin.5:1924 ../tin.5:1950 ../tin.5:2003 ../tin.5:2032 ../tin.5:2113 ../tin.5:2133 ../tin.5:2229 +#. type: IP +#: doc/tin.1:1688 doc/tin.1:1722 doc/tin.1:1857 doc/tin.1:2033 doc/tin.1:2079 doc/tin.1:2195 doc/tin.1:2220 doc/tin.1:2235 doc/tin.1:2286 doc/tin.1:2316 doc/tin.1:2387 doc/tin.1:2419 doc/tin.1:2439 doc/tin.1:2527 doc/tin.5:1586 doc/tin.5:1780 doc/tin.5:1830 doc/tin.5:1975 doc/tin.5:1990 doc/tin.5:2016 doc/tin.5:2069 doc/tin.5:2098 doc/tin.5:2199 doc/tin.5:2219 doc/tin.5:2315 #, no-wrap msgid "0" msgstr "" -# type: Plain text -#: ../tin.1:1676 ../tin.1:1710 +#. type: Plain text +#: doc/tin.1:1690 doc/tin.1:1724 #, no-wrap msgid " ''Subject:'' (case sensitive)\n" msgstr "" -# type: IP -#: ../tin.1:1676 ../tin.1:1710 ../tin.1:1845 ../tin.1:2011 ../tin.1:2054 ../tin.1:2166 ../tin.1:2192 ../tin.1:2243 ../tin.1:2273 ../tin.1:2344 ../tin.1:2372 ../tin.1:2392 ../tin.1:2480 ../tin.5:1562 ../tin.5:1746 ../tin.5:1795 ../tin.5:1844 ../tin.5:1926 ../tin.5:1952 ../tin.5:2005 ../tin.5:2034 ../tin.5:2115 ../tin.5:2135 ../tin.5:2231 +#. type: IP +#: doc/tin.1:1690 doc/tin.1:1724 doc/tin.1:1863 doc/tin.1:2035 doc/tin.1:2081 doc/tin.1:2197 doc/tin.1:2224 doc/tin.1:2237 doc/tin.1:2288 doc/tin.1:2318 doc/tin.1:2389 doc/tin.1:2421 doc/tin.1:2441 doc/tin.1:2529 doc/tin.5:1593 doc/tin.5:1782 doc/tin.5:1832 doc/tin.5:1881 doc/tin.5:1979 doc/tin.5:1992 doc/tin.5:2018 doc/tin.5:2071 doc/tin.5:2100 doc/tin.5:2201 doc/tin.5:2221 doc/tin.5:2317 #, no-wrap msgid "1" msgstr "" -# type: Plain text -#: ../tin.1:1678 ../tin.1:1712 +#. type: Plain text +#: doc/tin.1:1692 doc/tin.1:1726 #, no-wrap msgid " ''Subject:'' (ignore case)\n" msgstr "" -# type: IP -#: ../tin.1:1678 ../tin.1:1712 ../tin.1:1850 ../tin.1:2013 ../tin.1:2058 ../tin.1:2169 ../tin.1:2196 ../tin.1:2245 ../tin.1:2276 ../tin.1:2346 ../tin.1:2374 ../tin.1:2394 ../tin.1:2482 ../tin.5:1567 ../tin.5:1748 ../tin.5:1800 ../tin.5:1848 ../tin.5:1929 ../tin.5:1956 ../tin.5:2007 ../tin.5:2037 ../tin.5:2117 ../tin.5:2137 ../tin.5:2233 +#. type: IP +#: doc/tin.1:1692 doc/tin.1:1726 doc/tin.1:1868 doc/tin.1:2037 doc/tin.1:2085 doc/tin.1:2200 doc/tin.1:2241 doc/tin.1:2290 doc/tin.1:2321 doc/tin.1:2391 doc/tin.1:2423 doc/tin.1:2443 doc/tin.1:2531 doc/tin.5:1598 doc/tin.5:1784 doc/tin.5:1837 doc/tin.5:1885 doc/tin.5:1995 doc/tin.5:2022 doc/tin.5:2073 doc/tin.5:2103 doc/tin.5:2203 doc/tin.5:2223 doc/tin.5:2319 #, no-wrap msgid "2" msgstr "" -# type: Plain text -#: ../tin.1:1680 ../tin.1:1714 +#. type: Plain text +#: doc/tin.1:1694 doc/tin.1:1728 #, no-wrap msgid " ''From:'' (case sensitive)\n" msgstr "" -# type: IP -#: ../tin.1:1680 ../tin.1:1714 ../tin.1:2015 ../tin.1:2172 ../tin.1:2200 ../tin.1:2247 ../tin.1:2278 ../tin.1:2348 ../tin.1:2396 ../tin.5:1750 ../tin.5:1932 ../tin.5:1960 ../tin.5:2009 ../tin.5:2039 ../tin.5:2139 +#. type: IP +#: doc/tin.1:1694 doc/tin.1:1728 doc/tin.1:2039 doc/tin.1:2203 doc/tin.1:2245 doc/tin.1:2292 doc/tin.1:2323 doc/tin.1:2393 doc/tin.1:2445 doc/tin.5:1786 doc/tin.5:1998 doc/tin.5:2026 doc/tin.5:2075 doc/tin.5:2105 doc/tin.5:2225 #, no-wrap msgid "3" msgstr "" -# type: Plain text -#: ../tin.1:1682 ../tin.1:1716 +#. type: Plain text +#: doc/tin.1:1696 doc/tin.1:1730 #, no-wrap msgid " ''From:'' (ignore case)\n" msgstr "" -# type: IP -#: ../tin.1:1682 ../tin.1:1716 ../tin.1:2017 ../tin.1:2249 ../tin.1:2280 ../tin.1:2351 ../tin.1:2398 ../tin.5:1752 ../tin.5:1854 ../tin.5:2011 ../tin.5:2041 ../tin.5:2141 +#. type: IP +#: doc/tin.1:1696 doc/tin.1:1730 doc/tin.1:2041 doc/tin.1:2294 doc/tin.1:2325 doc/tin.1:2396 doc/tin.1:2447 doc/tin.5:1788 doc/tin.5:1891 doc/tin.5:2077 doc/tin.5:2107 doc/tin.5:2227 #, no-wrap msgid "4" msgstr "" -# type: Plain text -#: ../tin.1:1684 ../tin.1:1718 +#. type: Plain text +#: doc/tin.1:1698 doc/tin.1:1732 #, no-wrap msgid " ''Message-ID:'' & full ''References:'' line\n" msgstr "" -# type: IP -#: ../tin.1:1684 ../tin.1:1718 ../tin.1:2251 ../tin.1:2353 ../tin.1:2401 ../tin.5:2013 ../tin.5:2144 +#. type: IP +#: doc/tin.1:1698 doc/tin.1:1732 doc/tin.1:2296 doc/tin.1:2398 doc/tin.1:2450 doc/tin.5:2079 doc/tin.5:2230 #, no-wrap msgid "5" msgstr "" -# type: Plain text -#: ../tin.1:1686 ../tin.1:1720 +#. type: Plain text +#: doc/tin.1:1700 doc/tin.1:1734 #, no-wrap msgid " ''Message-ID:'' & last ''References:'' entry only\n" msgstr "" -# type: IP -#: ../tin.1:1686 ../tin.1:1720 ../tin.1:2253 ../tin.1:2403 ../tin.5:2015 ../tin.5:2146 +#. type: IP +#: doc/tin.1:1700 doc/tin.1:1734 doc/tin.1:2298 doc/tin.1:2452 doc/tin.5:2081 doc/tin.5:2232 #, no-wrap msgid "6" msgstr "" -# type: Plain text -#: ../tin.1:1688 ../tin.1:1722 +#. type: Plain text +#: doc/tin.1:1702 doc/tin.1:1736 #, no-wrap msgid " ''Message-ID:'' entry only\n" msgstr "" -# type: IP -#: ../tin.1:1688 ../tin.1:1722 ../tin.1:2256 ../tin.1:2405 ../tin.5:2018 ../tin.5:2148 +#. type: IP +#: doc/tin.1:1702 doc/tin.1:1736 doc/tin.1:2301 doc/tin.1:2454 doc/tin.5:2084 doc/tin.5:2234 #, no-wrap msgid "7" msgstr "" -# type: Plain text -#: ../tin.1:1690 ../tin.1:1724 +#. type: Plain text +#: doc/tin.1:1704 doc/tin.1:1738 #, no-wrap msgid " ''Lines:''\n" msgstr "" -# type: TP -#: ../tin.1:1691 +#. type: TP +#: doc/tin.1:1705 #, no-wrap msgid "B<(default_filter_select_case)>" msgstr "" -# type: Plain text -#: ../tin.1:1695 ../tin.5:1419 +#. type: Plain text +#: doc/tin.1:1709 doc/tin.5:1430 msgid "" "Default for quick (1 key) auto-selection filter case. ON=filter case " "sensitive, OFF=ignore case. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1695 +#. type: TP +#: doc/tin.1:1709 #, no-wrap msgid "B<(default_filter_select_expire)>" msgstr "" -# type: Plain text -#: ../tin.1:1700 +#. type: Plain text +#: doc/tin.1:1714 msgid "" "Default for quick (1 key) auto-selection filter expire. ON = limit to " "B, OFF = don't ever expire. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1700 +#. type: TP +#: doc/tin.1:1714 #, no-wrap msgid "B<(default_filter_select_global)>" msgstr "" -# type: Plain text -#: ../tin.1:1704 +#. type: Plain text +#: doc/tin.1:1718 msgid "" "Default for quick (1 key) auto-selection filter global. ON=apply to all " "groups OFF=apply to current group. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1704 +#. type: TP +#: doc/tin.1:1718 #, no-wrap msgid "B<(default_filter_select_header)>" msgstr "" -# type: Plain text -#: ../tin.1:1707 ../tin.5:1430 +#. type: Plain text +#: doc/tin.1:1721 doc/tin.5:1441 msgid "Default for quick (1 key) auto-selection filter header." msgstr "" -# type: TP -#: ../tin.1:1725 +#. type: TP +#: doc/tin.1:1739 #, no-wrap msgid "B<(default_goto_group)>" msgstr "" -# type: TP -#: ../tin.1:1727 +#. type: TP +#: doc/tin.1:1741 #, no-wrap msgid "B<(default_group_search)>" msgstr "" -# type: TP -#: ../tin.1:1729 +#. type: TP +#: doc/tin.1:1743 #, no-wrap msgid "B<(default_mail_address)>" msgstr "" -# type: TP -#: ../tin.1:1731 +#. type: TP +#: doc/tin.1:1745 #, no-wrap msgid "B<(default_move_group)>" msgstr "" -# type: TP -#: ../tin.1:1733 +#. type: TP +#: doc/tin.1:1747 #, no-wrap msgid "B<(default_pattern)>" msgstr "" -# type: TP -#: ../tin.1:1735 +#. type: TP +#: doc/tin.1:1749 #, no-wrap msgid "B<(default_pipe_command)>" msgstr "" -# type: TP -#: ../tin.1:1737 +#. type: TP +#: doc/tin.1:1751 #, no-wrap msgid "B<(default_post_newsgroups)>" msgstr "" -# type: TP -#: ../tin.1:1739 +#. type: TP +#: doc/tin.1:1753 #, no-wrap msgid "B<(default_post_subject)>" msgstr "" -# type: TP -#: ../tin.1:1741 +#. type: TP +#: doc/tin.1:1755 #, no-wrap msgid "B<(default_range_group)>" msgstr "" -# type: TP -#: ../tin.1:1743 +#. type: TP +#: doc/tin.1:1757 #, no-wrap msgid "B<(default_range_select)>" msgstr "" -# type: TP -#: ../tin.1:1745 +#. type: TP +#: doc/tin.1:1759 #, no-wrap msgid "B<(default_range_thread)>" msgstr "" -# type: TP -#: ../tin.1:1747 +#. type: TP +#: doc/tin.1:1761 #, no-wrap msgid "B<(default_repost_group)>" msgstr "" -# type: TP -#: ../tin.1:1749 +#. type: TP +#: doc/tin.1:1763 #, no-wrap msgid "B<(default_save_file)>" msgstr "" -# type: TP -#: ../tin.1:1751 +#. type: TP +#: doc/tin.1:1765 #, no-wrap msgid "B<(default_save_mode)>" msgstr "" -# type: TP -#: ../tin.1:1753 +#. type: TP +#: doc/tin.1:1767 #, no-wrap msgid "B<(default_select_pattern)>" msgstr "" -# type: TP -#: ../tin.1:1755 +#. type: TP +#: doc/tin.1:1769 #, no-wrap msgid "B<(default_shell_command)>" msgstr "" -# type: TP -#: ../tin.1:1757 +#. type: TP +#: doc/tin.1:1771 #, no-wrap msgid "B<(default_subject_search)>" msgstr "" -# type: TP -#: ../tin.1:1759 +#. type: TP +#: doc/tin.1:1773 #, no-wrap msgid "B instead of highlighted bar (draw_arrow)>" msgstr "" -# type: Plain text -#: ../tin.1:1763 +#. type: Plain text +#: doc/tin.1:1777 msgid "" "Allows groups/articles to be selected by an arrow '-E' if set ON or by " "an highlighted bar if set OFF. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1763 +#. type: TP +#: doc/tin.1:1777 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1767 +#. type: Plain text +#: doc/tin.1:1781 msgid "" "The format string used to create the editor start command with parameters. " "Default is \"%E +%N %F\" (i.e., /bin/vi +7 .article)." msgstr "" -# type: TP -#: ../tin.1:1767 +#. type: TP +#: doc/tin.1:1781 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1771 ../tin.5:1490 +#. type: Plain text +#: doc/tin.1:1785 doc/tin.5:1501 msgid "" "Specifies whether a screen redraw should always be done after certain " "external commands. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1771 +#. type: TP +#: doc/tin.1:1785 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1777 +#. type: Plain text +#: doc/tin.1:1791 msgid "" "If B is E 0 not more than B articles/group " "are fetched from the server. If B is E 0 B will start " @@ -4240,55 +4269,69 @@ msgid "" "B. Default is 0, which means no limit." msgstr "" -# type: TP -#: ../tin.1:1777 +#. type: TP +#: doc/tin.1:1791 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1780 ../tin.5:1508 +#. type: Plain text +#: doc/tin.1:1794 doc/tin.5:1519 msgid "If ON catchup group when leaving with the left arrow key. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1780 +#. type: TP +#: doc/tin.1:1794 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1798 +msgid "" +"Format string tin uses for Group level representation. See the section " +"\"CUSTOMIZING THE SCREEN FORMAT\". Default is \"%n\\ %m\\ %R\\ %L\\ \\ %s\\ " +"\\ %F\"." +msgstr "" + +#. type: TP +#: doc/tin.1:1798 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1788 ../tin.5:1505 +#. type: Plain text +#: doc/tin.1:1806 doc/tin.5:1516 msgid "" "Which keys B should accept to jump to the next unread article. " "Possible is any combination of B and B. When " "B is set B jumps to the next article at the end of the " "current one. When B is set B jumps immediately to the " "next article when B ('BTABE>') is " -"pressed. Default is PageNextUnread." +"pressed. Default is B." msgstr "" -# type: TP -#: ../tin.1:1788 +#. type: TP +#: doc/tin.1:1806 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1792 ../tin.5:1512 +#. type: Plain text +#: doc/tin.1:1810 doc/tin.5:1543 msgid "" "Maximum length of the names of newsgroups to be displayed so that more of " "the newsgroup description can be displayed. Default is 32." msgstr "" -# type: TP -#: ../tin.1:1792 +#. type: TP +#: doc/tin.1:1810 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1801 +#. type: Plain text +#: doc/tin.1:1819 msgid "" "If set to 'No' then raw uuencoded data is displayed. If set to 'Yes' then " "sections of uuencoded data will be shown with a single tag line showing the " @@ -4299,30 +4342,30 @@ msgid "" "toggled in the article viewer. Default is 'No'." msgstr "" -# type: TP -#: ../tin.1:1801 +#. type: TP +#: doc/tin.1:1819 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1808 +#. type: Plain text +#: doc/tin.1:1826 msgid "" -"Path, name and options of external B(1). If you are reading via NNTP " -"the default value is --internal (use built-in NNTP inews), else it is " +"Path, name and options of external B<\\%inews>(1). If you are reading via " +"NNTP the default value is --internal (use built-in NNTP inews), else it is " "\"inews -h\". The article is passed to B on STDIN via 'E " "article'." msgstr "" -# type: TP -#: ../tin.1:1808 +#. type: TP +#: doc/tin.1:1826 #, no-wrap msgid "B<(info_in_last_line)>" msgstr "" #. this is missing from the Menu -# type: Plain text -#: ../tin.1:1815 +#. type: Plain text +#: doc/tin.1:1833 msgid "" "If ON, show current group description or article subject in the last line " "(not in the pager and global menu) - B ('B') toggles " @@ -4330,14 +4373,14 @@ msgid "" "available to display long subjects. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1815 +#. type: TP +#: doc/tin.1:1833 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1822 +#. type: Plain text +#: doc/tin.1:1840 msgid "" "Interactive mailreader: if greater than 0 your mailreader will be invoked " "earlier for reply so you can use more of its features (e.g. MIME, pgp, " @@ -4349,48 +4392,48 @@ msgstr "" #. TODO: fix menu description #. mono_mark* currently do allow "Reverse video" even if #. inverse_okay=FALSE -# type: TP -#: ../tin.1:1822 +#. type: TP +#: doc/tin.1:1840 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1829 ../tin.5:1545 +#. type: Plain text +#: doc/tin.1:1847 doc/tin.5:1576 msgid "" "If ON use inverse video for page headers and URL highlighting. Default is " "ON." msgstr "" -# type: TP -#: ../tin.1:1829 +#. type: TP +#: doc/tin.1:1847 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1834 ../tin.5:1550 +#. type: Plain text +#: doc/tin.1:1852 doc/tin.5:1581 msgid "" "If ON keep all failed postings in I<${TIN_HOMEDIR:-\"$HOME\"}/dead.articles> " "besides keeping the last failed posting in " "I<${TIN_HOMEDIR:-\"$HOME\"}/dead.article>. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1834 +#. type: TP +#: doc/tin.1:1852 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1838 +#. type: Plain text +#: doc/tin.1:1856 msgid "" "This option controls the processing and display of articles that are " "killed. There are 3 options:" msgstr "" -# type: Plain text -#: ../tin.1:1845 +#. type: Plain text +#: doc/tin.1:1863 msgid "" "B is the 'traditional' behavior of B. Only " "unread articles are killed once only by marking them read. As filtering only " @@ -4399,8 +4442,8 @@ msgid "" "group the mark will be gone." msgstr "" -# type: Plain text -#: ../tin.1:1850 ../tin.5:1567 +#. type: Plain text +#: doc/tin.1:1868 doc/tin.5:1598 msgid "" "B will process all articles in the group and " "therefore there is a processing overhead when using this option. Killed " @@ -4408,112 +4451,114 @@ msgid "" "B." msgstr "" -# type: Plain text -#: ../tin.1:1854 ../tin.5:1571 +#. type: Plain text +#: doc/tin.1:1872 doc/tin.5:1602 msgid "" "B will process all articles in the group and " "therefore there is a processing overhead when using this option. Killed " "articles simply does not get displayed at all." msgstr "" -# type: Plain text -#: ../tin.1:1856 +#. type: Plain text +#: doc/tin.1:1874 msgid "Default is 0 (B)." msgstr "" -# type: TP -#: ../tin.1:1856 +#. type: TP +#: doc/tin.1:1874 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1862 ../tin.5:1578 +#. type: Plain text +#: doc/tin.1:1880 msgid "" "Allows 8bit characters unencoded in the header of mail message. Default is " "OFF. Turning it ON is effective only if B is also set to " "8bit. Leaving it OFF is safe for most users and compliant to Internet Mail " -"Standard (B and B). Default is OFF." +"Standard (B and B ). Default is OFF." msgstr "" -# type: TP -#: ../tin.1:1862 +#. type: TP +#: doc/tin.1:1880 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1868 ../tin.5:1584 +#. type: Plain text +#: doc/tin.1:1886 doc/tin.5:1615 msgid "" "User's mail address (and full name), if not username@host. This is used when " -"creating articles, sending mail and when B(1) signing." +"creating articles, sending mail and when B<\\%pgp>(1) signing." msgstr "" -# type: TP -#: ../tin.1:1868 +#. type: TP +#: doc/tin.1:1886 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1872 ../tin.5:1588 +#. type: Plain text +#: doc/tin.1:1890 doc/tin.5:1619 msgid "" "MIME encoding of the body in mail message, if necessary (8bit, base64, " "quoted-printable, 7bit). Default is quoted-printable." msgstr "" -# type: TP -#: ../tin.1:1872 +#. type: TP +#: doc/tin.1:1890 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1877 ../tin.5:1593 +#. type: Plain text +#: doc/tin.1:1895 doc/tin.5:1624 msgid "" "Format of quote line when replying (via mail) to an article (%A=Address, " "%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, " "%C=Firstname, %I=Initials). Default is \"In article %M you wrote:\"" msgstr "" -# type: TP -#: ../tin.1:1877 +#. type: TP +#: doc/tin.1:1895 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1885 +#. type: Plain text +#: doc/tin.1:1905 doc/tin.5:1634 msgid "" -"Select one of the following mailbox-formats: MBOXO (default, except for " -"SCO), MBOXRD or MMDF (default on SCO). See B(5) for more details on " -"MBOXO and MBOXRD and B(5) for more details about MMDF." +"Select one of the following mailbox-formats: MBOXO (default, except on SCO), " +"MBOXRD or MMDF (default on SCO). See B<\\%mbox>(5) and B for " +"more details on MBOXO and MBOXRD and B<\\%mmdf>(5) for more details about " +"MMDF." msgstr "" -# type: TP -#: ../tin.1:1885 +#. type: TP +#: doc/tin.1:1905 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1894 +#. type: Plain text +#: doc/tin.1:1914 msgid "" -"The directory where articles/threads are to be saved in B(5) " -"format. This feature is mainly for use with the B(1) mail program. It " -"allows the user to save articles/threads/groups simply by giving '=' as the " -"filename to save to. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." +"The directory where articles/threads are to be saved in B<\\%mbox>(5) " +"format. This feature is mainly for use with the B<\\%elm>(1) mail " +"program. It allows the user to save articles/threads/groups simply by giving " +"'=' as the filename to save to. Default is " +"I<${TIN_HOMEDIR:-\"$HOME\"}/Mail>." msgstr "" -# type: TP -#: ../tin.1:1894 +#. type: TP +#: doc/tin.1:1914 #, no-wrap msgid "B" msgstr "" #. TODO: document %S, %T, %M, %F, %U ... -# type: Plain text -#: ../tin.1:1903 +#. type: Plain text +#: doc/tin.1:1923 msgid "" "The format string used to create the mailer command with parameters that is " "used for mailing articles to other people. Default is '%M \"%T\" E %F' " @@ -4524,14 +4569,14 @@ msgid "" "E .article)." msgstr "" -# type: TP -#: ../tin.1:1903 +#. type: TP +#: doc/tin.1:1923 #, no-wrap msgid "B<'Mark as (un)read' ignores tags (mark_ignore_tags)>" msgstr "" -# type: Plain text -#: ../tin.1:1911 ../tin.5:1647 +#. type: Plain text +#: doc/tin.1:1931 doc/tin.5:1680 msgid "" "When this is ON, the B ('B'), B " "('B'), B ('B') at Group level and B " @@ -4541,42 +4586,42 @@ msgid "" "unread articles, or nothing." msgstr "" -# type: TP -#: ../tin.1:1911 +#. type: TP +#: doc/tin.1:1931 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1914 ../tin.5:1639 +#. type: Plain text +#: doc/tin.1:1934 doc/tin.5:1672 msgid "If ON mark articles that are saved as read. Default is ON." msgstr "" -# type: TP -#: ../tin.1:1914 +#. type: TP +#: doc/tin.1:1934 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1926 +#. type: Plain text +#: doc/tin.1:1946 msgid "" -"Path, name and options of external B(1) program used to view " +"Path, name and options of external B<\\%metamail>(1) program used to view " "non-textual parts of articles. To use the built-in viewer, set to " -"--internal. This is the default value when B(1) is not " +"--internal. This is the default value when B<\\%metamail>(1) is not " "installed. Leave it blank if you don't want any automatic viewing of " "non-textual attachments. The 'V' command can always be used to manually view " "any attachments. See also B." msgstr "" -# type: TP -#: ../tin.1:1926 +#. type: TP +#: doc/tin.1:1946 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1939 +#. type: Plain text +#: doc/tin.1:1959 msgid "" "Charset supported locally, which is also used for MIME header (charset " "parameter and charset name in header encoding) in mail and news postings. If " @@ -4585,120 +4630,120 @@ msgid "" "represented as '?'. Otherwise, all character sets are regarded as compatible " "with the display. If it's not set, the value of the environment variable " "$B is used. US-ASCII or compile-time default is used in case " -"neither of them is defined. If your system supports B(3), this option " -"is disabled and you should use B instead." +"neither of them is defined. If your system supports B<\\%iconv>(3), this " +"option is disabled and you should use B instead." msgstr "" -# type: TP -#: ../tin.1:1939 +#. type: TP +#: doc/tin.1:1959 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1950 +#. type: Plain text +#: doc/tin.1:1970 msgid "" "Charset used for posting and MIME headers; replaces B. " "Conversion between B and local charset (determined via " -"B(3)) is done via B(3), if this function is not " +"B<\\%nl_langinfo>(3)) is done via B<\\%iconv>(3), if this function is not " "available on your system this option is disabled and you have to use " "B instead. B is limited to one of the " "following charsets:" msgstr "" -# type: Plain text -#: ../tin.1:1953 ../tin.5:1686 +#. type: Plain text +#: doc/tin.1:1973 doc/tin.5:1719 msgid "" "US-ASCII, ISO-8859-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8-{R,U,RU} " "EUC-{CN,JP,KR,TW}, ISO-2022-{CN,CN-EXT,JP,JP-1,JP-2}, Big5, UTF-8" msgstr "" -# type: Plain text -#: ../tin.1:1959 ../tin.5:1692 +#. type: Plain text +#: doc/tin.1:1979 doc/tin.5:1725 msgid "" -"Not all values might work on your system, see B(3) for more " +"Not all values might work on your system, see B<\\%iconv_open>(3) for more " "details. If it's not set, the value of the environment variable " "$B is used. US-ASCII or compile-time default is used in case " "neither of them is defined." msgstr "" -# type: TP -#: ../tin.1:1959 +#. type: TP +#: doc/tin.1:1979 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1964 +#. type: Plain text +#: doc/tin.1:1984 msgid "" "Character attribute of words emphasized like _this_. It depends on your " "terminal which attributes are usable. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1964 +#. type: TP +#: doc/tin.1:1984 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1969 +#. type: Plain text +#: doc/tin.1:1989 msgid "" "Character attribute of words emphasized like /this/. It depends on your " "terminal which attributes are usable. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1969 +#. type: TP +#: doc/tin.1:1989 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1974 +#. type: Plain text +#: doc/tin.1:1994 msgid "" "Character attribute of words emphasized like *this*. It depends on your " "terminal which attributes are usable. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1974 +#. type: TP +#: doc/tin.1:1994 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1979 +#. type: Plain text +#: doc/tin.1:1999 msgid "" "Character attribute of words emphasized like -this-. It depends on your " "terminal which attributes are usable. See also B and " "B." msgstr "" -# type: TP -#: ../tin.1:1979 +#. type: TP +#: doc/tin.1:1999 #, no-wrap msgid "B<(newnews)>" msgstr "" -# type: Plain text -#: ../tin.1:1983 +#. type: Plain text +#: doc/tin.1:2003 msgid "" "These are internal timers used by B to keep track of new newsgroups. " "Do not change them unless you understand what they are for." msgstr "" -# type: TP -#: ../tin.1:1983 +#. type: TP +#: doc/tin.1:2003 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1990 +#. type: Plain text +#: doc/tin.1:2010 msgid "" "Which news headers you wish to see. If you want to see _all_ the headers, " "place an '*' as this value. This is the only way a wildcard can be used. If " @@ -4707,14 +4752,14 @@ msgid "" "spaces. Not defining anything turns off this option." msgstr "" -# type: TP -#: ../tin.1:1990 +#. type: TP +#: doc/tin.1:2010 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:1999 +#. type: Plain text +#: doc/tin.1:2019 msgid "" "Same as B except it denotes the opposite. An " "example of using both options might be if you thought X- headers were A Good " @@ -4724,86 +4769,99 @@ msgid "" "off this option." msgstr "" -# type: TP -#: ../tin.1:1999 +#. type: TP +#: doc/tin.1:2019 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2004 ../tin.5:1739 +#. type: Plain text +#: doc/tin.1:2024 doc/tin.5:1772 msgid "" "Format of quote line when posting/following up an article (%A=Address, " "%D=Date, %F=Fullname+Address, %G=Groupname, %M=Message-ID, %N=Fullname, " "%C=Firstname, %I=Initials). Default is \"%F wrote:\"." msgstr "" -# type: TP -#: ../tin.1:2004 +#. type: TP +#: doc/tin.1:2024 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2028 +msgid "" +"Time in seconds to wait for a response from the server. Default is 120. " +"Setting this to 0 means no timeout." +msgstr "" + +#. type: TP +#: doc/tin.1:2028 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2008 +#. type: Plain text +#: doc/tin.1:2032 msgid "" "The normalization form B should use to normalize unicode input. The " "possible values are:" msgstr "" -# type: Plain text -#: ../tin.1:2011 ../tin.5:1746 +#. type: Plain text +#: doc/tin.1:2035 doc/tin.5:1782 msgid "B: no normalization" msgstr "" -# type: Plain text -#: ../tin.1:2013 ../tin.5:1748 +#. type: Plain text +#: doc/tin.1:2037 doc/tin.5:1784 msgid "B: Compatibility Decomposition, followed by Canonical Composition" msgstr "" -# type: Plain text -#: ../tin.1:2015 ../tin.5:1750 +#. type: Plain text +#: doc/tin.1:2039 doc/tin.5:1786 msgid "B: Compatibility Decomposition" msgstr "" -# type: Plain text -#: ../tin.1:2017 ../tin.5:1752 +#. type: Plain text +#: doc/tin.1:2041 doc/tin.5:1788 msgid "B: Canonical Decomposition, followed by Canonical Composition" msgstr "" -# type: Plain text -#: ../tin.1:2019 ../tin.5:1754 +#. type: Plain text +#: doc/tin.1:2043 doc/tin.5:1790 msgid "B: Canonical Decomposition" msgstr "" -# type: Plain text -#: ../tin.1:2022 +#. type: Plain text +#: doc/tin.1:2047 msgid "" "Some normalization modes are only available if they are supported by the " -"library B uses to do the normalization. Default is NFKC." +"library B uses to do the normalization. NFC should be used if possible." msgstr "" -# type: TP -#: ../tin.1:2022 +#. type: TP +#: doc/tin.1:2047 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2026 +#. type: Plain text +#: doc/tin.1:2051 msgid "" "If ON put cursor at first unread article in group otherwise at last " "article. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2026 +#. type: TP +#: doc/tin.1:2051 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2037 ../tin.5:1774 +#. type: Plain text +#: doc/tin.1:2062 doc/tin.5:1810 msgid "" "Allows 8bit characters unencoded in the header of a news article, if set " "this also disables the generation of MIME-headers when they are usually " @@ -4815,153 +4873,153 @@ msgid "" "B." msgstr "" -# type: TP -#: ../tin.1:2037 +#. type: TP +#: doc/tin.1:2062 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2042 +#. type: Plain text +#: doc/tin.1:2067 msgid "" "MIME encoding of the body in news message, if necessary. (8bit, base64, " "quoted-printable, 7bit). Default is 8bit, which leads to no encoding. base64 " "and quoted-printable are usually undesired on usenet." msgstr "" -# type: TP -#: ../tin.1:2042 +#. type: TP +#: doc/tin.1:2067 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2047 +#. type: Plain text +#: doc/tin.1:2074 msgid "" "If ON, then B will start an appropriate viewer program to display any " "files that were post processed and uudecoded. The program is determined " -"using the mailcap file. Default is ON." +"using the B<\\%mailcap>(5) file. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2047 +#. type: TP +#: doc/tin.1:2074 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2051 +#. type: Plain text +#: doc/tin.1:2078 msgid "" "This specifies whether to perform post processing on saved articles. The " "following values are allowed:" msgstr "" -# type: Plain text -#: ../tin.1:2054 ../tin.5:1795 +#. type: Plain text +#: doc/tin.1:2081 doc/tin.5:1832 msgid "B (default), no post processing is done." msgstr "" -# type: Plain text -#: ../tin.1:2058 -msgid "B, unpacking of multi-part B(1) files only." +#. type: Plain text +#: doc/tin.1:2085 +msgid "B, unpacking of multi-part B<\\%shar>(1) files only." msgstr "" -# type: Plain text -#: ../tin.1:2060 ../tin.5:1802 +#. type: Plain text +#: doc/tin.1:2087 doc/tin.5:1839 msgid "B, binary attachments and data will be decoded and saved." msgstr "" -# type: TP -#: ../tin.1:2061 +#. type: TP +#: doc/tin.1:2088 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2067 ../tin.5:1809 +#. type: Plain text +#: doc/tin.1:2094 doc/tin.5:1846 msgid "" "Keep posted articles in " "I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/>B. If no filename " "is set then postings will not be saved. Default is 'posted'." msgstr "" -# type: TP -#: ../tin.1:2067 +#. type: TP +#: doc/tin.1:2094 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2071 ../tin.5:1813 +#. type: Plain text +#: doc/tin.1:2098 doc/tin.5:1850 msgid "" "If ON, then the full article header is sent to the printer. Otherwise only " "the ''Subject:'' and ''From:'' fields are output. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2071 +#. type: TP +#: doc/tin.1:2098 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2080 +#. type: Plain text +#: doc/tin.1:2107 msgid "" "The printer program with options that is to be used to print articles. The " -"default is B(1) for BSD machines and B(1) for SysV " +"default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " "machines. Printing from B may have been disabled by the System " "Administrator." msgstr "" -# type: TP -#: ../tin.1:2080 +#. type: TP +#: doc/tin.1:2107 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2084 ../tin.5:1827 +#. type: Plain text +#: doc/tin.1:2111 doc/tin.5:1864 msgid "" "If ON only save/print/pipe/mail unread articles (tagged articles excepted). " "Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2084 +#. type: TP +#: doc/tin.1:2111 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2087 +#. type: Plain text +#: doc/tin.1:2114 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default is " "OFF." msgstr "" -# type: TP -#: ../tin.1:2087 +#. type: TP +#: doc/tin.1:2114 #, no-wrap msgid "B" msgstr "" #. TODO: document %s -# type: Plain text -#: ../tin.1:2092 ../tin.5:1837 +#. type: Plain text +#: doc/tin.1:2119 doc/tin.5:1874 msgid "" "The character used in quoting included text to article followups and mail " "replies. The '_' character represents a blank character and is replaced with " "' ' when read. Default is 'E_'." msgstr "" -# type: TP -#: ../tin.1:2092 +#. type: TP +#: doc/tin.1:2119 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2099 +#. type: Plain text +#: doc/tin.1:2126 msgid "" "How articles should be quoted when following up or replying to them. There " "are a number of things that can be done: empty lines can be quoted, " @@ -4971,169 +5029,169 @@ msgid "" "lines." msgstr "" -# type: Plain text -#: ../tin.1:2103 +#. type: Plain text +#: doc/tin.1:2130 msgid "" "When you are viewing an article in raw mode ('B<^H>'), and follow up or " "reply to it, the signature will be quoted even if it would otherwise not " "be. If B is off, then the signature will never be quoted." msgstr "" -# type: TP -#: ../tin.1:2103 +#. type: TP +#: doc/tin.1:2130 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2108 +#. type: Plain text +#: doc/tin.1:2135 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " "B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2108 +#. type: TP +#: doc/tin.1:2135 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2113 +#. type: Plain text +#: doc/tin.1:2140 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " "B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2113 +#. type: TP +#: doc/tin.1:2140 #, no-wrap msgid "B= 3 times q.l. (quote_regex3)>" msgstr "" -# type: Plain text -#: ../tin.1:2118 +#. type: Plain text +#: doc/tin.1:2145 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " "B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2118 +#. type: TP +#: doc/tin.1:2145 #, no-wrap msgid "B
" msgstr "" -# type: Plain text -#: ../tin.1:2122 ../tin.5:1882 +#. type: Plain text +#: doc/tin.1:2149 doc/tin.5:1919 msgid "" "If set to 0, this feature is deactivated, otherwise it means the number of " "days. Default is 2." msgstr "" -# type: TP -#: ../tin.1:2122 +#. type: TP +#: doc/tin.1:2149 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2126 ../tin.5:1886 +#. type: Plain text +#: doc/tin.1:2153 doc/tin.5:1923 msgid "" "If ON B does the rendering of bi-directional text. If OFF B leaves " "the rendering of bi-directional text to the terminal. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2126 +#. type: TP +#: doc/tin.1:2153 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2131 ../tin.5:1891 +#. type: Plain text +#: doc/tin.1:2158 doc/tin.5:1928 msgid "" "The news I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file is " "reread at regular intervals to show if any new news has arrived. Default is " "1200. Setting this to 0 will disable this feature." msgstr "" -# type: TP -#: ../tin.1:2131 +#. type: TP +#: doc/tin.1:2158 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2135 ../tin.5:1895 +#. type: Plain text +#: doc/tin.1:2162 doc/tin.5:1932 msgid "" "Directory where articles/threads are saved. Default is " "I<${TIN_HOMEDIR:-\"$HOME\"}/News>." msgstr "" -# type: TP -#: ../tin.1:2135 +#. type: TP +#: doc/tin.1:2162 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2139 ../tin.5:1899 +#. type: Plain text +#: doc/tin.1:2166 doc/tin.5:1936 msgid "" "If the score of an article is below or equal this value the article gets " "marked as killed." msgstr "" -# type: TP -#: ../tin.1:2139 +#. type: TP +#: doc/tin.1:2166 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2143 ../tin.5:1903 +#. type: Plain text +#: doc/tin.1:2170 doc/tin.5:1940 msgid "" "If the score of an article is above or equal this value the article gets " "marked as hot." msgstr "" -# type: TP -#: ../tin.1:2143 +#. type: TP +#: doc/tin.1:2170 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2147 ../tin.5:1907 +#. type: Plain text +#: doc/tin.1:2174 doc/tin.5:1944 msgid "" "Score of an article which should be killed, this must be E= " "B." msgstr "" -# type: TP -#: ../tin.1:2147 +#. type: TP +#: doc/tin.1:2174 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2151 ../tin.5:1911 +#. type: Plain text +#: doc/tin.1:2178 doc/tin.5:1948 msgid "" "Score of an article which should be marked hot, this must be E= " "B." msgstr "" -# type: TP -#: ../tin.1:2151 +#. type: TP +#: doc/tin.1:2178 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2159 +#. type: Plain text +#: doc/tin.1:2186 msgid "" "The number of lines that will be scrolled up/down in the article pager when " "using cursor-up/down. The default is 1 (line-by-line). Set to 0 to get " @@ -5143,53 +5201,67 @@ msgid "" "half-page scrolling. This setting supersedes full_page_scroll=OFF." msgstr "" -# type: TP -#: ../tin.1:2159 +#. type: TP +#: doc/tin.1:2186 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2190 +msgid "" +"Format string tin uses for Selection level representation. See the section " +"\"CUSTOMIZING THE SCREEN FORMAT\". Default is \"%f\\ %n\\ %U\\ \\ %G\\ \\ " +"%d\"." +msgstr "" + +#. type: TP +#: doc/tin.1:2190 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2163 ../tin.5:1923 +#. type: Plain text +#: doc/tin.1:2194 doc/tin.5:1989 msgid "" "Which information about the author should be shown. Default is 2, authors " "full name." msgstr "" -# type: Plain text -#: ../tin.1:2166 ../tin.5:1926 +#. type: Plain text +#: doc/tin.1:2197 doc/tin.5:1992 msgid "B, only the ''Subject:'' line will be displayed." msgstr "" -# type: Plain text -#: ../tin.1:2169 ../tin.5:1929 +#. type: Plain text +#: doc/tin.1:2200 doc/tin.5:1995 msgid "" "B
, ''Subject:'' line & the address part of the ''From:'' line are " "displayed." msgstr "" -# type: Plain text -#: ../tin.1:2172 ../tin.5:1932 +#. type: Plain text +#: doc/tin.1:2203 doc/tin.5:1998 msgid "" "B, ''Subject:'' line & the authors full name part of the " "\\&''From:'' line are displayed (default)." msgstr "" -# type: Plain text -#: ../tin.1:2175 ../tin.5:1935 +#. type: Plain text +#: doc/tin.1:2206 doc/tin.5:2001 msgid "" "B
, ''Subject:'' line & all of the ''From:'' line are " "displayed." msgstr "" -# type: TP -#: ../tin.1:2176 +#. type: TP +#: doc/tin.1:2207 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2185 +#. type: Plain text +#: doc/tin.1:2216 msgid "" "If ON show a short group description text after newsgroup name at the group " "selection level. The ''B<-d>'' command-line flag will override the setting " @@ -5199,101 +5271,124 @@ msgid "" "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/mailgroups> for mailgroups. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2185 +#. type: TP +#: doc/tin.1:2216 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2219 doc/tin.5:1974 +msgid "Function used for sorting articles. Default is 0." +msgstr "" + +#. type: Plain text +#: doc/tin.1:2224 doc/tin.5:1979 +msgid "Use B<\\%qsort>(3) for sorting." +msgstr "" + +#. type: Plain text +#: doc/tin.1:2229 doc/tin.5:1984 +msgid "" +"Use B<\\%heapsort>(3) for sorting. This might be faster in large groups " +"with long threads (somewhat presorted data)." +msgstr "" + +#. type: TP +#: doc/tin.1:2230 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2189 ../tin.5:1949 +#. type: Plain text +#: doc/tin.1:2234 doc/tin.5:2015 msgid "" "Which information about the thread or article should be shown. Default is 1, " "show only the line count." msgstr "" -# type: Plain text -#: ../tin.1:2192 ../tin.5:1952 +#. type: Plain text +#: doc/tin.1:2237 doc/tin.5:2018 msgid "B, no information will be displayed." msgstr "" -# type: Plain text -#: ../tin.1:2196 +#. type: Plain text +#: doc/tin.1:2241 msgid "" "B, in article listing the line count of an article will be displayed " "and in thread listing the line count of first (unread) article will be " "displayed." msgstr "" -# type: Plain text -#: ../tin.1:2200 ../tin.5:1960 +#. type: Plain text +#: doc/tin.1:2245 doc/tin.5:2026 msgid "" "B, in article listing the score of an article will be displayed and " "in thread listing the score of the thread will be displayed - see also " "B." msgstr "" -# type: Plain text -#: ../tin.1:2202 ../tin.5:1962 +#. type: Plain text +#: doc/tin.1:2247 doc/tin.5:2028 msgid "B, display line count and score." msgstr "" -# type: TP -#: ../tin.1:2203 +#. type: TP +#: doc/tin.1:2248 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2207 +#. type: Plain text +#: doc/tin.1:2252 msgid "" "If ON show only new/unread articles otherwise show all articles. Default is " "ON." msgstr "" -# type: TP -#: ../tin.1:2207 +#. type: TP +#: doc/tin.1:2252 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2211 ../tin.5:1971 +#. type: Plain text +#: doc/tin.1:2256 doc/tin.5:2037 msgid "" "If ON show only subscribed groups that contain unread articles. Default is " "OFF." msgstr "" -# type: TP -#: ../tin.1:2211 +#. type: TP +#: doc/tin.1:2256 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2215 +#. type: Plain text +#: doc/tin.1:2260 msgid "If OFF don't show signatures when displaying articles. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2215 +#. type: TP +#: doc/tin.1:2260 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2218 ../tin.5:1977 +#. type: Plain text +#: doc/tin.1:2263 doc/tin.5:2043 msgid "If ON prepend the signature with sigdashes. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2218 +#. type: TP +#: doc/tin.1:2263 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2228 +#. type: Plain text +#: doc/tin.1:2273 msgid "" "The path that specifies the signature file to use when posting, following up " "to or replying to an article. If the path is a directory then the signature " @@ -5304,227 +5399,227 @@ msgid "" "signature. Default is I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>." msgstr "" -# type: TP -#: ../tin.1:2228 +#. type: TP +#: doc/tin.1:2273 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2231 ../tin.5:1991 +#. type: Plain text +#: doc/tin.1:2276 doc/tin.5:2057 msgid "If ON add signature to reposted articles. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2231 +#. type: TP +#: doc/tin.1:2276 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2236 +#. type: Plain text +#: doc/tin.1:2281 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " "B is blank, then B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2236 +#. type: TP +#: doc/tin.1:2281 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2240 ../tin.5:2002 +#. type: Plain text +#: doc/tin.1:2285 doc/tin.5:2068 msgid "" "This specifies how articles should be sorted. Sort by ascending Date (6) is " "the default. The following sort types are allowed:" msgstr "" -# type: Plain text -#: ../tin.1:2243 ../tin.5:2005 +#. type: Plain text +#: doc/tin.1:2288 doc/tin.5:2071 msgid "B, don't sort articles." msgstr "" -# type: Plain text -#: ../tin.1:2245 ../tin.5:2007 +#. type: Plain text +#: doc/tin.1:2290 doc/tin.5:2073 msgid "B, sort articles by ''Subject:'' field descending." msgstr "" -# type: Plain text -#: ../tin.1:2247 ../tin.5:2009 +#. type: Plain text +#: doc/tin.1:2292 doc/tin.5:2075 msgid "B, sort articles by ''Subject:'' field ascending." msgstr "" -# type: Plain text -#: ../tin.1:2249 ../tin.5:2011 +#. type: Plain text +#: doc/tin.1:2294 doc/tin.5:2077 msgid "B, sort articles by ''From:'' field descending." msgstr "" -# type: Plain text -#: ../tin.1:2251 ../tin.5:2013 +#. type: Plain text +#: doc/tin.1:2296 doc/tin.5:2079 msgid "B, sort articles by ''From:'' field ascending." msgstr "" -# type: Plain text -#: ../tin.1:2253 ../tin.5:2015 +#. type: Plain text +#: doc/tin.1:2298 doc/tin.5:2081 msgid "B, sort articles by ''Date:'' field descending." msgstr "" -# type: Plain text -#: ../tin.1:2256 ../tin.5:2018 +#. type: Plain text +#: doc/tin.1:2301 doc/tin.5:2084 msgid "B, sort articles by ''Date:'' field ascending (default)." msgstr "" -# type: Plain text -#: ../tin.1:2258 ../tin.5:2020 +#. type: Plain text +#: doc/tin.1:2303 doc/tin.5:2086 msgid "B, sort articles by filtering score descending." msgstr "" -# type: IP -#: ../tin.1:2258 ../tin.5:2020 +#. type: IP +#: doc/tin.1:2303 doc/tin.5:2086 #, no-wrap msgid "8" msgstr "" -# type: Plain text -#: ../tin.1:2260 ../tin.5:2022 +#. type: Plain text +#: doc/tin.1:2305 doc/tin.5:2088 msgid "B, sort articles by filtering score ascending." msgstr "" -# type: IP -#: ../tin.1:2260 ../tin.5:2022 +#. type: IP +#: doc/tin.1:2305 doc/tin.5:2088 #, no-wrap msgid "9" msgstr "" -# type: Plain text -#: ../tin.1:2262 ../tin.5:2024 +#. type: Plain text +#: doc/tin.1:2307 doc/tin.5:2090 msgid "B, sort articles by ''Lines:'' field descending." msgstr "" -# type: IP -#: ../tin.1:2262 ../tin.5:2024 +#. type: IP +#: doc/tin.1:2307 doc/tin.5:2090 #, no-wrap msgid "10" msgstr "" -# type: Plain text -#: ../tin.1:2264 ../tin.5:2026 +#. type: Plain text +#: doc/tin.1:2309 doc/tin.5:2092 msgid "B, sort articles by ''Lines:'' field ascending." msgstr "" -# type: TP -#: ../tin.1:2265 +#. type: TP +#: doc/tin.1:2310 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2270 ../tin.5:2031 +#. type: Plain text +#: doc/tin.1:2315 doc/tin.5:2097 msgid "" "This specifies how threads will be sorted. Sort by descending Score (1) is " "the default. The following sort types are allowed:" msgstr "" -# type: Plain text -#: ../tin.1:2273 ../tin.5:2034 +#. type: Plain text +#: doc/tin.1:2318 doc/tin.5:2100 msgid "B, don't sort threads." msgstr "" -# type: Plain text -#: ../tin.1:2276 ../tin.5:2037 +#. type: Plain text +#: doc/tin.1:2321 doc/tin.5:2103 msgid "B, sort threads by filtering score descending (default)." msgstr "" -# type: Plain text -#: ../tin.1:2278 ../tin.5:2039 +#. type: Plain text +#: doc/tin.1:2323 doc/tin.5:2105 msgid "B, sort threads by filtering score ascending." msgstr "" -# type: Plain text -#: ../tin.1:2280 ../tin.5:2041 +#. type: Plain text +#: doc/tin.1:2325 doc/tin.5:2107 msgid "" "B, sort threads by date of last posting " "descending." msgstr "" -# type: Plain text -#: ../tin.1:2282 ../tin.5:2043 +#. type: Plain text +#: doc/tin.1:2327 doc/tin.5:2109 msgid "" "B, sort threads by date of last posting " "ascending." msgstr "" -# type: TP -#: ../tin.1:2283 +#. type: TP +#: doc/tin.1:2328 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2288 +#. type: Plain text +#: doc/tin.1:2333 msgid "" "Set this option to a list of comma-separated strings to be warned if you are " "replying to an article by mail where the e-mail address contains one of " "these strings. The matching is case-insensitive. Example:" msgstr "" -# type: Plain text -#: ../tin.1:2290 +#. type: Plain text +#: doc/tin.1:2335 msgid "I" msgstr "" -# type: TP -#: ../tin.1:2290 +#. type: TP +#: doc/tin.1:2335 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2295 +#. type: Plain text +#: doc/tin.1:2340 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " "B is blank, then B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2295 +#. type: TP +#: doc/tin.1:2340 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2300 ../tin.5:2061 +#. type: Plain text +#: doc/tin.1:2345 doc/tin.5:2127 msgid "" "Set ON if the editor used for posting, follow-ups and bug reports has the " "capability of starting and positioning the cursor at a specified line within " "a file. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2300 +#. type: TP +#: doc/tin.1:2345 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2306 ../tin.5:2065 +#. type: Plain text +#: doc/tin.1:2351 doc/tin.5:2131 msgid "" "Strips the blanks from the end of each line therefore speeding up the " "display when reading on a slow terminal or via modem. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2306 +#. type: TP +#: doc/tin.1:2351 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2315 ../tin.5:2073 +#. type: Plain text +#: doc/tin.1:2360 doc/tin.5:2140 msgid "" "Bogus groups are groups that are present in your " "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file that no longer exist on the news " @@ -5535,68 +5630,68 @@ msgid "" "Keep)." msgstr "" -# type: TP -#: ../tin.1:2315 +#. type: TP +#: doc/tin.1:2360 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2319 ../tin.5:2077 +#. type: Plain text +#: doc/tin.1:2364 doc/tin.5:2144 msgid "" "If ON, then unsubscribed groups will be permanently removed from your " "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2319 +#. type: TP +#: doc/tin.1:2364 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2324 +#. type: Plain text +#: doc/tin.1:2369 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " "B is blank, then B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2324 +#. type: TP +#: doc/tin.1:2369 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2329 ../tin.5:2260 +#. type: Plain text +#: doc/tin.1:2374 doc/tin.5:2346 msgid "" "If enabled a search for the next unread article will wrap around all " "articles to find also previous unread articles. If disabled the search stops " "at the end of the thread list. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2329 +#. type: TP +#: doc/tin.1:2374 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2333 +#. type: Plain text +#: doc/tin.1:2378 msgid "" "If ON, show \"a as Umlaut-a, etc. Default is OFF. This behavior can also be " "toggled in the article viewer via B ('B<\">')." msgstr "" -# type: TP -#: ../tin.1:2333 +#. type: TP +#: doc/tin.1:2378 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2341 +#. type: Plain text +#: doc/tin.1:2386 msgid "" "Defines which threading method to use. It's possible to set the threading " "type on a per group basis by setting the group attribute variable " @@ -5606,362 +5701,378 @@ msgid "" "are:" msgstr "" -# type: Plain text -#: ../tin.1:2344 +#. type: Plain text +#: doc/tin.1:2389 msgid "B, don't thread." msgstr "" -# type: Plain text -#: ../tin.1:2346 +#. type: Plain text +#: doc/tin.1:2391 msgid "B, thread on ''Subject:'' only." msgstr "" -# type: Plain text -#: ../tin.1:2348 +#. type: Plain text +#: doc/tin.1:2393 msgid "B, thread on ''References:'' only." msgstr "" -# type: Plain text -#: ../tin.1:2351 +#. type: Plain text +#: doc/tin.1:2396 msgid "" "B, thread on ''References:'' then " "\\&''Subject:'' (default)." msgstr "" -# type: Plain text -#: ../tin.1:2353 +#. type: Plain text +#: doc/tin.1:2398 msgid "B, thread multipart articles on ''Subject:''." msgstr "" -# type: Plain text -#: ../tin.1:2356 +#. type: Plain text +#: doc/tin.1:2401 msgid "" "B, thread base upon a partial character match on " "\\&''Subject:''." msgstr "" -# type: TP -#: ../tin.1:2357 +#. type: TP +#: doc/tin.1:2402 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2361 ../tin.5:2108 +#. type: Plain text +#: doc/tin.1:2406 doc/tin.5:2194 msgid "" "If ON catchup group/thread when leaving with the left arrow key. Default is " "ON." msgstr "" -# type: TP -#: ../tin.1:2361 +#. type: TP +#: doc/tin.1:2406 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2410 +msgid "" +"Format string tin uses for Thread level representation. See the section " +"\"CUSTOMIZING THE SCREEN FORMAT\". Default is \"%n\\ %m\\ \\ [%L]\\ \\ %T\\ " +"\\ %F\"." +msgstr "" + +#. type: TP +#: doc/tin.1:2410 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2365 +#. type: Plain text +#: doc/tin.1:2414 msgid "" "How closely the subjects must match for two threads to be considered part of " "the same thread. This is a percentage and the default if 75%." msgstr "" -# type: TP -#: ../tin.1:2365 +#. type: TP +#: doc/tin.1:2414 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2369 ../tin.5:2112 +#. type: Plain text +#: doc/tin.1:2418 doc/tin.5:2198 msgid "" "How the total score of a thread is computed. Default is 0, the maximum score " "in this thread." msgstr "" -# type: Plain text -#: ../tin.1:2372 ../tin.5:2115 +#. type: Plain text +#: doc/tin.1:2421 doc/tin.5:2201 msgid "B, the maximum score in this thread." msgstr "" -# type: Plain text -#: ../tin.1:2374 ../tin.5:2117 +#. type: Plain text +#: doc/tin.1:2423 doc/tin.5:2203 msgid "B, the sum of all scores in this thread." msgstr "" -# type: Plain text -#: ../tin.1:2376 ../tin.5:2119 +#. type: Plain text +#: doc/tin.1:2425 doc/tin.5:2205 msgid "B, the average score in this thread." msgstr "" -# type: TP -#: ../tin.1:2377 +#. type: TP +#: doc/tin.1:2426 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2385 ../tin.5:2128 +#. type: Plain text +#: doc/tin.1:2434 doc/tin.5:2214 msgid "" -"If ON append //TRANSLIT to the first argument of B(3) to enable " -"transliteration. This means that when a character cannot be represented in " -"the target character set, it can be approximated through one or several " -"similarly looking characters. On systems where this extension doesn't exist, " -"this option is disabled. Default is OFF." +"If ON append //TRANSLIT to the first argument of B<\\%iconv_open>(3) to " +"enable transliteration. This means that when a character cannot be " +"represented in the target character set, it can be approximated through one " +"or several similarly looking characters. On systems where this extension " +"doesn't exist, this option is disabled. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2385 +#. type: TP +#: doc/tin.1:2434 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2389 ../tin.5:2132 +#. type: Plain text +#: doc/tin.1:2438 doc/tin.5:2218 msgid "" "Allows you to select how B treats blank lines in article bodies. " "Default is 0. This option does not affect lines within verbatim blocks." msgstr "" -# type: Plain text -#: ../tin.1:2392 ../tin.5:2135 +#. type: Plain text +#: doc/tin.1:2441 doc/tin.5:2221 msgid "B, do nothing." msgstr "" -# type: Plain text -#: ../tin.1:2394 ../tin.5:2137 +#. type: Plain text +#: doc/tin.1:2443 doc/tin.5:2223 msgid "B." msgstr "" -# type: Plain text -#: ../tin.1:2396 ../tin.5:2139 +#. type: Plain text +#: doc/tin.1:2445 doc/tin.5:2225 msgid "B." msgstr "" -# type: Plain text -#: ../tin.1:2398 ../tin.5:2141 +#. type: Plain text +#: doc/tin.1:2447 doc/tin.5:2227 msgid "" "B, skip leading and trailing blank " "lines." msgstr "" -# type: Plain text -#: ../tin.1:2401 ../tin.5:2144 +#. type: Plain text +#: doc/tin.1:2450 doc/tin.5:2230 msgid "" "B, replace multiple blank lines between " "textblocks with one blank line." msgstr "" -# type: Plain text -#: ../tin.1:2403 ../tin.5:2146 +#. type: Plain text +#: doc/tin.1:2452 doc/tin.5:2232 msgid "B, 4 + 1" msgstr "" -# type: Plain text -#: ../tin.1:2405 ../tin.5:2148 +#. type: Plain text +#: doc/tin.1:2454 doc/tin.5:2234 msgid "B, 4 + 2" msgstr "" -# type: Plain text -#: ../tin.1:2407 ../tin.5:2150 +#. type: Plain text +#: doc/tin.1:2456 doc/tin.5:2236 msgid "B, 4 + 3" msgstr "" -# type: TP -#: ../tin.1:2408 +#. type: TP +#: doc/tin.1:2457 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2413 +#. type: Plain text +#: doc/tin.1:2462 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " "B is blank, then B uses a built-in default." msgstr "" -# type: TP -#: ../tin.1:2413 +#. type: TP +#: doc/tin.1:2462 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2416 +#. type: Plain text +#: doc/tin.1:2465 msgid "If ON remove I<~/.article> after posting. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2416 +#. type: TP +#: doc/tin.1:2465 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2421 +#. type: Plain text +#: doc/tin.1:2470 msgid "" "The program that will be run when launching URL's in the article viewer " "using B ('B'). The actual URL will be appended to this. " "Default is B." msgstr "" -# type: TP -#: ../tin.1:2421 +#. type: TP +#: doc/tin.1:2470 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2424 ../tin.5:2170 +#. type: Plain text +#: doc/tin.1:2473 doc/tin.5:2256 msgid "Enable highlighting URLs in message body. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2424 +#. type: TP +#: doc/tin.1:2473 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2427 +#. type: Plain text +#: doc/tin.1:2476 msgid "If enabled B uses ANSI-colors. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2427 +#. type: TP +#: doc/tin.1:2476 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.1:2430 +#. type: TP +#: doc/tin.1:2479 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2436 ../tin.5:2184 +#. type: Plain text +#: doc/tin.1:2485 doc/tin.5:2270 msgid "" -"Allows the mouse button support in a B(1x) to be enabled/disabled. " -"Default is OFF." +"Allows the mouse button support in a B<\\%xterm>(1x) to be " +"enabled/disabled. Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2436 +#. type: TP +#: doc/tin.1:2485 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2446 +#. type: Plain text +#: doc/tin.1:2495 msgid "" -"If enabled B uses B(1) to interpret the ''X-Face:'' " +"If enabled B uses B<\\%slrnface>(1) to interpret the ''X-Face:'' " "header. For this option to have any effect, B must be running in an " -"B(1x) and B(1) must be in your $B. Default is OFF." +"B<\\%xterm>(1x) and B<\\%slrnface>(1) must be in your $B. Default is " +"OFF." msgstr "" -# type: TP -#: ../tin.1:2446 +#. type: TP +#: doc/tin.1:2495 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2450 ../tin.5:2200 +#. type: Plain text +#: doc/tin.1:2499 doc/tin.5:2286 msgid "" "If ON use UTF-8 characters for indicator ('-E'), thread/attachment tree " "and ellipsis ('...'). Default is OFF." msgstr "" -# type: TP -#: ../tin.1:2450 +#. type: TP +#: doc/tin.1:2499 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2453 +#. type: Plain text +#: doc/tin.1:2502 msgid "" "A regular expression that tin will use to find the begin of a verbatim " "block." msgstr "" -# type: TP -#: ../tin.1:2453 +#. type: TP +#: doc/tin.1:2502 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2456 +#. type: Plain text +#: doc/tin.1:2505 msgid "A regular expression that tin will use to find the end of a verbatim block." msgstr "" -# type: TP -#: ../tin.1:2456 +#. type: TP +#: doc/tin.1:2505 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2459 +#. type: Plain text +#: doc/tin.1:2508 msgid "If ON verbatim blocks will be detected. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2459 +#. type: TP +#: doc/tin.1:2508 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2473 +#. type: Plain text +#: doc/tin.1:2522 msgid "" "Allows you to select how B matches strings. The default is 0 and uses " "the wildmat notation, which is how this has traditionally been handled. " -"Setting this to 1 allows you to use B(1) compatible regular " -"expressions B(3) (see also B(1) and B(3)). You " -"will probably want to update your filter file if you use this regularly. " -"NB: Newsgroup names will always be matched using the wildmat notation." +"Setting this to 1 allows you to use B<\\%perl>(1) compatible regular " +"expressions B<\\%pcre>(3) (see also B<\\%perlre>(1) and " +"B<\\%pcrepattern>(3)). You will probably want to update your filter file if " +"you use this regularly. NB: Newsgroup names will always be matched using " +"the wildmat notation." msgstr "" -# type: TP -#: ../tin.1:2473 +#. type: TP +#: doc/tin.1:2522 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2477 ../tin.5:2228 +#. type: Plain text +#: doc/tin.1:2526 doc/tin.5:2314 msgid "" "Should the leading and ending stars, slashes, strokes and dashes also be " "displayed, even when they are highlighting marks?" msgstr "" -# type: Plain text -#: ../tin.1:2480 ../tin.5:2231 +#. type: Plain text +#: doc/tin.1:2529 doc/tin.5:2317 msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2482 ../tin.5:2233 +#. type: Plain text +#: doc/tin.1:2531 doc/tin.5:2319 msgid "yes, B" msgstr "" -# type: Plain text -#: ../tin.1:2484 ../tin.5:2235 +#. type: Plain text +#: doc/tin.1:2533 doc/tin.5:2321 msgid "print a B instead" msgstr "" -# type: TP -#: ../tin.1:2485 +#. type: TP +#: doc/tin.1:2534 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2493 +#. type: Plain text +#: doc/tin.1:2542 msgid "" "Enable word highlighting. See B for the options " "available. If B is enabled the colors specified in " @@ -5971,14 +6082,14 @@ msgid "" "are used. Default is ON." msgstr "" -# type: TP -#: ../tin.1:2493 +#. type: TP +#: doc/tin.1:2542 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2504 ../tin.5:2255 +#. type: Plain text +#: doc/tin.1:2553 doc/tin.5:2341 msgid "" "Sets the column at which a displayed article body should be wrapped. If " "this value is equal to 0, it defaults to the current screen width. If this " @@ -5990,27 +6101,27 @@ msgid "" "wrapping at the current screen width." msgstr "" -# type: TP -#: ../tin.1:2504 +#. type: TP +#: doc/tin.1:2553 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2511 ../tin.5:2265 +#. type: Plain text +#: doc/tin.1:2560 doc/tin.5:2351 msgid "" "Format is the same as for B, this is used when answering " "to a crossposting to several groups with no ''Followup-To:'' set." msgstr "" -# type: SS -#: ../tin.1:2511 +#. type: SS +#: doc/tin.1:2560 #, no-wrap msgid "ATTRIBUTES MENU AND GROUP ATTRIBUTES" msgstr "" -# type: Plain text -#: ../tin.1:2518 +#. type: Plain text +#: doc/tin.1:2567 msgid "" "B allows certain attributes to be set on a per group basis. If it " "exists, the global attributes file, I<${TIN_LIBDIR:-NEWSLIBDIR}/attributes> " @@ -6020,19 +6131,19 @@ msgid "" "no private attributes file yet." msgstr "" -# type: Plain text -#: ../tin.1:2526 +#. type: Plain text +#: doc/tin.1:2575 msgid "" "Note that the IgrouplistE> line has to be specified before " "the attributes are specified for that list. All attributes are set to a " "reasonable default so you only have to specify the attribute that you want " "to change (e.g., savedir). All toggle attributes are set by specifying " "ON/OFF. Otherwise, these function exactly the same as their global " -"equivalents. For more details see B(5)." +"equivalents. For more details see B<\\%tin>(5)." msgstr "" -# type: Plain text -#: ../tin.1:2533 +#. type: Plain text +#: doc/tin.1:2582 msgid "" "Attributes can also be changed from the attributes menu which can be " "accessed by B ('BTABE>') from the options menu " @@ -6042,22 +6153,22 @@ msgid "" "marked with '\\+' to the left of the attributes number." msgstr "" -# type: Plain text -#: ../tin.1:2540 +#. type: Plain text +#: doc/tin.1:2589 msgid "" "Besides the keys for moving around and changing values known from the " "options menu the attributes menu provides the following command: " "B ('B') which resets an attribute to a default value." msgstr "" -# type: SS -#: ../tin.1:2540 +#. type: SS +#: doc/tin.1:2589 #, no-wrap msgid "SCOPES MENU" msgstr "" -# type: Plain text -#: ../tin.1:2545 +#. type: Plain text +#: doc/tin.1:2594 msgid "" "The scopes menu (accessible from the options menu with B " "('B')) shows all scopes read from the global and local attributes file. " @@ -6065,8 +6176,8 @@ msgid "" "the scope number. Delete/rename/move are not possible with those scopes." msgstr "" -# type: Plain text -#: ../tin.1:2556 +#. type: Plain text +#: doc/tin.1:2605 msgid "" "In addition to the common moving keys the following commands are available: " "B ('B<^J>' or 'BCRE>') enter the attributes menu for " @@ -6078,15 +6189,15 @@ msgid "" "bottom of the screen." msgstr "" -# type: SS -#: ../tin.1:2556 +#. type: SS +#: doc/tin.1:2605 #, no-wrap msgid "FILTERING ARTICLES" msgstr "" #. FIXME - add scoring description -# type: Plain text -#: ../tin.1:2563 +#. type: Plain text +#: doc/tin.1:2612 msgid "" "When there is a subject or an author which you are either very interested " "in, or find completely uninteresting, you can easily instruct B to " @@ -6095,17 +6206,17 @@ msgid "" "lines in an article." msgstr "" -# type: Plain text -#: ../tin.1:2569 +#. type: Plain text +#: doc/tin.1:2618 msgid "" "When B starts up the user's kill-file " -"I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter> (see also B(5)) is read. Each " -"time a newsgroup is entered the rules are applied and articles killed or " -"selected when they meet certain criteria." +"I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter> (see also B<\\%tin>(5)) is " +"read. Each time a newsgroup is entered the rules are applied and articles " +"killed or selected when they meet certain criteria." msgstr "" -# type: Plain text -#: ../tin.1:2574 +#. type: Plain text +#: doc/tin.1:2623 msgid "" "The degree to which rules are applied depend on the B tinrc " "setting. By default killed articles will only be marked read. Adjust " @@ -6113,8 +6224,8 @@ msgid "" "auto-selection rule are marked with a ''*''." msgstr "" -# type: Plain text -#: ../tin.1:2579 +#. type: Plain text +#: doc/tin.1:2628 msgid "" "Filtering rules can be manually entered into " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter> (but don't do this whilst running " @@ -6122,66 +6233,71 @@ msgid "" "B." msgstr "" -# type: Plain text -#: ../tin.1:2585 +#. type: Plain text +#: doc/tin.1:2633 msgid "" "The filtering capabilities of B have been significantly enhanced over " "previous versions to include scoring and better pattern matching. It is " "recommended that you read the file I in the B documentation " -"directory. This file can also be read online at " -"Ehttp://www.tin.org/filtering.txtE." +"directory. This file can also be read online at" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2635 +msgid "Ehttp://www.tin.org/filtering.txtE." msgstr "" #. FIXME - Next paragraph is out of date -# type: Plain text -#: ../tin.1:2597 +#. type: Plain text +#: doc/tin.1:2648 msgid "" -"The on-screen filtering menu is accessed by pressing 'B<^K>' at the Group " -"and Article levels. It allows the user to kill or select an article that " -"matches the current ''Subject:'' line, ''From:'' line or a string entered by " -"the user. The user entered string can be applied to the ''Subject:'' or " -"\\&''From:'' lines of an article. The kill description can be limited to the " -"current newsgroup or it can apply to all newsgroups. Once entered the user " -"can abort the command and not save the kill description, edit the kill file " -"or save the kill description." +"The on-screen filtering menu is accessed by pressing B " +"('B<^K>') or B ('B<^A>') at the Group and Article " +"levels. It allows the user to kill or select an article that matches the " +"current ''Subject:'' line, ''From:'' line or a string entered by the " +"user. The user entered string can be applied to the \\&''Subject:'' or " +"''From:'' line of an article. The filter can be limited to the current " +"newsgroup or it can apply to all newsgroups. Once entered the user can abort " +"the command and not save the new filter, edit the full filter file or save " +"filter." msgstr "" -# type: SS -#: ../tin.1:2597 +#. type: SS +#: doc/tin.1:2648 #, no-wrap msgid "POSTING ARTICLES" msgstr "" -# type: Plain text -#: ../tin.1:2600 +#. type: Plain text +#: doc/tin.1:2651 msgid "" "B allows posting of articles, follow-up to already posted articles and " "replying direct through mail to the author of an article." msgstr "" -# type: Plain text -#: ../tin.1:2610 +#. type: Plain text +#: doc/tin.1:2661 msgid "" "Use the B ('B') command to post an article to a newsgroup. After " -"entering the post subject the default editor (i.e., B(1)) or the editor " -"specified by the $B or $B environment variable will be " -"started and the article can be entered. To crosspost articles simply add a " -"comma and the name of the newsgroup(s) to the end of the ''Newsgroups:'' " +"entering the post subject the default editor (i.e., B<\\%vi>(1)) or the " +"editor specified by the $B or $B environment variable will " +"be started and the article can be entered. To crosspost articles simply add " +"a comma and the name of the newsgroup(s) to the end of the ''Newsgroups:'' " "line at the beginning of the article. After saving and exiting the editor " "you are asked if you wish to a)bort posting the article, e)dit the article " "again or p)ost the article to the specified newsgroup(s)." msgstr "" -# type: Plain text -#: ../tin.1:2615 +#. type: Plain text +#: doc/tin.1:2666 msgid "" "Use the B ('B') command to display a history of the " "articles you have posted. The date the article was posted, which newsgroups " "the article was posted to and the articles subject line are displayed." msgstr "" -# type: Plain text -#: ../tin.1:2623 +#. type: Plain text +#: doc/tin.1:2674 msgid "" "Use the B ('B'), B ('B') or " "B ('B<^W>') command to post a follow-up article to " @@ -6192,8 +6308,8 @@ msgid "" "when posting an article with the B ('B') command." msgstr "" -# type: Plain text -#: ../tin.1:2637 +#. type: Plain text +#: doc/tin.1:2688 msgid "" "Use the B ('B'), B ('B') or " "B ('B<^E>') command to reply direct through mail to " @@ -6207,14 +6323,14 @@ msgid "" "or send the article to the author via B ('B')." msgstr "" -# type: SS -#: ../tin.1:2637 +#. type: SS +#: doc/tin.1:2688 #, no-wrap msgid "CUSTOMIZING THE ARTICLE QUOTE STRING" msgstr "" -# type: Plain text -#: ../tin.1:2645 +#. type: Plain text +#: doc/tin.1:2696 msgid "" "When posting a followup to an article or replying direct to the author of an " "article via email the text of the article can be quoted. The beginning of " @@ -6225,14 +6341,14 @@ msgid "" "B, B or B:" msgstr "" -# type: ta -#: ../tin.1:2647 +#. type: ta +#: doc/tin.1:2698 #, no-wrap msgid "\\w'%A 'u +\\w'Address'u" msgstr "" -# type: Plain text -#: ../tin.1:2656 +#. type: Plain text +#: doc/tin.1:2707 #, no-wrap msgid "" "B<%A>\tAddress (Email)\n" @@ -6245,26 +6361,26 @@ msgid "" "B<%I>\tInitials of author\n" msgstr "" -# type: Plain text -#: ../tin.1:2659 +#. type: Plain text +#: doc/tin.1:2710 msgid "e.g.," msgstr "" -# type: Plain text -#: ../tin.1:2664 +#. type: Plain text +#: doc/tin.1:2715 #, no-wrap msgid "" "CW\n" msgstr "" -# type: Plain text -#: ../tin.1:2668 +#. type: Plain text +#: doc/tin.1:2719 msgid "would expand to:" msgstr "" -# type: Plain text -#: ../tin.1:2673 +#. type: Plain text +#: doc/tin.1:2724 #, no-wrap msgid "" "CW\n" msgstr "" -# type: Plain text -#: ../tin.1:2683 +#. type: Plain text +#: doc/tin.1:2734 msgid "" "The quoted text section of an article is marked by a preceding quote string " "at the beginning of each quoted line. The default quote string is set to " @@ -6282,14 +6398,14 @@ msgid "" "represent a space)." msgstr "" -# type: SS -#: ../tin.1:2683 +#. type: SS +#: doc/tin.1:2734 #, no-wrap msgid "MAILING PIPING PRINTING REPOSTING AND SAVING ARTICLES" msgstr "" -# type: Plain text -#: ../tin.1:2690 +#. type: Plain text +#: doc/tin.1:2741 msgid "" "The command interface to B, B, B or " "B ('B'), B ('B<|>'), B ('B'), B " @@ -6298,8 +6414,8 @@ msgid "" "articles is the same for ease of use." msgstr "" -# type: Plain text -#: ../tin.1:2695 +#. type: Plain text +#: doc/tin.1:2746 msgid "" "Auto-saving with B<*AutoSave> ('B') is a special case and operates only " "on marked articles. They will processed without any further prompting " @@ -6307,24 +6423,24 @@ msgid "" "attributes set for the current group." msgstr "" -# type: Plain text -#: ../tin.1:2699 +#. type: Plain text +#: doc/tin.1:2750 msgid "" "Otherwise, the initial prompt will ask you to select which article, thread, " "hot (auto-selected), regex pattern, tagged articles you wish to mail, pipe " "etc." msgstr "" -# type: Plain text -#: ../tin.1:2703 +#. type: Plain text +#: doc/tin.1:2754 msgid "" "Tagged articles must have already been tagged with a B<*Tag> ('B') " "command. All tagged articles can be untagged by a B<*Untag> ('B') untag " "command." msgstr "" -# type: Plain text -#: ../tin.1:2709 +#. type: Plain text +#: doc/tin.1:2760 msgid "" "If a regex pattern is selected you are asked to enter a pattern (e.g., to " "match all articles subject lines containing 'net News' you enter \"net " @@ -6333,8 +6449,8 @@ msgid "" "matching options." msgstr "" -# type: Plain text -#: ../tin.1:2714 +#. type: Plain text +#: doc/tin.1:2765 msgid "" "Various expansion characters are recognized when entering the directory and " "file to save to. Environment variables (prefixed with '$') and user home " @@ -6342,8 +6458,8 @@ msgid "" "variables can themselves contain other special characters." msgstr "" -# type: Plain text -#: ../tin.1:2719 +#. type: Plain text +#: doc/tin.1:2770 msgid "" "To save articles to a mailbox enter '=Emailbox nameE' when asked for " "the save filename. If you enter just '=' then articles will be saved to a " @@ -6351,52 +6467,52 @@ msgid "" "B." msgstr "" -# type: Plain text -#: ../tin.1:2723 +#. type: Plain text +#: doc/tin.1:2774 msgid "" "To save in savedir/Enews.group.nameE/EfilenameE format enter " "'+EfilenameE'. Environment variables are allowed within a filename " "(e.g., I<$SOURCES/dir/filename>). See B." msgstr "" -# type: Plain text -#: ../tin.1:2729 +#. type: Plain text +#: doc/tin.1:2780 msgid "" "When saving articles you can specify whether the saved files should be post " "processed. A default process type can be set via B." msgstr "" -# type: SS -#: ../tin.1:2729 +#. type: SS +#: doc/tin.1:2780 #, no-wrap msgid "AUTOMATIC MAILING AND SAVING NEW NEWS" msgstr "" -# type: Plain text -#: ../tin.1:2741 +#. type: Plain text +#: doc/tin.1:2792 msgid "" "B allows new/unread news articles to be mailed (''B<-M>'' and " "\\&''B<-N>'' option) or saved (''B<-S>'' option) in batch mode for later " "reading. Useful when going on holiday and you don't want to return and find " "that expire has removed a whole load of unread articles. Best to run via " -"B(1) everyday while away, after which you will be mailed a report of " -"which articles were mailed/saved from which newsgroups and the total number " -"of articles mailed/saved. Articles are saved in a private news structure " -"under your EsavedirE directory (default is " +"B<\\%cron>(1) everyday while away, after which you will be mailed a report " +"of which articles were mailed/saved from which newsgroups and the total " +"number of articles mailed/saved. Articles are saved in a private news " +"structure under your EsavedirE directory (default is " "I<${TIN_HOMEDIR:-\"$HOME\"}/News>). Be careful of using this option if you " "read a lot of groups because you could overflow your file system." msgstr "" -# type: Plain text -#: ../tin.1:2745 +#. type: Plain text +#: doc/tin.1:2796 msgid "" "When using ''B<-S>'' together with a given directory to save to (''B<-s>'' " "option), the same directory must be specified when reading the articles by " "''B<-R>''." msgstr "" -# type: Plain text -#: ../tin.1:2752 +#. type: Plain text +#: doc/tin.1:2803 msgid "" "If you only want to save some of your groups use the B tinrc " "variable. Set to ON or OFF in tinrc to enable/disable saving of all groups " @@ -6406,51 +6522,51 @@ msgid "" "want using attributes." msgstr "" -# type: TP -#: ../tin.1:2753 +#. type: TP +#: doc/tin.1:2804 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2757 +#. type: Plain text +#: doc/tin.1:2808 msgid "" "(mail any unread articles in newsgroups specified in file newsrc.mail to the " "local user iain and mark them as read)" msgstr "" -# type: TP -#: ../tin.1:2758 +#. type: TP +#: doc/tin.1:2809 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2762 +#. type: Plain text +#: doc/tin.1:2813 msgid "" "(save any unread articles in newsgroups specified in file newsrc.save and " "mark them as read)" msgstr "" -# type: TP -#: ../tin.1:2763 +#. type: TP +#: doc/tin.1:2814 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:2768 +#. type: Plain text +#: doc/tin.1:2819 msgid "(read any articles saved by B)" msgstr "" -# type: SS -#: ../tin.1:2768 +#. type: SS +#: doc/tin.1:2819 #, no-wrap msgid "RANGES" msgstr "" -# type: Plain text -#: ../tin.1:2779 +#. type: Plain text +#: doc/tin.1:2830 msgid "" "A range is simply a group of items marked using the B (B<'#'>) " "key. Certain B commands will operate on a range if one exists rather " @@ -6463,50 +6579,50 @@ msgid "" "B ('B')." msgstr "" -# type: SS -#: ../tin.1:2780 +#. type: SS +#: doc/tin.1:2831 #, no-wrap msgid "NEWSGROUP LISTS & WILDCARDS" msgstr "" -# type: Plain text -#: ../tin.1:2791 +#. type: Plain text +#: doc/tin.1:2842 msgid "" "Several places in B allow you to specify a list of newsgroups. These " "include command-line groups, (un)subscribe groups, the AUTO[UN]SUBSCRIBE " "mechanism. The scope= attributes file tag and the filter file group= tag " "also use the same syntax. B interprets this variable similarly to " -"B It contains a list of patterns, separated by commas and possibly " -"prefixed with exclamation points. An exclamation point negates the meaning " -"of a match on this pattern, and can be used to cancel certain matches. Some " -"examples:" +"B<\\%rn>(1). It contains a list of patterns, separated by commas and " +"possibly prefixed with exclamation points. An exclamation point negates the " +"meaning of a match on this pattern, and can be used to cancel certain " +"matches. Some examples:" msgstr "" -# type: Plain text -#: ../tin.1:2793 +#. type: Plain text +#: doc/tin.1:2844 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:2795 +#. type: Plain text +#: doc/tin.1:2846 msgid "Matches alt.config and everything in the 'news' hierarchy except news.test" msgstr "" -# type: Plain text -#: ../tin.1:2800 +#. type: Plain text +#: doc/tin.1:2851 msgid "" "See the explanation for the $B variables for further " "examples." msgstr "" -# type: SS -#: ../tin.1:2800 +#. type: SS +#: doc/tin.1:2851 #, no-wrap msgid "SIGNATURES" msgstr "" -# type: Plain text -#: ../tin.1:2809 +#. type: Plain text +#: doc/tin.1:2860 msgid "" "B will recognize a signature in either " "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature> or " @@ -6514,31 +6630,31 @@ msgid "" "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature> exists, then the signature will be " "pulled into the editor for mail commands only. A signature in " "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature> will not be pulled into the editor " -"for posting commands since B(1) will append the signature itself." +"for posting commands since B<\\%inews>(1) will append the signature itself." msgstr "" -# type: Plain text -#: ../tin.1:2812 +#. type: Plain text +#: doc/tin.1:2863 msgid "" "A signature in I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig> will be pulled into the " "editor for both posting and mailing commands." msgstr "" -# type: Plain text -#: ../tin.1:2814 +#. type: Plain text +#: doc/tin.1:2865 msgid "The following is an example of a I<.Sig> file:" msgstr "" -# type: Plain text -#: ../tin.1:2819 +#. type: Plain text +#: doc/tin.1:2870 #, no-wrap msgid "" "CWjoe@example.orgE\n" "SNAIL Musterweg 12, 99999 Notreal, Germany>\n" msgstr "" -# type: Plain text -#: ../tin.1:2834 +#. type: Plain text +#: doc/tin.1:2885 msgid "" "B also has the capability to generate random signatures on a per " "newsgroup basis if so desired. The way to accomplish this is to specify the " @@ -6551,256 +6667,458 @@ msgid "" "sig is read from the file I<$HOME/.sigfixed>." msgstr "" -# type: SS -#: ../tin.1:2834 +#. type: SS +#: doc/tin.1:2885 +#, no-wrap +msgid "CUSTOMIZING THE SCREEN FORMAT" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2890 +msgid "" +"The look of the Selection, Group and Thread level can be customized via " +"format strings. These format strings define the content and the position of " +"each element on the screen. Variables are used within the format strings as " +"placeholders. The following variables are available:" +msgstr "" + +#. type: ta +#: doc/tin.1:2893 +#, no-wrap +msgid "\\w'%G 'u +\\w'current group/thread/article number'u" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2910 +#, no-wrap +msgid "" +"B<%D>\tdate\n" +"B<%F>\tfrom, name and/or address\n" +"B<%G>\tnewsgroup name\n" +"B<%I>\tinitials\n" +"B<%L>\tline count\n" +"B<%M>\tmessage-id\n" +"B<%R>\tnumber of responses in thread\n" +"B<%S>\tscore\n" +"B<%T>\tthread tree\n" +"B<%U>\tunread count\n" +"B<%d>\tnewsgroup description\n" +"B<%f>\tnewsgroup flag\n" +"B<%m>\tarticle marks\n" +"B<%n>\tcurrent group/thread/article number\n" +"B<%s>\tsubject\n" +"B<%%>\t%\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2915 +msgid "" +"Not all variables can be used in each level. The following table provides an " +"overview:" +msgstr "" + +#. type: ta +#: doc/tin.1:2918 +#, no-wrap +msgid "" +"\\w'%G 'uC +\\w'B 'uC +\\w'B 'uC " +"+\\w'B'uC" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2936 +#, no-wrap +msgid "" +"\tB\tB\tB\n" +"B<%D>\t\tX\tX\n" +"B<%F>\t\tX\tX\n" +"B<%G>\tX\n" +"B<%I>\t\tX\tX\n" +"B<%L>\t\tX\tX\n" +"B<%M>\t\tX\tX\n" +"B<%R>\t\tX\n" +"B<%S>\t\tX\tX\n" +"B<%T>\t\t\tX\n" +"B<%U>\tX\n" +"B<%d>\tX\n" +"B<%f>\tX\n" +"B<%m>\t\tX\tX\n" +"B<%n>\tX\tX\tX\n" +"B<%s>\t\tX\n" +"B<%%>\tX\tX\tX\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2940 +msgid "Defaults for the format strings:" +msgstr "" + +#. type: ta +#: doc/tin.1:2943 +#, no-wrap +msgid "\\w'select_format 'u +\\w'\"B<%n %m [%L] %T %F>\"'u" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2947 +#, no-wrap +msgid "" +"B:\t\"B<%f %n %U %G %d>\"\n" +"B:\t\"B<%n %m %R %L %s %F>\"\n" +"B:\t\"B<%n %m [%L] %T %F>\"\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2953 +msgid "" +"B controls whether the newsgroup description is shown or " +"not. The description can also be toggled with B " +"('B')." +msgstr "" + +#. type: Plain text +#: doc/tin.1:2958 +msgid "" +"The information displayed with 'B<%F>' depends on the value of " +"B. B resp. B " +"('B') switches through all available options." +msgstr "" + +#. type: Plain text +#: doc/tin.1:2962 +msgid "" +"\\(cqB<%D>' uses B for date representation. It is possible to " +"specify a different date format in round brackets (e.g. 'B<%(%d %b %y " +"%H:%M)D>'). See B for more details." +msgstr "" + +#. type: Plain text +#: doc/tin.1:2972 +msgid "" +"The length of each item (except 'B<%%>') can be defined with a positive " +"number after the 'B<%>'. The following example displays the score in the " +"thread level 10 characters wide: 'B<%10S>'. Some variables do have a default " +"width which may lead to truncation. Truncation for variables which contain " +"only numbers happens by dividing the value with a sufficient power of ten " +"and adding a SI suffix to the result, i.e. the variable holds a value of " +"54321 and the width for the variable is 4 the result will be \"54 k\". If " +"that's undesired you have to specify a larger width manually, " +"i.e. 'B<%6n>'. Here is an overview of the defaults:" +msgstr "" + +#. type: ta +#: doc/tin.1:2975 +#, no-wrap +msgid "\\w'Variable 'u\t+\\w'width'u" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2984 +#, no-wrap +msgid "" +"Variable\twidth\n" +"B<%I>\t 3\n" +"B<%L>\t 4\n" +"B<%M>\t10\n" +"B<%R>\t 3\n" +"B<%S>\t 6\n" +"B<%U>\t 5\n" +"B<%n>\t 4\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:2995 +msgid "" +"If no length is given for 'B<%D>', the length is determined by the format " +"string for the date and the date of the current day. If the date format " +"string contains weekdays or months names it may happen that the date is " +"longer than determined in the first pass. In this case, the date is " +"truncated before display. This occurs, for example, if the current month is " +"May and the article to which the date is displayed was posted in " +"December. In such cases it might useful to determine the maximum length " +"manually and specify the length in the format string." +msgstr "" + +#. type: Plain text +#: doc/tin.1:2999 +msgid "" +"When the format string contains the specifier 'B<%F>' and 'B<%s>' " +"resp. 'B<%T>' and no length are given, 'B<%F>' will use one third and " +"'B<%s>' resp. 'B<%T>' will use two third of the available space." +msgstr "" + +#. type: Plain text +#: doc/tin.1:3007 +msgid "" +"In addition, a minimum screen width can be defined for each item (except " +"\\(cqB<%%>'). In this case, the item will only be displayed when the screen " +"is wider than specified. This comes in handy to not overload a small screen " +"but have maximum information on a large screen. The minimum screen width has " +"to be specified by a positive number preceded by an 'B>'. In the " +"following example B will display the score only if the screen is wider " +"than 100 characters: 'B<%E100S>'." +msgstr "" + +#. type: Plain text +#: doc/tin.1:3015 +msgid "" +"If both the length and the minimum screen width should be specified for an " +"item, the length must be the first parameter and the minimum screen width " +"must be the second one. The following example displays the score with a " +"length of 10 characters only if the screen is wider than 100 characters: " +"\\(cqB<%10E100S>'." +msgstr "" + +#. type: SS +#: doc/tin.1:3015 #, no-wrap msgid "TIPS AND TRICKS" msgstr "" -# type: Plain text -#: ../tin.1:2838 +#. type: Plain text +#: doc/tin.1:3019 msgid "" "B can be pretty much be navigated by using the four cursor keys. The " "left arrow key goes up a level, the right arrow key goes down a level, the " "up arrow key goes up a line and the down arrow key goes down a line." msgstr "" -# type: Plain text -#: ../tin.1:2840 +#. type: Plain text +#: doc/tin.1:3021 msgid "" "The following newsgroups provide useful information concerning news " "software:" msgstr "" -# type: Plain text -#: ../tin.1:2843 +#. type: Plain text +#: doc/tin.1:3024 msgid "" "\\(emnews.software.readers (info. about news user agents tin, rn, nn, slrn " "etc.)" msgstr "" -# type: Plain text -#: ../tin.1:2845 +#. type: Plain text +#: doc/tin.1:3026 msgid "\\(emnews.software.nntp (info. about NNTP)" msgstr "" -# type: Plain text -#: ../tin.1:2847 +#. type: Plain text +#: doc/tin.1:3028 msgid "" "\\(emnews.answers (Frequently Asked Questions (FAQ) about many different " "themes)" msgstr "" -# type: Plain text -#: ../tin.1:2851 +#. type: Plain text +#: doc/tin.1:3032 msgid "" "Many prompts within B offer a default choice that the cursor is " "positioned on. By pressing 'BCRE>' the default value is taken. " "Most prompts can be aborted by pressing 'BESCE>'." msgstr "" -# type: Plain text -#: ../tin.1:2858 +#. type: Plain text +#: doc/tin.1:3039 msgid "" -"When B is run in an B(1x) it will resize itself each time the " -"B(1x) is resized." +"When B is run in an B<\\%xterm>(1x) it will resize itself each time " +"the B<\\%xterm>(1x) is resized." msgstr "" -# type: Plain text -#: ../tin.1:2862 +#. type: Plain text +#: doc/tin.1:3043 msgid "" "B will reread the " "I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file at set " "intervals (B) to show any newly arrived news." msgstr "" -# type: Plain text -#: ../tin.1:2867 +#. type: Plain text +#: doc/tin.1:3048 msgid "" "If you find large number of new newsgroups cluttering up your screen, " "pressing B ('B') will make them go away." msgstr "" -# type: SS -#: ../tin.1:2867 +#. type: SS +#: doc/tin.1:3048 #, no-wrap msgid "XTERM BUTTONS" msgstr "" -# type: Plain text -#: ../tin.1:2873 +#. type: Plain text +#: doc/tin.1:3054 msgid "" -"If the environment variable B<$TERM> is set to B(1x), then button " +"If the environment variable B<$TERM> is set to B<\\%xterm>(1x), then button " "pressing can be used to select groups and articles. In this discussion, the " "buttons are assumed to be assigned conventionally (i.e., Button1 is the left " "button)." msgstr "" -# type: Plain text -#: ../tin.1:2875 +#. type: Plain text +#: doc/tin.1:3056 msgid "In general (i.e., for the group, thread and article menus)," msgstr "" -# type: TP -#: ../tin.1:2875 +#. type: TP +#: doc/tin.1:3056 #, no-wrap msgid "Button1 (left)" msgstr "" -# type: Plain text -#: ../tin.1:2878 +#. type: Plain text +#: doc/tin.1:3059 msgid "enters next (lower) level if you click on an article, otherwise pages down." msgstr "" -# type: TP -#: ../tin.1:2878 +#. type: TP +#: doc/tin.1:3059 #, no-wrap msgid "Button2 (center)" msgstr "" -# type: Plain text -#: ../tin.1:2882 +#. type: Plain text +#: doc/tin.1:3063 msgid "" "returns to the previous (upper) level if you click on an article, otherwise " "pages up." msgstr "" -# type: TP -#: ../tin.1:2882 +#. type: TP +#: doc/tin.1:3063 #, no-wrap msgid "Button3 (right)" msgstr "" -# type: Plain text -#: ../tin.1:2886 +#. type: Plain text +#: doc/tin.1:3067 msgid "" "positions on the article line under mouse cursor, or pages down if you've " "clicked outside the list of articles." msgstr "" -# type: Plain text -#: ../tin.1:2888 +#. type: Plain text +#: doc/tin.1:3069 msgid "In the group selection menu, if the mouse is pointing at a group then:" msgstr "" -# type: TP -#: ../tin.1:2888 ../tin.1:2900 ../tin.1:2914 +#. type: TP +#: doc/tin.1:3069 doc/tin.1:3081 doc/tin.1:3095 #, no-wrap msgid "left button" msgstr "" -# type: Plain text -#: ../tin.1:2892 +#. type: Plain text +#: doc/tin.1:3073 msgid "" "moves to and selects the group pointed at, just like B " "('BCRE>')." msgstr "" -# type: TP -#: ../tin.1:2892 ../tin.1:2904 ../tin.1:2917 +#. type: TP +#: doc/tin.1:3073 doc/tin.1:3085 doc/tin.1:3098 #, no-wrap msgid "center button" msgstr "" -# type: Plain text -#: ../tin.1:2895 +#. type: Plain text +#: doc/tin.1:3076 msgid "quits the program, just like B ('B')." msgstr "" -# type: TP -#: ../tin.1:2895 ../tin.1:2909 ../tin.1:2922 +#. type: TP +#: doc/tin.1:3076 doc/tin.1:3090 doc/tin.1:3103 #, no-wrap msgid "right button" msgstr "" -# type: Plain text -#: ../tin.1:2898 +#. type: Plain text +#: doc/tin.1:3079 msgid "moves to the group pointed at." msgstr "" -# type: Plain text -#: ../tin.1:2900 +#. type: Plain text +#: doc/tin.1:3081 msgid "" "In the article menu, if the mouse is pointing at an article (or thread) " "then:" msgstr "" -# type: Plain text -#: ../tin.1:2904 +#. type: Plain text +#: doc/tin.1:3085 msgid "" "reads the article pointed at, just like B " "('BCRE>'), or the thread, just like B ('B')." msgstr "" -# type: Plain text -#: ../tin.1:2909 +#. type: Plain text +#: doc/tin.1:3090 msgid "" "exits the menu, catching up on the group if you have " "B set in your configuration, just like B " "('B')." msgstr "" -# type: Plain text -#: ../tin.1:2912 +#. type: Plain text +#: doc/tin.1:3093 msgid "moves to the article (or thread) pointed at." msgstr "" -# type: Plain text -#: ../tin.1:2914 +#. type: Plain text +#: doc/tin.1:3095 msgid "In the thread menu, if the mouse is pointing at an article then:" msgstr "" -# type: Plain text -#: ../tin.1:2917 +#. type: Plain text +#: doc/tin.1:3098 msgid "reads article pointed at, just like B ('BCRE>')." msgstr "" -# type: Plain text -#: ../tin.1:2922 +#. type: Plain text +#: doc/tin.1:3103 msgid "" "exits the menu, catching up on the thread if you have " "B set in your configuration, just like B " "('B')." msgstr "" -# type: Plain text -#: ../tin.1:2925 +#. type: Plain text +#: doc/tin.1:3106 msgid "moves to the article pointed at." msgstr "" -# type: Plain text -#: ../tin.1:2932 +#. type: Plain text +#: doc/tin.1:3113 msgid "" "In other menus and areas button pressing reverts back to usual cut and paste " -"of B(1x), but after one click of any button." +"of B<\\%xterm>(1x), but after one click of any button." msgstr "" -# type: SS -#: ../tin.1:2932 +#. type: SS +#: doc/tin.1:3113 #, no-wrap msgid "INDEX FILES" msgstr "" -# type: Plain text -#: ../tin.1:2937 +#. type: Plain text +#: doc/tin.1:3118 msgid "" -"If your news server supports NOV index files (see B(5), most " -"modern installations will) and you have a fast connection to your news " +"If your news server supports NOV index files (see B<\\%newsoverview>(5), " +"most modern installations will) and you have a fast connection to your news " "server then this section can be ignored." msgstr "" -# type: Plain text -#: ../tin.1:2943 +#. type: Plain text +#: doc/tin.1:3124 msgid "" "If your news server doesn't support NOV index files or you have a very slow " "connection to your news server then B can cache the index for each " "newsgroup if B is set to ON. Note that this cache can " -"use up large amounts of diskspace if you read a lot of groups and/or high " +"use up large amounts of disk space if you read a lot of groups and/or high " "traffic groups." msgstr "" -# type: Plain text -#: ../tin.1:2952 +#. type: Plain text +#: doc/tin.1:3133 msgid "" "Each user creates/updates his/her own index files that are stored in " "I<${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news/>. If you " @@ -6811,8 +7129,8 @@ msgid "" "when reading via NNTP then turning on caching will have little or no effect." msgstr "" -# type: Plain text -#: ../tin.1:2959 +#. type: Plain text +#: doc/tin.1:3140 msgid "" "Entering a group the first time tends to be slow because the index file must " "be built from scratch. To alleviate the slowness start B to create all " @@ -6822,29 +7140,28 @@ msgid "" "need to be cached." msgstr "" -# type: Plain text -#: ../tin.1:2964 +#. type: Plain text +#: doc/tin.1:3145 msgid "" "As indexing might take some time you may want to run B form the system " -"batcher B(1) with the ''B<-u>'' option:" +"batcher B<\\%cron>(1) with the ''B<-u>'' option:" msgstr "" -# type: Plain text -#: ../tin.1:2969 +#. type: Plain text +#: doc/tin.1:3150 #, no-wrap msgid "CW<30 6 * * * /usr/local/bin/tin -u>\n" msgstr "" -# type: Plain text -#: ../tin.1:2977 +#. type: Plain text +#: doc/tin.1:3156 msgid "" -"If you are low on local disk space you should consider using B " -"to limit the size of cached indexes and also manually purge cached data for " -"groups you are not reading anymore with something like:" +"If you are low on local disk space you should consider to manually purge " +"cached data for groups you are not reading anymore with something like:" msgstr "" -# type: Plain text -#: ../tin.1:2983 +#. type: Plain text +#: doc/tin.1:3162 #, no-wrap msgid "" "CW\n" msgstr "" -# type: SH -#: ../tin.1:2988 ../tin.5:20 +#. type: SH +#: doc/tin.1:3167 doc/tin.5:21 #, no-wrap msgid "FILES" msgstr "" #. TODO: mention dead.article, dead.articles #. .article[.$$], .cancel[.$$], .letter[.$$]? +#. ${XDG_RUNTIME_DIR:\-"$HOME"}/.slrnfaces #. $PWD/trace[.out] (--with-trace) #. $TMPDIR/NNTP (-D 1) #. $TMPDIR/FILTER (-D 2) @@ -6872,125 +7190,125 @@ msgstr "" #. $TMPDIR/SCOPES-R (-D 32) #. $TMPDIR/SCOPES-W (-D 32) #. $TMPDIR/ACTIVE (-D 64) -# type: Plain text -#: ../tin.1:3005 -msgid "For a detailed description see B(5)." +#. type: Plain text +#: doc/tin.1:3185 +msgid "For a detailed description see B<\\%tin>(5)." msgstr "" -# type: Plain text -#: ../tin.1:3007 ../tin.5:41 +#. type: Plain text +#: doc/tin.1:3187 doc/tin.5:43 msgid "I<$MAILCAPS>" msgstr "" -# type: Plain text -#: ../tin.1:3009 ../tin.5:43 -msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.mailcap>" +#. type: Plain text +#: doc/tin.1:3189 doc/tin.5:45 +msgid "I<~/.mailcap>" msgstr "" -# type: Plain text -#: ../tin.1:3011 ../tin.5:45 +#. type: Plain text +#: doc/tin.1:3191 doc/tin.5:47 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3013 ../tin.5:47 +#. type: Plain text +#: doc/tin.1:3193 doc/tin.5:49 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3015 ../tin.5:49 +#. type: Plain text +#: doc/tin.1:3195 doc/tin.5:51 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3017 ../tin.5:51 +#. type: Plain text +#: doc/tin.1:3197 doc/tin.5:53 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3020 ../tin.5:220 +#. type: Plain text +#: doc/tin.1:3200 doc/tin.5:222 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3023 ../tin.5:230 +#. type: Plain text +#: doc/tin.1:3203 doc/tin.5:232 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.cancelsecret>" msgstr "" -# type: Plain text -#: ../tin.1:3026 ../tin.5:237 +#. type: Plain text +#: doc/tin.1:3206 doc/tin.5:242 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.mime.types>" msgstr "" -# type: Plain text -#: ../tin.1:3028 ../tin.5:239 +#. type: Plain text +#: doc/tin.1:3208 doc/tin.5:244 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3030 ../tin.5:241 +#. type: Plain text +#: doc/tin.1:3210 doc/tin.5:246 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3033 ../tin.5:248 +#. type: Plain text +#: doc/tin.1:3213 doc/tin.5:253 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsauth>" msgstr "" -# type: Plain text -#: ../tin.1:3036 ../tin.5:281 +#. type: Plain text +#: doc/tin.1:3216 doc/tin.5:286 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" msgstr "" -# type: Plain text -#: ../tin.1:3040 ../tin.5:310 +#. type: Plain text +#: doc/tin.1:3220 doc/tin.5:315 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER${NNTPPORT:+\":$NNTPPORT\"}/.oldnewsrc>\n" msgstr "" -# type: Plain text -#: ../tin.1:3044 ../tin.5:318 +#. type: Plain text +#: doc/tin.1:3224 doc/tin.5:323 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature>" msgstr "" -# type: Plain text -#: ../tin.1:3046 ../tin.5:320 +#. type: Plain text +#: doc/tin.1:3226 doc/tin.5:325 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>" msgstr "" -# type: Plain text -#: ../tin.1:3049 ../tin.5:327 +#. type: Plain text +#: doc/tin.1:3229 doc/tin.5:332 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.sigfixed>" msgstr "" -# type: Plain text -#: ../tin.1:3052 ../tin.5:334 +#. type: Plain text +#: doc/tin.1:3232 doc/tin.5:339 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/.inputhistory>" msgstr "" -# type: Plain text -#: ../tin.1:3055 ../tin.5:341 +#. type: Plain text +#: doc/tin.1:3235 doc/tin.5:346 msgid "I<${TIN_INDEX_MAILDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.mail/>" msgstr "" -# type: Plain text -#: ../tin.1:3059 ../tin.5:349 +#. type: Plain text +#: doc/tin.1:3239 doc/tin.5:354 #, no-wrap msgid "I<${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news${NNTPSERVER:+\"-$NNTPSERVER\"}/>\n" msgstr "" -# type: Plain text -#: ../tin.1:3063 ../tin.5:357 +#. type: Plain text +#: doc/tin.1:3243 doc/tin.5:362 msgid "I<${TIN_INDEX_SAVEDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.save/>" msgstr "" -# type: Plain text -#: ../tin.1:3066 ../tin.5:364 +#. type: Plain text +#: doc/tin.1:3246 doc/tin.5:369 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.mail>" msgstr "" -# type: Plain text -#: ../tin.1:3069 ../tin.5:398 +#. type: Plain text +#: doc/tin.1:3249 doc/tin.5:403 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.save>" msgstr "" @@ -6998,67 +7316,67 @@ msgstr "" #. as with inn >= 2.2.x getting more and more popular #. we should think about checking for the new Paths (/news/etc/) #. ${TIN_LIBDIR\-/news/etc"}/attributes -# type: Plain text -#: ../tin.1:3073 ../tin.5:409 +#. type: Plain text +#: doc/tin.1:3253 doc/tin.5:414 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3075 ../tin.5:411 +#. type: Plain text +#: doc/tin.1:3255 doc/tin.5:416 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/attributes>" msgstr "" #. TODO: add missing descriptions and explain things in detail. -# type: Plain text -#: ../tin.1:3078 ../tin.5:736 +#. type: Plain text +#: doc/tin.1:3258 doc/tin.5:747 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter>" msgstr "" -# type: Plain text -#: ../tin.1:3082 ../tin.5:818 +#. type: Plain text +#: doc/tin.1:3262 doc/tin.5:829 #, no-wrap msgid "I\n" msgstr "" -# type: Plain text -#: ../tin.1:3084 ../tin.5:820 +#. type: Plain text +#: doc/tin.1:3264 doc/tin.5:831 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/keymap${${LC_ALL:-\"${LC_CTYPE:-\"${LC_MESSAGES:-\"$LANG\"}\"}\"}:+\".${LC_ALL:-\"${LC_CTYPE:-\"${LC_MESSAGES:-\"$LANG\"}\"}\"}\"}>\n" msgstr "" -# type: Plain text -#: ../tin.1:3088 ../tin.5:1053 +#. type: Plain text +#: doc/tin.1:3268 doc/tin.5:1064 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/mailgroups>" msgstr "" -# type: Plain text -#: ../tin.1:3091 ../tin.5:1069 +#. type: Plain text +#: doc/tin.1:3271 doc/tin.5:1080 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/newsrctable>" msgstr "" -# type: Plain text -#: ../tin.1:3094 ../tin.5:1095 +#. type: Plain text +#: doc/tin.1:3274 doc/tin.5:1106 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/posted>" msgstr "" -# type: Plain text -#: ../tin.1:3097 ../tin.5:1102 +#. type: Plain text +#: doc/tin.1:3277 doc/tin.5:1113 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/posted>" msgstr "" -# type: Plain text -#: ../tin.1:3100 ../tin.5:1112 +#. type: Plain text +#: doc/tin.1:3280 doc/tin.5:1123 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/postponed.articles>" msgstr "" -# type: Plain text -#: ../tin.1:3104 +#. type: Plain text +#: doc/tin.1:3284 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/newsgroups>\n" msgstr "" -# type: Plain text -#: ../tin.1:3109 +#. type: Plain text +#: doc/tin.1:3289 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/serverrc>\n" msgstr "" @@ -7067,23 +7385,23 @@ msgstr "" #. as with inn >= 2.2.x getting more and more popular #. we should think about checking for the new Paths (/news/etc/) #. .IR ${TIN_LIBDIR\-"/news/etc"}/tinrc -# type: Plain text -#: ../tin.1:3114 ../tin.5:1165 +#. type: Plain text +#: doc/tin.1:3294 doc/tin.5:1176 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3116 ../tin.5:1167 +#. type: Plain text +#: doc/tin.1:3296 doc/tin.5:1178 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>" msgstr "" -# type: Plain text -#: ../tin.1:3119 ../tin.5:2269 +#. type: Plain text +#: doc/tin.1:3299 doc/tin.5:2355 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3122 +#. type: Plain text +#: doc/tin.1:3302 msgid "I" msgstr "" @@ -7091,52 +7409,52 @@ msgstr "" #. as with inn >= 2.2.x getting more and more popular #. we should think about checking for the new Paths #. (described shown below). -# type: Plain text -#: ../tin.1:3125 ../tin.5:2376 +#. type: Plain text +#: doc/tin.1:3305 doc/tin.5:2462 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}>" msgstr "" -# type: Plain text -#: ../tin.1:3128 ../tin.5:2436 +#. type: Plain text +#: doc/tin.1:3308 doc/tin.5:2522 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/active.times>" msgstr "" -# type: Plain text -#: ../tin.1:3131 ../tin.5:2463 +#. type: Plain text +#: doc/tin.1:3311 doc/tin.5:2549 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/newsgroups>" msgstr "" -# type: Plain text -#: ../tin.1:3134 ../tin.5:2486 +#. type: Plain text +#: doc/tin.1:3314 doc/tin.5:2572 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/organization>" msgstr "" #. is the Path correct? or is it /news/etc/overview.fmt -# type: Plain text -#: ../tin.1:3137 ../tin.5:2496 +#. type: Plain text +#: doc/tin.1:3317 doc/tin.5:2582 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/overview.fmt>" msgstr "" #. is the Path correct? or is it /news/etc/subscriptions -# type: Plain text -#: ../tin.1:3140 ../tin.5:2514 +#. type: Plain text +#: doc/tin.1:3320 doc/tin.5:2600 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>" msgstr "" -# type: SH -#: ../tin.1:3143 +#. type: SH +#: doc/tin.1:3323 #, no-wrap msgid "ENVIRONMENT" msgstr "" -# type: TP -#: ../tin.1:3157 +#. type: TP +#: doc/tin.1:3326 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3165 +#. type: Plain text +#: doc/tin.1:3334 msgid "" "Define this variable if you want to specify command-line options that B " "should be started with to save typing them each time it is started. The " @@ -7146,112 +7464,126 @@ msgid "" "environment." msgstr "" -# type: TP -#: ../tin.1:3165 +#. type: TP +#: doc/tin.1:3334 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3170 +#. type: Plain text +#: doc/tin.1:3339 msgid "" "Define this variable if you do not want the I<.tin> directory in " "I<$HOME/>. E.g., if you want all B's private files in I you " "would set $B to I." msgstr "" -# type: TP -#: ../tin.1:3170 +#. type: TP +#: doc/tin.1:3339 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3176 +#. type: Plain text +#: doc/tin.1:3345 msgid "" "Define this variable if you do not want the I<.news> directory in " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/>. E.g., if you want all B's news " "index files in I you would set $B to I." msgstr "" -# type: TP -#: ../tin.1:3176 +#. type: TP +#: doc/tin.1:3345 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3182 +#. type: Plain text +#: doc/tin.1:3351 msgid "" "Define this variable if you do not want the I<.mail> directory in " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/>. E.g., if you want all B's mail " "index files in I you would set $B to I." msgstr "" -# type: TP -#: ../tin.1:3182 +#. type: TP +#: doc/tin.1:3351 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3188 +#. type: Plain text +#: doc/tin.1:3357 msgid "" "Define this variable if you do not want the I<.save> directory in " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/>. E.g., if you want all B's save " "index files in I you would set $B to I." msgstr "" -# type: TP -#: ../tin.1:3188 +#. type: TP +#: doc/tin.1:3357 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3193 +#. type: Plain text +#: doc/tin.1:3362 msgid "" "Define this variable if you want to override the B path that was " "compiled into the B binary, default is I. If tin is " "running in NNTP mode setting this variable has no effect." msgstr "" -# type: TP -#: ../tin.1:3193 +#. type: TP +#: doc/tin.1:3362 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3198 +#. type: Plain text +#: doc/tin.1:3367 msgid "" "Define this variable if you want to override the B path that was " "compiled into the B binary, default is I. If tin is " "running in NNTP mode setting this variable has no effect." msgstr "" -# type: TP -#: ../tin.1:3198 +#. type: TP +#: doc/tin.1:3367 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3204 +#. type: Plain text +#: doc/tin.1:3372 msgid "" "Define this variable if you want to override the B path that was " "compiled into the B binary, default is B (see above). If tin " "is running in NNTP mode setting this variable has no effect." msgstr "" -# type: TP -#: ../tin.1:3204 +#. type: TP +#: doc/tin.1:3372 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3378 +msgid "" +"Define this variable if you want to override the B file name " +"that was compiled into the B binary, default is I<.overview>. If tin is " +"running in NNTP mode setting this variable has no effect." +msgstr "" + +#. type: TP +#: doc/tin.1:3378 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3210 +#. type: Plain text +#: doc/tin.1:3384 msgid "" "Define this variable if you want to override the B path " "that was compiled into the B binary. If tin is running in NNTP mode " @@ -7259,14 +7591,14 @@ msgid "" "prepended to $B." msgstr "" -# type: TP -#: ../tin.1:3210 +#. type: TP +#: doc/tin.1:3384 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3216 +#. type: Plain text +#: doc/tin.1:3390 msgid "" "The default NNTP server to remotely read news from. This variable only needs " "to be set if the ''B<-r>'' command-line option is specified and the file " @@ -7274,98 +7606,120 @@ msgid "" "overrides $B." msgstr "" -# type: TP -#: ../tin.1:3216 +#. type: TP +#: doc/tin.1:3390 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3221 +#. type: Plain text +#: doc/tin.1:3395 msgid "" "The NNTP TCP-port to read news from. This variable only needs to be set if " "the TCP-port is not 119 (the default). The ''B<-p>'' command-line option " "overrides $B." msgstr "" -# type: TP -#: ../tin.1:3221 +#. type: TP +#: doc/tin.1:3395 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3225 +#. type: Plain text +#: doc/tin.1:3399 msgid "" "Set the article header field ''Distribution:'' to the contents of the " "variable instead of the system default." msgstr "" -# type: TP -#: ../tin.1:3225 +#. type: TP +#: doc/tin.1:3399 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3229 +#. type: Plain text +#: doc/tin.1:3403 msgid "" "Set the ISO to ASCII charset decoding table character to use in decoding an " -"article text. Values can range from 0 to 6." +"article text. Values can range from -1 to 6." +msgstr "" + +#. type: TP +#: doc/tin.1:3404 +#, no-wrap +msgid "B<-1>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3407 +msgid "no conversion" msgstr "" -# type: Plain text -#: ../tin.1:3233 +#. type: Plain text +#: doc/tin.1:3410 msgid "universal table for many languages" msgstr "" -# type: Plain text -#: ../tin.1:3236 +#. type: Plain text +#: doc/tin.1:3413 msgid "single-spacing universal table" msgstr "" -# type: Plain text -#: ../tin.1:3239 +#. type: Plain text +#: doc/tin.1:3416 msgid "table for Danish, Dutch, German, Norwegian and Swedish" msgstr "" -# type: TP -#: ../tin.1:3239 +#. type: TP +#: doc/tin.1:3416 #, no-wrap msgid "B<3>" msgstr "" -# type: Plain text -#: ../tin.1:3242 +#. type: Plain text +#: doc/tin.1:3419 msgid "" "table for Danish, Finnish, Norwegian and Swedish using the appropriate ISO " "646 variant" msgstr "" -# type: Plain text -#: ../tin.1:3245 -msgid "table with RFC 1345 codes in brackets" +#. type: Plain text +#: doc/tin.1:3422 +msgid "table with B codes in brackets" msgstr "" -# type: TP -#: ../tin.1:3245 +#. type: TP +#: doc/tin.1:3422 #, no-wrap msgid "B<5>" msgstr "" -# type: Plain text -#: ../tin.1:3248 +#. type: Plain text +#: doc/tin.1:3425 msgid "table for printers that allow overstriking with backspace" msgstr "" -# type: TP -#: ../tin.1:3249 +#. type: TP +#: doc/tin.1:3425 +#, no-wrap +msgid "B<6>" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3428 +msgid "table for IBM PC character set (code page 437)" +msgstr "" + +#. type: TP +#: doc/tin.1:3429 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3255 +#. type: Plain text +#: doc/tin.1:3435 msgid "" "Set the article header field ''Organization:'' to the contents of the " "variable instead of the system default. If reading news on an Apollo " @@ -7373,128 +7727,128 @@ msgid "" "of $B." msgstr "" -# type: TP -#: ../tin.1:3255 +#. type: TP +#: doc/tin.1:3435 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3258 +#. type: Plain text +#: doc/tin.1:3438 msgid "DomainOS specific, same as $B on other OSs (see above)." msgstr "" -# type: TP -#: ../tin.1:3258 +#. type: TP +#: doc/tin.1:3438 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3263 +#. type: Plain text +#: doc/tin.1:3443 msgid "" "Set the article header field ''Reply-To:'' to the return address specified " "by the variable. This is useful if you wish to receive replies at a " "different address." msgstr "" -# type: TP -#: ../tin.1:3263 +#. type: TP +#: doc/tin.1:3443 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3267 +#. type: Plain text +#: doc/tin.1:3447 msgid "" "Overrides the full name given in the gecos-files in I, see also " "B." msgstr "" -# type: TP -#: ../tin.1:3267 +#. type: TP +#: doc/tin.1:3447 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3270 +#. type: Plain text +#: doc/tin.1:3450 msgid "Same as $B." msgstr "" -# type: TP -#: ../tin.1:3270 +#. type: TP +#: doc/tin.1:3450 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3275 -msgid "Pathname of the user's home directory. See B(5) for more info." +#. type: Plain text +#: doc/tin.1:3455 +msgid "Pathname of the user's home directory. See B<\\%environ>(5) for more info." msgstr "" -# type: TP -#: ../tin.1:3275 +#. type: TP +#: doc/tin.1:3455 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3279 +#. type: Plain text +#: doc/tin.1:3459 msgid "" "This variable has precedence over the default mailer that is used in all " "mailing operations within B." msgstr "" -# type: TP -#: ../tin.1:3279 +#. type: TP +#: doc/tin.1:3459 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3282 +#. type: Plain text +#: doc/tin.1:3462 msgid "Full path to the user's mailbox." msgstr "" -# type: TP -#: ../tin.1:3282 +#. type: TP +#: doc/tin.1:3462 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3291 +#. type: Plain text +#: doc/tin.1:3471 msgid "" -"This variable has precedence over the default editor (i.e., B(1)) that " -"is used in all editing operations within B (e.g., posting, replying, " -"follow-ups, ...). Evaluation order is I<${VISUAL:-\"${EDITOR:-vi}\"}>. See " -"B(5) for more info." +"This variable has precedence over the default editor (i.e., B<\\%vi>(1)) " +"that is used in all editing operations within B (e.g., posting, " +"replying, follow-ups, ...). Evaluation order is " +"I<${VISUAL:-\"${EDITOR:-vi}\"}>. See B<\\%environ>(5) for more info." msgstr "" -# type: TP -#: ../tin.1:3291 +#. type: TP +#: doc/tin.1:3471 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3300 +#. type: Plain text +#: doc/tin.1:3480 msgid "" "If $B is unset, then this variable is looked up for a default " "editor. If $B and $B are both unset, B uses the systems " -"default editor (i.e. B(1)) on UNIX-systems). See B(5) for " -"more info." +"default editor (i.e. B<\\%vi>(1)) on UNIX-systems). See B<\\%environ>(5) " +"for more info." msgstr "" -# type: TP -#: ../tin.1:3300 +#. type: TP +#: doc/tin.1:3480 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3306 +#. type: Plain text +#: doc/tin.1:3486 msgid "" "A new group is checked against the list of patterns; if it matches, B " "subscribes the user to the group without further query. See the section " @@ -7502,13 +7856,13 @@ msgid "" "example, setting" msgstr "" -# type: Plain text -#: ../tin.1:3308 +#. type: Plain text +#: doc/tin.1:3488 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3313 +#. type: Plain text +#: doc/tin.1:3493 msgid "" "will automatically subscribe the user to all new groups in the comp.os.unix " "hierarchy, and all talk groups other than talk.politics groups (which will " @@ -7516,232 +7870,232 @@ msgid "" "with the ''B<-X>'' command-line switch." msgstr "" -# type: TP -#: ../tin.1:3313 +#. type: TP +#: doc/tin.1:3493 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3317 +#. type: Plain text +#: doc/tin.1:3497 msgid "" "Is handled like the $B variable, but groups matching the list " "are unsubscribed from without further query. For example, setting" msgstr "" -# type: Plain text -#: ../tin.1:3319 +#. type: Plain text +#: doc/tin.1:3499 msgid "I" msgstr "" -# type: Plain text -#: ../tin.1:3323 +#. type: Plain text +#: doc/tin.1:3503 msgid "" "will automatically unsubscribe the user from all new alt.flame groups and " "all groups starting with u (university groups) other than UK groups (which " "will be queried for as usual)." msgstr "" -# type: TP -#: ../tin.1:3323 +#. type: TP +#: doc/tin.1:3503 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3327 +#. type: Plain text +#: doc/tin.1:3507 msgid "" "A pathname of a directory made available for B to create temporary " "files." msgstr "" -# type: TP -#: ../tin.1:3327 +#. type: TP +#: doc/tin.1:3507 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3332 +#. type: Plain text +#: doc/tin.1:3513 msgid "" -"This variable can be used to override the default path search for mailcap " -"files. See also B(5)." +"This variable can be used to override the default path search for " +"B<\\%mailcap>(5) files. See also B<\\%tin>(5)." msgstr "" -# type: TP -#: ../tin.1:3332 +#. type: TP +#: doc/tin.1:3513 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3337 +#. type: Plain text +#: doc/tin.1:3518 msgid "" -"Set this variable to disable the use of B(1) or a replacement " +"Set this variable to disable the use of B<\\%metamail>(1) or a replacement " "(e.g. metamutt)." msgstr "" -# type: TP -#: ../tin.1:3337 +#. type: TP +#: doc/tin.1:3518 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.1:3339 +#. type: TP +#: doc/tin.1:3520 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3344 +#. type: Plain text +#: doc/tin.1:3525 msgid "" -"Set this variable to point to B(1) or a replacement and its " +"Set this variable to point to B<\\%ispell>(1) or a replacement and its " "cmd-line options." msgstr "" -# type: TP -#: ../tin.1:3344 +#. type: TP +#: doc/tin.1:3525 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3351 +#. type: Plain text +#: doc/tin.1:3532 msgid "" -"Define any additional options that you wish to pass to your B(1) or " -"B(1) program." +"Define any additional options that you wish to pass to your B<\\%pgp>(1) or " +"B<\\%gpg>(1) program." msgstr "" -# type: TP -#: ../tin.1:3351 +#. type: TP +#: doc/tin.1:3532 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3356 +#. type: Plain text +#: doc/tin.1:3537 msgid "" -"Override the name of the B(1) directory in B<$HOME> that holds your " +"Override the name of the B<\\%pgp>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" -# type: TP -#: ../tin.1:3356 +#. type: TP +#: doc/tin.1:3537 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3361 +#. type: Plain text +#: doc/tin.1:3542 msgid "" -"Override the name of the B(1) directory in B<$HOME> that holds your " +"Override the name of the B<\\%gpg>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" -# type: TP -#: ../tin.1:3361 +#. type: TP +#: doc/tin.1:3542 #, no-wrap msgid "B" msgstr "" #. TODO: document LC_CTYPEs influence on #. ~/.tin/keymap.*, 8bit char display, ... -# type: Plain text -#: ../tin.1:3375 +#. type: Plain text +#: doc/tin.1:3556 msgid "" -"This variable determines the B(5) category for character handling " -"functions. Usually it determines the character classes for pattern matching " -"character classification and case conversion. Currently this is not true for " -"B (which temporary unsets B<$LC_CTYPE> right before any match is done " -"to avoid confusion). It's value should be of the form " -"I[I<_territory>][I<.codeset>][I<@modifier>]. See B(5) " +"This variable determines the B<\\%locale>(5) category for character " +"handling functions. Usually it determines the character classes for pattern " +"matching character classification and case conversion. Currently this is not " +"true for B (which temporary unsets B<$LC_CTYPE> right before any match " +"is done to avoid confusion). It's value should be of the form " +"I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%environ>(5) " "for more information." msgstr "" -# type: TP -#: ../tin.1:3375 +#. type: TP +#: doc/tin.1:3556 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3384 +#. type: Plain text +#: doc/tin.1:3565 msgid "" "Formats of informative and diagnostic messages and interactive responses. " "It's value should be of the form " -"I[I<_territory>][I<.codeset>][I<@modifier>]. See B(5) and " -"B(5) for more information." +"I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%locale>(5) " +"and B<\\%environ>(5) for more information." msgstr "" -# type: TP -#: ../tin.1:3384 +#. type: TP +#: doc/tin.1:3565 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3392 +#. type: Plain text +#: doc/tin.1:3573 msgid "" "Date and time formats. It's value should be of the form " -"I[I<_territory>][I<.codeset>][I<@modifier>]. See B(5) and " -"B(5) for more information." +"I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%locale>(5) " +"and B<\\%environ>(5) for more information." msgstr "" -# type: TP -#: ../tin.1:3392 +#. type: TP +#: doc/tin.1:3573 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3401 +#. type: Plain text +#: doc/tin.1:3582 msgid "" "This variable overrides the value of the B<$LANG> variable and any other " "B<$LC_> variable. It's value should be of the form " -"I[I<_territory>][I<.codeset>]. See B(5) and B(5) " -"for more information." +"I[I<_territory>][I<.codeset>]. See B<\\%locale>(5) and " +"B<\\%environ>(5) for more information." msgstr "" -# type: TP -#: ../tin.1:3401 +#. type: TP +#: doc/tin.1:3582 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3410 +#. type: Plain text +#: doc/tin.1:3591 msgid "" -"This variable determines the B(5) category for any category not " +"This variable determines the B<\\%locale>(5) category for any category not " "specifically selected with a variable starting with B<$LC_>. It's value " "should be of the form I[I<_territory>][I<.codeset>]. See " -"B(5) for more information." +"B<\\%environ>(5) for more information." msgstr "" -# type: TP -#: ../tin.1:3410 +#. type: TP +#: doc/tin.1:3591 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3418 +#. type: Plain text +#: doc/tin.1:3599 msgid "" "This variable defines a priority list for translations. Whenever a " "translation is not available in the language selected via B<$LC_ALL> or " "B<$LANG> the next language from the list is tried. It's value should be of " -"the form I. See B(5) for more " +"the form I. See B<\\%environ>(5) for more " "information." msgstr "" -# type: TP -#: ../tin.1:3418 +#. type: TP +#: doc/tin.1:3599 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3428 +#. type: Plain text +#: doc/tin.1:3609 msgid "" "A decimal integer E 0 used to indicate the user's preferred width in " "column positions for the terminal screen or window. If this variable is " @@ -7753,14 +8107,14 @@ msgid "" "characteristics." msgstr "" -# type: TP -#: ../tin.1:3428 +#. type: TP +#: doc/tin.1:3609 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3438 +#. type: Plain text +#: doc/tin.1:3619 msgid "" "A decimal integer E 0 used to indicate the user's preferred number of " "lines on a page or the vertical screen or window size in lines. A line in " @@ -7772,63 +8126,109 @@ msgid "" "B<$LINES> unless they wish to override the system selection." msgstr "" -# type: TP -#: ../tin.1:3438 +#. type: TP +#: doc/tin.1:3619 #, no-wrap msgid "B" msgstr "" -# -# -#. TODO: add missing, sort useful, document in detail -# type: Plain text -#: ../tin.1:3447 +#. type: Plain text +#: doc/tin.1:3625 msgid "" "The type of terminal in use. This is used when looking up termcap " -"sequences. See B(5) for more information." +"sequences. See B<\\%environ>(5) for more information." +msgstr "" + +#. type: TP +#: doc/tin.1:3625 +#, no-wrap +msgid "B" msgstr "" -# type: SH -#: ../tin.1:3447 +#. type: Plain text +#: doc/tin.1:3628 +msgid "Display name, pointing to the X server; required for xface." +msgstr "" + +#. type: TP +#: doc/tin.1:3628 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3632 +msgid "" +"Used for determining terminal's X window id; required for xface. Should be " +"set by the terminal emulator." +msgstr "" + +#. type: TP +#: doc/tin.1:3632 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3636 +msgid "" +"The pathname of the user's login shell. Used to set " +"B." +msgstr "" + +#. type: TP +#: doc/tin.1:3636 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3641 +msgid "The pathname of the user's dir to put non-essential runtime files into." +msgstr "" + +#. type: SH +#: doc/tin.1:3641 #, no-wrap msgid "SIGNALS" msgstr "" -# type: Plain text -#: ../tin.1:3450 +#. TODO: add missing, sort useful, document in detail +#. type: Plain text +#: doc/tin.1:3645 msgid "B handles a couple of signals:" msgstr "" -# type: TP -#: ../tin.1:3450 +#. type: TP +#: doc/tin.1:3645 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3453 ../tin.1:3456 +#. type: Plain text +#: doc/tin.1:3648 doc/tin.1:3651 msgid "Terminate gracefully." msgstr "" -# type: TP -#: ../tin.1:3453 +#. type: TP +#: doc/tin.1:3648 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.1:3456 +#. type: TP +#: doc/tin.1:3651 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.1:3459 +#. type: Plain text +#: doc/tin.1:3654 msgid "Terminate gracefully but do not restore tty." msgstr "" -# type: TP -#: ../tin.1:3459 +#. type: TP +#: doc/tin.1:3654 #, no-wrap msgid "B" msgstr "" @@ -7838,19 +8238,19 @@ msgstr "" #. .SH DIAGNOSTICS #. give an overview of the most common error messages and how to cope with #. them. -# type: Plain text -#: ../tin.1:3470 +#. type: Plain text +#: doc/tin.1:3665 msgid "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." msgstr "" -# type: SH -#: ../tin.1:3470 +#. type: SH +#: doc/tin.1:3665 #, no-wrap msgid "SECURITY" msgstr "" -# type: Plain text -#: ../tin.1:3478 +#. type: Plain text +#: doc/tin.1:3673 msgid "" "When B is started in debug mode (''B<-D n>'') it will create world " "readable files in B<$TMPDIR> which may contain the users NNTP password in " @@ -7858,58 +8258,58 @@ msgid "" "before starting tin in debug mode (e.g. B)." msgstr "" -# type: SH -#: ../tin.1:3478 +#. type: SH +#: doc/tin.1:3673 #, no-wrap msgid "CONFORMING TO" msgstr "" -#. - RFC2045, RFC2047, RFC2980, RFC3977, RFC4643, RFC5322 -#. RFC5536, RFC5537, RFC6048 or whatever -# type: Plain text -#: ../tin.1:3486 +#. - RFC\%2045, RFC\%2047, RFC\%2980, RFC\%3977, RFC\%4155, RFC\%4643, +#. RFC\%5322, RFC\%5536, RFC\%5537, RFC\%6048 or whatever +#. type: Plain text +#: doc/tin.1:3681 msgid "" -"B does conform to the Base Definitions volume of IEEE Std 1003.1-2001, " +"B does conform to the Base Definitions volume of IEEE Std 1003.1-2008, " "Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax " "Guidelines)." msgstr "" -# type: SH -#: ../tin.1:3486 +#. type: SH +#: doc/tin.1:3681 #, no-wrap msgid "NOTES" msgstr "" -# type: Plain text -#: ../tin.1:3491 +#. type: Plain text +#: doc/tin.1:3686 msgid "" "Regular expression support is provided by the PCRE library package " -"B(3), which is open source software, written by Philip Hazel, and " +"B<\\%pcre>(3), which is open source software, written by Philip Hazel, and " "copyright by the University of Cambridge, England." msgstr "" -# type: Plain text -#: ../tin.1:3495 -msgid "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/" +#. type: Plain text +#: doc/tin.1:3690 +msgid "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" msgstr "" -# type: SH -#: ../tin.1:3495 +#. type: SH +#: doc/tin.1:3690 #, no-wrap msgid "BUGS" msgstr "" -# type: Plain text -#: ../tin.1:3503 +#. type: Plain text +#: doc/tin.1:3698 msgid "" -"B NNTPd, B(1) (E= V1.0-pre5) and B (E= " +"B NNTPd, B<\\%noffle>(1) (E= V1.0-pre5) and B (E= " "V1.1.91) can't handle pipelined GROUP commands. If you run into trouble with " "any of the mentioned servers define DISABLE_PIPELINING in include/autoconf.h " "and recompile." msgstr "" -# type: Plain text -#: ../tin.1:3512 +#. type: Plain text +#: doc/tin.1:3707 msgid "" "Before mailing a bug-report to Etin-bugs@tin.orgE please check if " "you are using the latest (stable) release, and if not, please upgrade first! " @@ -7919,228 +8319,236 @@ msgid "" "request it." msgstr "" -# type: SH -#: ../tin.1:3512 +#. type: SH +#: doc/tin.1:3707 #, no-wrap msgid "HISTORY" msgstr "" -# type: Plain text -#: ../tin.1:3524 +#. type: Plain text +#: doc/tin.1:3716 msgid "" -"B is based on the B(1) newsreader that was developed by Rich " +"B is based on the B<\\%tass>(1) newsreader that was developed by Rich " "Skrenta and posted to alt.sources in March 1991; its first version was " -"released on August 23rd 1991. B(1) itself was heavily influenced by " -"notesfiles a public domain UNIX version of PLATO Notes, developed at the " +"released on August 23rd 1991. B<\\%tass>(1) itself was heavily influenced " +"by notesfiles a public domain UNIX version of PLATO Notes, developed at the " "University of Illinois by Ray Essick and Rob Kolstad in 1982. For a version " -"overview see Ehttp://www.tin.org/history.htmlE." +"overview see" +msgstr "" + +#. type: Plain text +#: doc/tin.1:3720 +msgid "Ehttp://www.tin.org/history.htmlE." msgstr "" -# type: SH -#: ../tin.1:3524 +#. type: SH +#: doc/tin.1:3720 #, no-wrap msgid "CREDITS" msgstr "" -# type: IP -#: ../tin.1:3526 +#. type: IP +#: doc/tin.1:3722 #, no-wrap msgid "Rich Skrenta" msgstr "" -# type: Plain text -#: ../tin.1:3530 -msgid "author of B(1) v3.2 which this newsreader used as its base." +#. type: Plain text +#: doc/tin.1:3726 +msgid "author of B<\\%tass>(1) v3.2 which this newsreader used as its base." msgstr "" -# type: IP -#: ../tin.1:3530 +#. type: IP +#: doc/tin.1:3726 #, no-wrap msgid "Bill Davidsen" msgstr "" -# type: Plain text -#: ../tin.1:3532 +#. type: Plain text +#: doc/tin.1:3728 msgid "author of envarg.c environment variable reading routine." msgstr "" -# type: IP -#: ../tin.1:3532 +#. type: IP +#: doc/tin.1:3728 #, no-wrap msgid "Mike Gleason" msgstr "" -# type: Plain text -#: ../tin.1:3534 +#. type: Plain text +#: doc/tin.1:3730 msgid "author of sigfile.c random signature generation routines." msgstr "" -# type: IP -#: ../tin.1:3534 +#. type: IP +#: doc/tin.1:3730 #, no-wrap msgid "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" msgstr "" -# type: Plain text -#: ../tin.1:3536 +#. type: Plain text +#: doc/tin.1:3732 msgid "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." msgstr "" -# type: IP -#: ../tin.1:3536 +#. type: IP +#: doc/tin.1:3732 #, no-wrap msgid "Arnold Robbins" msgstr "" -# type: Plain text -#: ../tin.1:3538 +#. type: Plain text +#: doc/tin.1:3734 msgid "author of strftime.c date formatting routine." msgstr "" -# type: IP -#: ../tin.1:3538 +#. type: IP +#: doc/tin.1:3734 #, no-wrap msgid "Rich Salz" msgstr "" -# type: Plain text -#: ../tin.1:3540 +#. type: Plain text +#: doc/tin.1:3736 msgid "author of wildmat.c pattern matching and parsdate.y date parsing routines." msgstr "" -# type: IP -#: ../tin.1:3540 +#. type: IP +#: doc/tin.1:3736 #, no-wrap msgid "Dave Taylor" msgstr "" -# type: Plain text -#: ../tin.1:3544 -msgid "author of curses.c from the B(1) mailreader." +#. type: Plain text +#: doc/tin.1:3740 +msgid "author of curses.c from the B<\\%elm>(1) mailreader." msgstr "" -# type: IP -#: ../tin.1:3544 +#. type: IP +#: doc/tin.1:3740 #, no-wrap msgid "Chris Thewalt" msgstr "" -# type: Plain text -#: ../tin.1:3548 -msgid "author of getline.c B(1) style editing routine." +#. type: Plain text +#: doc/tin.1:3744 +msgid "author of getline.c B<\\%emacs>(1) style editing routine." msgstr "" -# type: IP -#: ../tin.1:3548 +#. type: IP +#: doc/tin.1:3744 #, no-wrap msgid "Steven Madsen" msgstr "" -# type: Plain text -#: ../tin.1:3552 -msgid "for adding B(1) (Pretty Good Privacy) support." +#. type: Plain text +#: doc/tin.1:3748 +msgid "for adding B<\\%pgp>(1) (Pretty Good Privacy) support." msgstr "" -# type: IP -#: ../tin.1:3552 +#. type: IP +#: doc/tin.1:3748 #, no-wrap msgid "Philip Hazel Eph10@cam.ac.ukE" msgstr "" -# type: Plain text -#: ../tin.1:3556 -msgid "for B(3) (Perl-compatible regular expression library)." +#. type: Plain text +#: doc/tin.1:3752 +msgid "for B<\\%pcre>(3) (Perl-compatible regular expression library)." msgstr "" -# type: IP -#: ../tin.1:3556 +#. type: IP +#: doc/tin.1:3752 #, no-wrap msgid "Patrick Powell Epapowell@astart.comE" msgstr "" -# type: Plain text -#: ../tin.1:3564 -msgid "for B(3) and B(3) fallbacks." +#. type: Plain text +#: doc/tin.1:3760 +msgid "for B<\\%snprintf>(3) and B<\\%vsnprintf>(3) fallbacks." msgstr "" -# type: SH -#: ../tin.1:3564 +#. type: SH +#: doc/tin.1:3760 #, no-wrap msgid "AUTHOR" msgstr "" -# type: TP -#: ../tin.1:3565 +#. type: TP +#: doc/tin.1:3761 #, no-wrap msgid "Iain Lea Eiain@bricbrac.deE" msgstr "" -# type: SH -#: ../tin.1:3569 +#. type: SH +#: doc/tin.1:3765 #, no-wrap msgid "MAINTAINER" msgstr "" -# type: TP -#: ../tin.1:3570 +#. type: TP +#: doc/tin.1:3766 #, no-wrap msgid "Urs Janssen Eurs@tin.orgE" msgstr "" -# type: SH -#: ../tin.1:3574 ../tin.5:2527 +#. type: SH +#: doc/tin.1:3770 doc/tin.5:2613 #, no-wrap msgid "SEE ALSO" msgstr "" -# type: Plain text -#: ../tin.1:3623 +#. type: Plain text +#: doc/tin.1:3824 msgid "" -"B(1), B(1), B(1), B(1), B(1), B(1), " -"B(1), B(1), B(1), B(1), B(1), B(1), " -"B(1), B(1), B(1), B(1), B(1), B(1), " -"B(1), B(1), B(1), B(1x), B(3), " -"B(3), B(3), B(3), B(3), " -"B(3), B(3), B(3), B(3), " -"B(5), B(5), B(5), B(5), B(5), " -"B(5), B, B, B, B, B, " -"B, B, B, B, B, B, " -"B" +"B<\\%cron>(1), B<\\%elm>(1), B<\\%emacs>(1), B<\\%gpg>(1), B<\\%inews>(1), " +"B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<\\%metamail>(1), " +"B<\\%noffle>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), B<\\%rn>(1), " +"B<\\%sendmail>(1), B<\\%shar>(1), B<\\%slrnface>(1), B<\\%tass>(1), " +"B<\\%unshar>(1), B<\\%uudecode>(1), B<\\%vi>(1), B<\\%xterm>(1x), " +"B<\\%heapsort>(3), B<\\%iconv>(3), B<\\%iconv_open>(3), " +"B<\\%nl_langinfo>(3), B<\\%pcre>(3), B<\\%pcrepattern>(3), B<\\%qsort>(3), " +"B<\\%snprintf>(3), B<\\%strftime>(3), B<\\%vsnprintf>(3), B<\\%wildmat>(3), " +"B<\\%environ>(5), B<\\%locale>(5), B<\\%mailcap>(5), B<\\%mbox>(5), " +"B<\\%mmdf>(5), B<\\%newsoverview>(5), B<\\%tin>(5), B, " +"B, B, B, B, B, " +"B, B, B, B, B, " +"B, B, B" msgstr "" -# type: Plain text -#: ../tin.5:13 +#. type: Plain text +#: doc/tin.5:13 msgid "tin, rtin - related files" msgstr "" -# type: Plain text -#: ../tin.5:19 +#. type: Plain text +#: doc/tin.5:20 msgid "" "This manpage describes the various (config) files and their formats used by " -"the B(1) newsreader. All files are expected to have unix style ('\\en' " -"aka LF) line endings." +"the B<\\%tin>(1) newsreader. All files are expected to have unix style " +"('\\en' aka LF) line endings." msgstr "" -# type: Plain text -#: ../tin.5:60 +#. type: Plain text +#: doc/tin.5:62 msgid "" -"B(4) files as defined in B. The Mailcap files are read by " -"B(1) to determine how to display non-text messages at the local " -"site. Any line that starts with \"#\" is a comment. Blank lines are " +"B<\\%mailcap>(5) files as defined in B. The mailcap files are " +"read by B<\\%tin>(1) to determine how to display non-text messages at the " +"local site. Any line that starts with \"#\" is a comment. Blank lines are " "ignored. Otherwise, each line defines a single mailcap entry for a single " "content type. Long lines may be continued by ending them with a backslash " "character, \"\\e\"." msgstr "" -# type: Plain text -#: ../tin.5:63 +#. type: Plain text +#: doc/tin.5:65 msgid "" "Each individual mailcap entry consists of a content-type specification, a " "command to execute, and (possibly) a set of optional \"flag\" values." msgstr "" -# type: Plain text -#: ../tin.5:68 +#. type: Plain text +#: doc/tin.5:70 msgid "" "The \"type\" field is simply any legal content type name. It is the string " "that will be matched against the ''Content-Type:'' header to decide if this " @@ -8148,12 +8556,12 @@ msgid "" "type field may specify a subtype or a wildcard to match all subtypes." msgstr "" -# type: Plain text -#: ../tin.5:74 +#. type: Plain text +#: doc/tin.5:76 msgid "" "The \"command\" field is any UNIX command and is used to specify the " "interpreter for the given type of message. It will be passed to the shell " -"via the B(3) facility." +"via the B<\\%system>(3) facility." msgstr "" # @@ -8162,8 +8570,8 @@ msgstr "" #. the number of parts within the multipart object. %F will be replaced by a #. series of arguments, two for each part, giving first the content-type and #. then the name of the temporary file where the decoded part has been stored. -# type: Plain text -#: ../tin.5:91 +#. type: Plain text +#: doc/tin.5:93 msgid "" "Semicolons and backslashes within the command or any flag field must be " "quoted with backslashes. If the field contains \"%s\", those two characters " @@ -8176,19 +8584,19 @@ msgid "" "two characters will be replaced by a single \"%\" character." msgstr "" -# type: Plain text -#: ../tin.5:93 +#. type: Plain text +#: doc/tin.5:95 msgid "Besides the type and command field the following \"flags\" are defined:" msgstr "" -# type: TP -#: ../tin.5:93 +#. type: TP +#: doc/tin.5:95 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:103 +#. type: Plain text +#: doc/tin.5:105 msgid "" "The \"compose\" field may be used to specify a program that can be used to " "compose a new body or body part in the given format. Its intended use is to " @@ -8200,14 +8608,14 @@ msgid "" "the data." msgstr "" -# type: TP -#: ../tin.5:103 +#. type: TP +#: doc/tin.5:105 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:113 +#. type: Plain text +#: doc/tin.5:115 msgid "" "The \"composetyped\" field is similar to the \"compose\" field, but is to be " "used when the composing program needs to specify the ''Content-Type:'' " @@ -8219,14 +8627,14 @@ msgid "" "formats to produce output that includes the mail type information." msgstr "" -# type: TP -#: ../tin.5:113 +#. type: TP +#: doc/tin.5:115 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:119 +#. type: Plain text +#: doc/tin.5:121 msgid "" "The \"edit\" field may be used to specify a program that can be used to edit " "a body or body part in the given format. In many cases, it may be identical " @@ -8234,28 +8642,28 @@ msgid "" "dependent semantics for program execution." msgstr "" -# type: TP -#: ../tin.5:119 +#. type: TP +#: doc/tin.5:121 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:124 +#. type: Plain text +#: doc/tin.5:126 msgid "" "The \"print\" field may be used to specify a program that can be used to " "print a message or body part in the given format. As with the view-command, " "the semantics of program execution are operating system dependent." msgstr "" -# type: TP -#: ../tin.5:124 +#. type: TP +#: doc/tin.5:126 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:133 +#. type: Plain text +#: doc/tin.5:135 msgid "" "The \"test\" field may be used to test some external condition (e.g., the " "machine architecture, or the window system in use) to determine whether or " @@ -8266,14 +8674,14 @@ msgid "" "since a test can call a program, it can already be arbitrarily complex." msgstr "" -# type: TP -#: ../tin.5:133 +#. type: TP +#: doc/tin.5:135 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:145 +#. type: Plain text +#: doc/tin.5:147 msgid "" "The \"needsterminal\" field indicates that the view-command must be run on " "an interactive terminal. This is needed to inform window-oriented user " @@ -8287,14 +8695,14 @@ msgid "" "not executed on either a real terminal or a terminal window." msgstr "" -# type: TP -#: ../tin.5:145 +#. type: TP +#: doc/tin.5:147 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:152 +#. type: Plain text +#: doc/tin.5:154 msgid "" "The \"copiousoutput\" field indicates that the output from the view-command " "will be an extended stream of output, and is to be interpreted as advice to " @@ -8303,28 +8711,28 @@ msgid "" "needsterminal and copiousoutput are both specified." msgstr "" -# type: TP -#: ../tin.5:152 ../tin.5:1062 +#. type: TP +#: doc/tin.5:154 doc/tin.5:1073 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:157 +#. type: Plain text +#: doc/tin.5:159 msgid "" "The \"description\" field simply provides a textual description, optionally " "quoted, that describes the type of data, to be used optionally by mail " "readers that wish to describe the data before offering to display it." msgstr "" -# type: TP -#: ../tin.5:157 +#. type: TP +#: doc/tin.5:159 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:165 +#. type: Plain text +#: doc/tin.5:167 msgid "" "The \"textualnewlines\" field, if set to any non-zero value, indicates that " "this type of data is line-oriented and that, if encoded in base64, all " @@ -8334,28 +8742,28 @@ msgid "" "oriented data that is a subtype of text." msgstr "" -# type: TP -#: ../tin.5:165 +#. type: TP +#: doc/tin.5:167 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:170 +#. type: Plain text +#: doc/tin.5:172 msgid "" "The \"x11-bitmap\" field names a file, in X11 bitmap (xbm) format, which " "points to an appropriate icon to be used to visually denote the presence of " "this kind of data." msgstr "" -# type: TP -#: ../tin.5:170 +#. type: TP +#: doc/tin.5:172 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:178 +#. type: Plain text +#: doc/tin.5:180 msgid "" "The \"nametemplate\" field gives a file name format, in which %s will be " "replaced by a short unique string to give the name of the temporary file to " @@ -8365,352 +8773,355 @@ msgid "" "ending in \".gif\" by using \"nametemplate=%s.gif\"" msgstr "" -# type: Plain text -#: ../tin.5:183 +#. type: Plain text +#: doc/tin.5:185 msgid "" -"B(1) currently only respects the \"test\", \"description\", " +"B<\\%tin>(1) currently only respects the \"test\", \"description\", " "\"nametemplate\" and partly the \"needsterminal\" flags, all other flags are " "internally ignored. It also can't handle the \"%F\" and \"%n\" expansions " "yet." msgstr "" -# type: TP -#: ../tin.5:183 ../tin.5:266 ../tin.5:294 ../tin.5:384 ../tin.5:693 ../tin.5:800 ../tin.5:1082 +#. type: TP +#: doc/tin.5:185 doc/tin.5:271 doc/tin.5:299 doc/tin.5:389 doc/tin.5:704 doc/tin.5:811 doc/tin.5:1093 #, no-wrap msgid "Example:" msgstr "" -# type: Plain text -#: ../tin.5:188 +#. type: Plain text +#: doc/tin.5:190 #, no-wrap msgid "# mailcap file example\n" msgstr "" -# type: Plain text -#: ../tin.5:190 +#. type: Plain text +#: doc/tin.5:192 #, no-wrap msgid "image/*;\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:193 +#. type: Plain text +#: doc/tin.5:195 #, no-wrap msgid "xv -8 -geometry +0 '%s';\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:195 +#. type: Plain text +#: doc/tin.5:197 #, no-wrap msgid "description=%{name} %t-Image;\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:197 +#. type: Plain text +#: doc/tin.5:199 #, no-wrap msgid "test=test \"$DISPLAY\" != \"\";\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:199 +#. type: Plain text +#: doc/tin.5:201 #, no-wrap msgid "nametemplate=%s.IMAGE\n" msgstr "" -# type: Plain text -#: ../tin.5:202 +#. type: Plain text +#: doc/tin.5:204 #, no-wrap msgid "message/rfc822;\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:205 +#. type: Plain text +#: doc/tin.5:207 #, no-wrap msgid "${PAGER:-\"more\"} '%s';\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:207 +#. type: Plain text +#: doc/tin.5:209 #, no-wrap msgid "edit=${EDITOR:-\"vi\"} '%s';\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:209 +#. type: Plain text +#: doc/tin.5:211 #, no-wrap msgid "compose=${EDITOR:-\"vi\"} '%s';\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:211 +#. type: Plain text +#: doc/tin.5:213 #, no-wrap msgid "print=a2ps '%s';\\e\n" msgstr "" -# type: Plain text -#: ../tin.5:213 +#. type: Plain text +#: doc/tin.5:215 #, no-wrap msgid "needsterminal\n" msgstr "" -# type: Plain text -#: ../tin.5:226 +#. type: Plain text +#: doc/tin.5:228 msgid "" "default NNTP-server to read news from if not reading from the local spool. " "\\&'B<-g> I', $B have higher priority (in that order), " "the default server given at compile time has lower priority." msgstr "" -# type: Plain text -#: ../tin.5:233 -msgid "secret to be used for canlocks" +#. type: Plain text +#: doc/tin.5:238 +msgid "" +"secret to be used for cancel-locks if B<\\%tin>(1) is build with support " +"for it. An empty secret file disables the cancel-lock creation in that " +"case. This file should be readable only for the user." msgstr "" -# type: Plain text -#: ../tin.5:244 +#. type: Plain text +#: doc/tin.5:249 msgid "mime type / filename extension pairs" msgstr "" -# type: Plain text -#: ../tin.5:256 +#. type: Plain text +#: doc/tin.5:261 msgid "" "\"I I [I]\" pairs for NNTP servers that require " "authorization. If the password contains a space or a tab it must be enclosed " -"in doublequotes (\"). Usernames must not be enclosed in doublequotes and " +"in double quotes (\"). Usernames must not be enclosed in double quotes and " "thus can't contain spaces or tabs. Any line that starts with \"#\" is a " "comment. Blank lines are ignored. This file should be readable only for the " "user as it contains the user's uncrypted password for reading news!" msgstr "" -# type: TP -#: ../tin.5:256 ../tin.5:1073 +#. type: TP +#: doc/tin.5:261 doc/tin.5:1084 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:259 ../tin.5:1076 +#. type: Plain text +#: doc/tin.5:264 doc/tin.5:1087 msgid "full qualified domain name of the newsserver." msgstr "" -# type: TP -#: ../tin.5:259 +#. type: TP +#: doc/tin.5:264 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:262 +#. type: Plain text +#: doc/tin.5:267 msgid "user's uncrypted password for reading news." msgstr "" -# type: TP -#: ../tin.5:262 +#. type: TP +#: doc/tin.5:267 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:266 +#. type: Plain text +#: doc/tin.5:271 msgid "" "username on the newsserver if it differs from the local login. This field is " "optional." msgstr "" -# type: Plain text -#: ../tin.5:270 +#. type: Plain text +#: doc/tin.5:275 msgid "# sample .newsauth file" msgstr "" -# type: Plain text -#: ../tin.5:272 +#. type: Plain text +#: doc/tin.5:277 msgid "news.example.org secret" msgstr "" -# type: Plain text -#: ../tin.5:274 +#. type: Plain text +#: doc/tin.5:279 msgid "news.example.net arcane guest" msgstr "" -# type: Plain text -#: ../tin.5:276 +#. type: Plain text +#: doc/tin.5:281 msgid "news.example.com \"top secret\" james.bond@example.com" msgstr "" -# type: Plain text -#: ../tin.5:284 +#. type: Plain text +#: doc/tin.5:289 msgid "\"II [I
[,I
| -I
]...]\" lines." msgstr "" -# type: TP -#: ../tin.5:284 +#. type: TP +#: doc/tin.5:289 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:287 +#. type: Plain text +#: doc/tin.5:292 msgid "the name of the newsgroup." msgstr "" -# type: TP -#: ../tin.5:287 +#. type: TP +#: doc/tin.5:292 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:290 +#. type: Plain text +#: doc/tin.5:295 msgid "a flag indicating if the group is subscribed ':' or not '!'." msgstr "" -# type: TP -#: ../tin.5:290 +#. type: TP +#: doc/tin.5:295 #, no-wrap msgid "B
" msgstr "" -# type: Plain text -#: ../tin.5:294 +#. type: Plain text +#: doc/tin.5:299 msgid "" "range of already read articles from that group; numbers separated by commas " "with sequential numbers collapsed with hyphens." msgstr "" -# type: Plain text -#: ../tin.5:298 +#. type: Plain text +#: doc/tin.5:303 msgid "# sample .newsrc file" msgstr "" -# type: Plain text -#: ../tin.5:300 +#. type: Plain text +#: doc/tin.5:305 msgid "news.software.b! 1-666,669" msgstr "" -# type: Plain text -#: ../tin.5:302 +#. type: Plain text +#: doc/tin.5:307 msgid "news.software.nntp: 1-13245,13247,13249" msgstr "" -# type: Plain text -#: ../tin.5:304 +#. type: Plain text +#: doc/tin.5:309 msgid "news.software.readers: 1-19567,19571-19597" msgstr "" -# type: Plain text -#: ../tin.5:314 +#. type: Plain text +#: doc/tin.5:319 msgid "backup of I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" msgstr "" -# type: Plain text -#: ../tin.5:323 +#. type: Plain text +#: doc/tin.5:328 msgid "signature" msgstr "" -# type: Plain text -#: ../tin.5:330 +#. type: Plain text +#: doc/tin.5:335 msgid "fixed part of a randomly generated signature" msgstr "" -# type: Plain text -#: ../tin.5:337 +#. type: Plain text +#: doc/tin.5:342 msgid "history of last used strings" msgstr "" -# type: Plain text -#: ../tin.5:344 +#. type: Plain text +#: doc/tin.5:349 msgid "mailgroups index files" msgstr "" -# type: Plain text -#: ../tin.5:353 +#. type: Plain text +#: doc/tin.5:358 msgid "newsgroups index files" msgstr "" -# type: Plain text -#: ../tin.5:360 +#. type: Plain text +#: doc/tin.5:365 msgid "saved newsgroups index files" msgstr "" -# type: Plain text -#: ../tin.5:370 +#. type: Plain text +#: doc/tin.5:375 msgid "" "active file (\"I I I I\" " -"quadruples) of user's mailgroups (requires B(1) to be build with " +"quadruples) of user's mailgroups (requires B<\\%tin>(1) to be build with " "mh-mail-handling support)." msgstr "" -# type: TP -#: ../tin.5:370 +#. type: TP +#: doc/tin.5:375 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:373 +#. type: Plain text +#: doc/tin.5:378 msgid "must be the pathname of the mailbox relative to field #4 with / changed to ." msgstr "" -# type: TP -#: ../tin.5:373 +#. type: TP +#: doc/tin.5:378 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:377 +#. type: Plain text +#: doc/tin.5:382 msgid "" "just put a large number here, something higher than the highest message in " "the mailbox" msgstr "" -# type: TP -#: ../tin.5:377 +#. type: TP +#: doc/tin.5:382 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:380 +#. type: Plain text +#: doc/tin.5:385 msgid "put 0 here" msgstr "" -# type: TP -#: ../tin.5:380 +#. type: TP +#: doc/tin.5:385 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:384 +#. type: Plain text +#: doc/tin.5:389 msgid "" "path of mail spool directory. This must be the full pathname to the root of " "the mail folder area." msgstr "" -# type: Plain text -#: ../tin.5:388 +#. type: Plain text +#: doc/tin.5:393 msgid "Mail.inbox 12345 00000 /home/foo" msgstr "" -# type: Plain text -#: ../tin.5:390 +#. type: Plain text +#: doc/tin.5:395 msgid "Mail.outbox 23456 00000 /home/foo" msgstr "" -# type: Plain text -#: ../tin.5:394 +#. type: Plain text +#: doc/tin.5:399 msgid "" "This allows access to the 'inbox' and 'outbox' folders of user foo. They " "are accessed via /home/foo/Mail/inbox and /home/foo/Mail/outbox" msgstr "" -# type: Plain text -#: ../tin.5:401 +#. type: Plain text +#: doc/tin.5:406 msgid "active file of user's saved newsgroups, used by B." msgstr "" -# type: Plain text -#: ../tin.5:423 +#. type: Plain text +#: doc/tin.5:428 msgid "" "The group attributes files may be used to override some global settings from " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc> on a per group basis. Order is " @@ -8724,108 +9135,108 @@ msgid "" "attributes are available:" msgstr "" -# type: TP -#: ../tin.5:423 +#. type: TP +#: doc/tin.5:428 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:429 +#. type: Plain text +#: doc/tin.5:434 msgid "" "This changes the list of groups to which the attributes that follow will be " -"applied. See the section NEWSGROUP LISTS & WILDCARDS in B(1) for the " -"types of pattern that can be used here." +"applied. See the section NEWSGROUP LISTS & WILDCARDS in B<\\%tin>(1) for " +"the types of pattern that can be used here." msgstr "" -# type: TP -#: ../tin.5:429 ../tin.5:1185 +#. type: TP +#: doc/tin.5:434 doc/tin.5:1196 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:432 ../tin.5:435 ../tin.5:438 ../tin.5:441 ../tin.5:444 ../tin.5:447 ../tin.5:450 ../tin.5:463 ../tin.5:473 ../tin.5:486 ../tin.5:489 ../tin.5:492 ../tin.5:495 ../tin.5:502 ../tin.5:505 ../tin.5:532 ../tin.5:535 ../tin.5:538 ../tin.5:548 ../tin.5:551 ../tin.5:554 ../tin.5:557 ../tin.5:560 ../tin.5:563 ../tin.5:566 ../tin.5:569 ../tin.5:572 ../tin.5:575 ../tin.5:581 ../tin.5:584 ../tin.5:587 ../tin.5:590 ../tin.5:593 ../tin.5:596 ../tin.5:599 ../tin.5:605 ../tin.5:608 ../tin.5:611 ../tin.5:614 ../tin.5:617 ../tin.5:620 ../tin.5:623 ../tin.5:626 ../tin.5:629 ../tin.5:683 +#. type: Plain text +#: doc/tin.5:437 doc/tin.5:440 doc/tin.5:443 doc/tin.5:446 doc/tin.5:449 doc/tin.5:452 doc/tin.5:455 doc/tin.5:468 doc/tin.5:478 doc/tin.5:491 doc/tin.5:494 doc/tin.5:497 doc/tin.5:500 doc/tin.5:503 doc/tin.5:510 doc/tin.5:513 doc/tin.5:540 doc/tin.5:543 doc/tin.5:546 doc/tin.5:556 doc/tin.5:559 doc/tin.5:562 doc/tin.5:565 doc/tin.5:568 doc/tin.5:571 doc/tin.5:574 doc/tin.5:577 doc/tin.5:580 doc/tin.5:583 doc/tin.5:589 doc/tin.5:592 doc/tin.5:595 doc/tin.5:598 doc/tin.5:601 doc/tin.5:604 doc/tin.5:607 doc/tin.5:613 doc/tin.5:616 doc/tin.5:619 doc/tin.5:622 doc/tin.5:625 doc/tin.5:628 doc/tin.5:631 doc/tin.5:634 doc/tin.5:637 doc/tin.5:640 doc/tin.5:694 msgid "Identical to the tinrc variable of the same name" msgstr "" -# type: TP -#: ../tin.5:432 ../tin.5:1189 +#. type: TP +#: doc/tin.5:437 doc/tin.5:1200 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:435 ../tin.5:1192 +#. type: TP +#: doc/tin.5:440 doc/tin.5:1203 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:438 +#. type: TP +#: doc/tin.5:443 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:441 ../tin.5:1235 +#. type: TP +#: doc/tin.5:446 doc/tin.5:1246 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:444 ../tin.5:1239 +#. type: TP +#: doc/tin.5:449 doc/tin.5:1250 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:447 ../tin.5:1246 +#. type: TP +#: doc/tin.5:452 doc/tin.5:1257 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:450 +#. type: TP +#: doc/tin.5:455 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:454 +#. type: Plain text +#: doc/tin.5:459 msgid "" "Automatically perform the B ('B') command after " "entering the group." msgstr "" -# type: TP -#: ../tin.5:454 ../tin.5:1252 +#. type: TP +#: doc/tin.5:459 doc/tin.5:1263 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:460 +#. type: Plain text +#: doc/tin.5:465 msgid "" "Can be used to override the global setting in tinrc on a per group " "basis. For more information read section AUTOMATIC MAILING AND SAVING NEW " -"NEWS in B(1)." +"NEWS in B<\\%tin>(1)." msgstr "" -# type: TP -#: ../tin.5:460 ../tin.5:1366 +#. type: TP +#: doc/tin.5:465 doc/tin.5:1377 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:463 +#. type: TP +#: doc/tin.5:468 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:470 +#. type: Plain text +#: doc/tin.5:475 msgid "" "If this is set to ON, then saved article files that have been post-processed " "will be automatically deleted, otherwise the user will be asked whether to " @@ -8833,104 +9244,110 @@ msgid "" "using B ('B') will suppress prompting." msgstr "" -# type: TP -#: ../tin.5:470 ../tin.5:1481 +#. type: TP +#: doc/tin.5:475 doc/tin.5:1492 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:473 +#. type: TP +#: doc/tin.5:478 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:477 +#. type: Plain text +#: doc/tin.5:482 msgid "" "Mailbox to save sent mails. The format of the mailbox is controlled via the " "tinrc B variable." msgstr "" -# type: TP -#: ../tin.5:477 +#. type: TP +#: doc/tin.5:482 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:480 +#. type: Plain text +#: doc/tin.5:485 msgid "Set ''Followup-To:'' header to the specified group(s)." msgstr "" -# type: TP -#: ../tin.5:480 ../tin.5:763 +#. type: TP +#: doc/tin.5:485 doc/tin.5:774 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:483 +#. type: Plain text +#: doc/tin.5:488 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:483 ../tin.5:1505 +#. type: TP +#: doc/tin.5:488 doc/tin.5:1516 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:486 ../tin.5:1572 +#. type: TP +#: doc/tin.5:491 doc/tin.5:1519 +#, no-wrap +msgid "B" +msgstr "" + +#. type: TP +#: doc/tin.5:494 doc/tin.5:1603 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:489 ../tin.5:1584 ../tin.5:2306 +#. type: TP +#: doc/tin.5:497 doc/tin.5:1615 doc/tin.5:2392 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:492 ../tin.5:1601 +#. type: TP +#: doc/tin.5:500 doc/tin.5:1634 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:495 +#. type: TP +#: doc/tin.5:503 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:499 +#. type: Plain text +#: doc/tin.5:507 msgid "" "Used when a group is a mailing list. All responses to the group will be " "directed to this email address instead" msgstr "" -# type: TP -#: ../tin.5:499 ../tin.5:1639 +#. type: TP +#: doc/tin.5:507 doc/tin.5:1672 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:502 ../tin.5:1636 +#. type: TP +#: doc/tin.5:510 doc/tin.5:1669 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:505 +#. type: TP +#: doc/tin.5:513 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:522 +#. type: Plain text +#: doc/tin.5:530 msgid "" "Determines whether usenet articles are forwarded as attachment or " "inline. When set to OFF, the forwarded article will be included in the body " @@ -8948,14 +9365,14 @@ msgid "" "B has to be set to 0 (which is the default)." msgstr "" -# type: TP -#: ../tin.5:522 +#. type: TP +#: doc/tin.5:530 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:529 +#. type: Plain text +#: doc/tin.5:537 msgid "" "A comma separated list of MIME major/minor Content-Types that will be saved " "when using the view/save and save/autosave features. A single * can be used " @@ -8963,32 +9380,32 @@ msgid "" "entry will negate it, eg: image/*,!image/bmp,!text/html. Default is */*" msgstr "" -# type: TP -#: ../tin.5:529 ../tin.5:1718 +#. type: TP +#: doc/tin.5:537 doc/tin.5:1751 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:532 ../tin.5:1725 +#. type: TP +#: doc/tin.5:540 doc/tin.5:1758 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:535 ../tin.5:1734 +#. type: TP +#: doc/tin.5:543 doc/tin.5:1767 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:538 ../tin.5:2279 +#. type: TP +#: doc/tin.5:546 doc/tin.5:2365 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:545 +#. type: Plain text +#: doc/tin.5:553 msgid "" "This can be used to set the article header field ''Organization:''. It " "overrides the setting (if any) of organization in I " @@ -8996,213 +9413,219 @@ msgid "" "newsserver might still overwrite the \\&''Organization:'' header." msgstr "" -# type: TP -#: ../tin.5:545 ../tin.5:1759 +#. type: TP +#: doc/tin.5:553 doc/tin.5:1795 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:548 ../tin.5:1763 +#. type: TP +#: doc/tin.5:556 doc/tin.5:1799 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:551 ../tin.5:1774 ../tin.5:2303 +#. type: TP +#: doc/tin.5:559 doc/tin.5:1810 doc/tin.5:2389 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:554 ../tin.5:1786 +#. type: TP +#: doc/tin.5:562 doc/tin.5:1823 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:557 ../tin.5:1779 +#. type: TP +#: doc/tin.5:565 doc/tin.5:1815 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:560 ../tin.5:1809 +#. type: TP +#: doc/tin.5:568 doc/tin.5:1846 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:563 ../tin.5:1823 +#. type: TP +#: doc/tin.5:571 doc/tin.5:1860 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:566 ../tin.5:1827 +#. type: TP +#: doc/tin.5:574 doc/tin.5:1864 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:569 ../tin.5:1831 +#. type: TP +#: doc/tin.5:577 doc/tin.5:1868 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:572 ../tin.5:1891 +#. type: TP +#: doc/tin.5:580 doc/tin.5:1928 #, no-wrap msgid "B" msgstr "" #. TODO: document option -# type: TP -#: ../tin.5:575 +#. type: TP +#: doc/tin.5:583 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:578 ../tin.5:1919 +#. type: TP +#: doc/tin.5:586 doc/tin.5:1985 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:581 ../tin.5:1945 +#. type: TP +#: doc/tin.5:589 doc/tin.5:2011 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:584 ../tin.5:1963 +#. type: TP +#: doc/tin.5:592 doc/tin.5:2029 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:587 ../tin.5:1971 +#. type: TP +#: doc/tin.5:595 doc/tin.5:2037 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:590 ../tin.5:1974 +#. type: TP +#: doc/tin.5:598 doc/tin.5:2040 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:593 ../tin.5:1977 +#. type: TP +#: doc/tin.5:601 doc/tin.5:2043 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:596 ../tin.5:1988 +#. type: TP +#: doc/tin.5:604 doc/tin.5:2054 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:599 ../tin.5:1998 +#. type: TP +#: doc/tin.5:607 doc/tin.5:2064 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:602 +#. type: Plain text +#: doc/tin.5:610 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:602 ../tin.5:2027 +#. type: TP +#: doc/tin.5:610 doc/tin.5:2093 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:605 ../tin.5:2056 +#. type: TP +#: doc/tin.5:613 doc/tin.5:2122 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:608 ../tin.5:2084 +#. type: TP +#: doc/tin.5:616 doc/tin.5:2151 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:611 ../tin.5:2089 +#. type: TP +#: doc/tin.5:619 doc/tin.5:2156 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:614 ../tin.5:2104 +#. type: TP +#: doc/tin.5:622 doc/tin.5:2190 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:617 ../tin.5:2099 +#. type: TP +#: doc/tin.5:625 doc/tin.5:2166 +#, no-wrap +msgid "B" +msgstr "" + +#. type: TP +#: doc/tin.5:628 doc/tin.5:2185 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:620 ../tin.5:2128 +#. type: TP +#: doc/tin.5:631 doc/tin.5:2214 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:623 ../tin.5:2208 +#. type: TP +#: doc/tin.5:634 doc/tin.5:2294 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:626 ../tin.5:2255 +#. type: TP +#: doc/tin.5:637 doc/tin.5:2341 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:629 +#. type: TP +#: doc/tin.5:640 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:634 +#. type: Plain text +#: doc/tin.5:645 msgid "" "A piece of text that will be added at the start of a message body. If this " "string starts with a / or ~ then it is assumed to be the name of a file " "containing the text to insert." msgstr "" -# type: TP -#: ../tin.5:634 +#. type: TP +#: doc/tin.5:645 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:637 +#. type: Plain text +#: doc/tin.5:648 msgid "Insert ''X-Comment-To:'' header, this is only useful in FIDO groups." msgstr "" -# type: TP -#: ../tin.5:637 +#. type: TP +#: doc/tin.5:648 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:645 +#. type: Plain text +#: doc/tin.5:656 msgid "" "A string including header-name and the contents of the header that will be " "automatically added when posting. If the string starts with a / or ~ then it " @@ -9212,61 +9635,61 @@ msgid "" "content." msgstr "" -# type: TP -#: ../tin.5:645 +#. type: TP +#: doc/tin.5:656 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:651 +#. type: Plain text +#: doc/tin.5:662 msgid "" "A comma-separated list of newsgroup patterns (wildmat-style) to which groups " "the filter rule added by B will be applied. If unset the " "default from the tinrc variable B will be used." msgstr "" -# type: TP -#: ../tin.5:651 +#. type: TP +#: doc/tin.5:662 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:654 +#. type: Plain text +#: doc/tin.5:665 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:654 +#. type: TP +#: doc/tin.5:665 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:657 +#. type: Plain text +#: doc/tin.5:668 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:657 +#. type: TP +#: doc/tin.5:668 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:660 +#. type: Plain text +#: doc/tin.5:671 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:660 +#. type: TP +#: doc/tin.5:671 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:666 +#. type: Plain text +#: doc/tin.5:677 msgid "" "A comma-separated list of newsgroup patterns (wildmat-style) to which groups " "the filter rule added by B will be applied. If unset the " @@ -9274,75 +9697,75 @@ msgid "" "used." msgstr "" -# type: TP -#: ../tin.5:666 +#. type: TP +#: doc/tin.5:677 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:669 +#. type: Plain text +#: doc/tin.5:680 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:669 +#. type: TP +#: doc/tin.5:680 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:672 +#. type: Plain text +#: doc/tin.5:683 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:672 +#. type: TP +#: doc/tin.5:683 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:675 +#. type: Plain text +#: doc/tin.5:686 msgid "Identical to the tinrc variable B" msgstr "" -# type: TP -#: ../tin.5:675 +#. type: TP +#: doc/tin.5:686 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:680 +#. type: Plain text +#: doc/tin.5:691 msgid "" -"Path and options for B(1)-like spell-checker, e.g. \"aspell " +"Path and options for B<\\%ispell>(1)-like spell-checker, e.g. \"aspell " "--mode=email --dont-backup check\"" msgstr "" -# type: TP -#: ../tin.5:680 ../tin.5:1672 +#. type: TP +#: doc/tin.5:691 doc/tin.5:1705 #, no-wrap msgid "B" msgstr "" -# type: TP -#: ../tin.5:683 +#. type: TP +#: doc/tin.5:694 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:692 +#. type: Plain text +#: doc/tin.5:703 msgid "" "Assume (broken) articles without MIME charset declaration have this charset " "- default is US-ASCII. This attribute works only on systems with working " -"B(3), others might have to compile B(1) with " +"B<\\%iconv>(3), others might have to compile B<\\%tin>(1) with " "--disable-mime-strict-charset." msgstr "" -# type: Plain text -#: ../tin.5:702 +#. type: Plain text +#: doc/tin.5:713 #, no-wrap msgid "" "# include extra headers\n" @@ -9352,8 +9775,8 @@ msgid "" "undeclared_charset=ISO-8859-1\n" msgstr "" -# type: Plain text -#: ../tin.5:706 +#. type: Plain text +#: doc/tin.5:717 #, no-wrap msgid "" "# in *sources* set post process type to shar only\n" @@ -9361,8 +9784,8 @@ msgid "" "post_process_type=1\n" msgstr "" -# type: Plain text -#: ../tin.5:713 +#. type: Plain text +#: doc/tin.5:724 #, no-wrap msgid "" "# in *binaries* turn on full post processing,\n" @@ -9373,8 +9796,8 @@ msgid "" "followup_to=poster\n" msgstr "" -# type: Plain text -#: ../tin.5:719 +#. type: Plain text +#: doc/tin.5:730 #, no-wrap msgid "" "# in fido.* newsgroups change quote_chars\n" @@ -9384,8 +9807,8 @@ msgid "" "x_comment_to=ON\n" msgstr "" -# type: Plain text -#: ../tin.5:725 +#. type: Plain text +#: doc/tin.5:736 #, no-wrap msgid "" "# in *.test newsgroups, don't append signature\n" @@ -9395,8 +9818,8 @@ msgid "" "x_headers=Subject: test - ignore - no reply\n" msgstr "" -# type: Plain text -#: ../tin.5:729 +#. type: Plain text +#: doc/tin.5:740 #, no-wrap msgid "" "# assume ISO-2022-JP-2 as charset\n" @@ -9404,22 +9827,22 @@ msgid "" "undeclared_charset=ISO-2022-JP-2\n" msgstr "" -# type: Plain text -#: ../tin.5:741 +#. type: Plain text +#: doc/tin.5:752 msgid "" "The filter file is used to assign scores to certain articles. Based on the " "score an article can be filtered out (hidden) or marked hot. Empty lines or " "lines beginning with a '#' are ignored." msgstr "" -# type: TP -#: ../tin.5:741 +#. type: TP +#: doc/tin.5:752 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:750 +#. type: Plain text +#: doc/tin.5:761 msgid "" "Every entry (rule) in the filter file might get a comment. Multiple lines " "are allowed (but only for comments yet). Every line must start with the " @@ -9429,140 +9852,140 @@ msgid "" "ignored and your comments will get lost on the next write of the file." msgstr "" -# type: TP -#: ../tin.5:750 +#. type: TP +#: doc/tin.5:761 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:754 +#. type: Plain text +#: doc/tin.5:765 msgid "" "A comma-separated list of newsgroup patterns (wildmat-style) to which groups " "the filter rule will be applied. This line is mandatory!" msgstr "" -# type: TP -#: ../tin.5:754 +#. type: TP +#: doc/tin.5:765 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:757 +#. type: Plain text +#: doc/tin.5:768 msgid "0=case-sensitive, 1=case-insensitive" msgstr "" -# type: TP -#: ../tin.5:757 +#. type: TP +#: doc/tin.5:768 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:760 +#. type: Plain text +#: doc/tin.5:771 msgid "" "Score value of the rule; can also be one of the magic words \"kill\" or " "\"hot\"." msgstr "" -# type: TP -#: ../tin.5:760 +#. type: TP +#: doc/tin.5:771 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:763 +#. type: Plain text +#: doc/tin.5:774 msgid "Match against ''Subject:''" msgstr "" -# type: Plain text -#: ../tin.5:771 +#. type: Plain text +#: doc/tin.5:782 msgid "" -"Match against ''From:''. B(1) converts the contents of the ''From:'' " -"header to an old style e-mail address, e.g. ''some@body.example (John Doe)'' " -"instead of ''John Doe Esome@body.exampleE'', before trying to match " -"the patterns in the filter rule." +"Match against ''From:''. B<\\%tin>(1) converts the contents of the " +"''From:'' header to an old style e-mail address, e.g. ''some@body.example " +"(John Doe)'' instead of ''John Doe Esome@body.exampleE'', before " +"trying to match the patterns in the filter rule." msgstr "" -# type: TP -#: ../tin.5:771 +#. type: TP +#: doc/tin.5:782 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:774 +#. type: Plain text +#: doc/tin.5:785 msgid "Match against ''Message-ID:'' and full ''References:''" msgstr "" -# type: TP -#: ../tin.5:774 +#. type: TP +#: doc/tin.5:785 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:777 +#. type: Plain text +#: doc/tin.5:788 msgid "Match against ''Message-ID:'' and last ''References:'' entry only" msgstr "" -# type: TP -#: ../tin.5:777 +#. type: TP +#: doc/tin.5:788 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:780 +#. type: Plain text +#: doc/tin.5:791 msgid "Match against ''Message-ID:''" msgstr "" -# type: TP -#: ../tin.5:780 +#. type: TP +#: doc/tin.5:791 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:783 +#. type: Plain text +#: doc/tin.5:794 msgid "Match against ''References:''" msgstr "" -# type: TP -#: ../tin.5:783 +#. type: TP +#: doc/tin.5:794 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:786 +#. type: Plain text +#: doc/tin.5:797 msgid "" "Match against ''Lines:'', Enum matches less than, Enum matches more " "than." msgstr "" #. TODO: document option in detail -# type: TP -#: ../tin.5:786 +#. type: TP +#: doc/tin.5:797 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:790 +#. type: Plain text +#: doc/tin.5:801 msgid "Match against ''From:'' address parser return codes." msgstr "" -# type: TP -#: ../tin.5:790 +#. type: TP +#: doc/tin.5:801 #, no-wrap msgid "B" msgstr "" -# type: Plain text -#: ../tin.5:796 +#. type: Plain text +#: doc/tin.5:807 msgid "" "Match against ''Xref:'' line. Before any matching is done the line is turned " "into the same format ''Newsgroups:'' has that is it is turned into a comma " @@ -9570,19 +9993,19 @@ msgid "" "counter) removed." msgstr "" -# type: TP -#: ../tin.5:796 ../tin.5:2446 +#. type: TP +#: doc/tin.5:807 doc/tin.5:2532 #, no-wrap msgid "B C | --B C +X<-a> X<--approved> Set the article header field Approved: to the given value. =item -B C | --B C +X<-c> X<--control> Set the article header field Control: to the given value. =item -B C | --B C +X<-d> X<--distribution> Set the article header field Distribution: to the given value. =item -B C | --B C +X<-e> X<--expires> Set the article header field Expires: to the given value. =item -B C | --B C +X<-f> X<--from> Set the article header field From: to the given value. =item -B C | --B C +X<-n> X<--newsgroups> Set the article header field Newsgroups: to the given value. =item -B C | --B C +X<-o> X<--organization> Set the article header field Organization: to the given value. =item -B

C | --B C +X<-p> X<--port> use C as NNTP-port =item -B C | --B C +X<-r> X<--replyto> Set the article header field Reply-To: to the given value. =item -B F | --B F +X<-s> X<--savedir> Save signed article to directory F instead of posting. =item -B C | --B C +X<-t> X<--subject> Set the article header field Subject: to the given value. =item -B C | --B C +X<-w> X<--followupto> Set the article header field Followup-To: to the given value. =item -B C | --B C +X<-x> X<--path> Set the article header field Path: to the given value. =item -B | --B +X<-H> X<--help> Show help-page. =item -B | --B +X<-L> X<--no-canlock> Do not add Cancel-Lock: / Cancel-Key: headers. =item -B | --B +X<-R> X<--no-control> Restricted mode, disallow control-messages. =item -B | --B +X<-s> X<--no-signature> Do not append F<$HOME/.signature>. =item -B | --B +X<-X> X<--no-sign> Do not sign the article. =item -B | --B +X<-Y> X<--force-auth> Force authentication on connect even if not required by the server. =item -B -B -B +X<-A> X<-V> X<-W> These options are accepted for compatibility reasons but ignored. =item -B | --B +X<-h> X<--headers> These options are accepted for compatibility reasons but ignored. =item -B | --B +X<-O> X<--no-organization> These options are accepted for compatibility reasons but ignored. =item -B | -B | --B +X<-D> X<-N> X<--debug> These options are accepted but do not have any functionality yet. @@ -891,47 +956,56 @@ An error occurred. =back =head1 ENVIRONMENT +X =over 4 =item B<$NNTPSERVER> +X<$NNTPSERVER> X Set to override the NNTP server configured in the source. =item B<$NNTPPORT> +X<$NNTPPORT> X The NNTP TCP-port to post news to. This variable only needs to be set if the TCP-port is not 119 (the default). The '-B

' command-line option overrides B<$NNTPPORT>. =item B<$PGPPASS> +X<$PGPPASS> X Set to override the passphrase configured in the source (used for B(1)-2.6.3). =item B<$PGPPASSFILE> +X<$PGPPASSFILE> X Passphrase file used for B(1) or B(1). =item B<$SIGNER> +X<$SIGNER> X Set to override the user-id for signing configured in the source. If you neither set B<$SIGNER> nor configure it in the source the contents of the From:-field will be used. =item B<$REPLYTO> +X<$REPLYTO> X Set the article header field Reply-To: to the return address specified by the variable if there isn't already a Reply-To: header in the article. The '-B' command-line option overrides B<$REPLYTO>. =item B<$ORGANIZATION> +X<$ORGANIZATION> X Set the article header field Organization: to the contents of the variable if there isn't already a Organization: header in the article. The '-B' command-line option overrides B<$ORGANIZATION>. =item B<$DISTRIBUTION> +X<$DISTRIBUTION> X Set the article header field Distribution: to the contents of the variable if there isn't already a Distribution: header in the article. The '-B' @@ -969,13 +1043,22 @@ off by default. "nntpserver password [user]" pairs for NNTP servers that require authorization. Any line that starts with "#" is a comment. Blank lines are ignored. This file should be readable only for the user as it contains the -user's uncrypted password for reading news. +user's uncrypted password for reading news. First match counts. If no +matching entry is found F<$HOME/.nntpauth> is checked. + +=item F<$HOME/.nntpauth> + +"nntpserver user password" pairs for NNTP servers that require +authorization. First match counts. Lines starting with "#" are skipped and +blank lines are ignored. This file should be readable only for the user as +it contains the user's uncrypted password for reading news. +F<$HOME/.newsauth> is checked first. -=item F<$HOME/.tinewsrc> +=item F<$XDG_CONFIG_HOME/tinewsrc> F<$HOME/.config/tinewsrc> F<$HOME/.tinewsrc> "option=value" configuration pairs. Lines that start with "#" are ignored. If the file contains uncrypted passwords (e.g. NNTPPass or PGPPass), it -should be only readable for the user. +should be readable for the user only. =back @@ -989,13 +1072,13 @@ security is an issue, don't use this scr =head1 NOTES B is designed to be used with B(1)-2.6.3, -B(1)-5 and B(1). +B(1)-5, B(1)-6 and B(1). B requires the following standard modules to be installed: B(3pm), B(3pm), B(3pm) and B(3pm). -If the Cacenl-Lock feature is enabled the following additional modules +If the Cancel-Lock feature is enabled the following additional modules must be installed: B(3pm), B(3pm) and B(3pm) diff -Nurp '--exclude=.bzr*' tin-2.0.1/tools/tinlock tin-2.2.0/tools/tinlock --- tin-2.0.1/tools/tinlock 2011-04-17 16:04:29.000000000 +0200 +++ tin-2.2.0/tools/tinlock 2013-08-28 19:09:55.901173890 +0200 @@ -11,7 +11,7 @@ host=`hostname` pid=$$ lock=$host" "$pid -if test ${TIN_HOMEDIR-"$HOME"} ; then +if test -d ${TIN_HOMEDIR-"$HOME"} ; then lockdir=${TIN_HOMEDIR-"$HOME"}/.tin file=tinlock else diff -Nurp '--exclude=.bzr*' tin-2.0.1/tools/url_handler.pl tin-2.2.0/tools/url_handler.pl --- tin-2.0.1/tools/url_handler.pl 2011-07-18 14:12:58.000000000 +0200 +++ tin-2.2.0/tools/url_handler.pl 2013-08-28 19:09:56.073195356 +0200 @@ -11,7 +11,7 @@ use warnings; die "Usage: $pname URL" if $#ARGV != 0; # version Number -my $version = "0.1.1"; +my $version = "0.1.2"; my ($method, $url, $match, @try); $method = $url = $ARGV[0]; @@ -29,10 +29,11 @@ if ($ENV{"BROWSER_".uc($method)}) { push(@try, 'firefox -a firefox -remote openURL\(%s\)'); push(@try, 'mozilla -remote openURL\(%s\)'); push(@try, 'opera -remote openURL\(%s\)'); - push(@try, 'galeon -n'); + push(@try, qw(chromium 'galeon -n' 'epiphany -n' konqueror)); push(@try, 'lynx'); # prefer lynx over links as it can handle news:-urls - push(@try, qw('links2 -g' links w3m)); + push(@try, qw('links2 -g' links w3m surf arora)); push(@try, 'kfmclient newTab'); # has no useful return-value on error + push(@try, 'xdg-open'); # xdg-open evaluates $BROWSER which is unset } } @@ -73,7 +74,9 @@ viewer found in either B<$BROWSER_I> -The user's preferred utility to browse URLs of tye I. May actually +=back + +The user's preferred utility to browse URLs of type I. May actually consist of a sequence of colon-separated browser commands to be tried in order until one succeeds. If a command part contains %s, the URL is substituted there, otherwise the browser command is simply called with the @@ -81,7 +84,7 @@ URL as its last argument. %% is replaced %c is replaced by a colon (:). Examples: -=over 4 +=over 2 =item $BROWSER_FTP="wget:ncftp" @@ -97,8 +100,12 @@ Examples: Z<> +=over 4 + =item B<$BROWSER> +=back + The user's preferred utility to browse URLs for which there is no special viewer defined via B<$BROWSER_I>. Again it may actually consist of a sequence of colon-separated browser commands to be tried in order until one