----------------------------------------------------------------------------- MANIFEST | 178 - Makefile | 8 aclocal.m4 | 1136 +++--- config.guess | 46 config.sub | 30 configure | 7782 +++++++++++++++++++++++++------------------- configure.in | 46 doc/CHANGES | 82 doc/CHANGES.old | 2 doc/CREDITS | 139 doc/INSTALL | 9 doc/TODO | 88 doc/WHATSNEW | 13 doc/l10n/de.po | 4357 ++++++++++++------------ doc/l10n/de/tin.1 | 508 +- doc/l10n/de/tin.5 | 290 - doc/l10n/en_GB.po | 4444 +++++++++++-------------- doc/l10n/en_GB/tin.1 | 235 - doc/l10n/en_GB/tin.5 | 133 doc/l10n/tin-man.pot | 3817 ++++++++++----------- doc/rcvars.txt | 6 doc/tin.1 | 245 - doc/tin.5 | 148 include/autoconf.hin | 2 include/bool.h | 2 include/bugrep.h | 2 include/debug.h | 2 include/extern.h | 12 include/keymap.h | 2 include/newsrc.h | 2 include/nntplib.h | 7 include/policy.h | 9 include/proto.h | 2 include/rfc2046.h | 18 include/stpwatch.h | 2 include/tcurses.h | 6 include/tin.h | 17 include/tinrc.h | 13 include/tnntp.h | 2 include/trace.h | 2 include/version.h | 12 intl/Makefile.in | 3 po/Makefile.inn | 1 po/da.po | 3189 +++++++++--------- po/de.po | 3099 +++++++++-------- po/en_GB.po | 2948 ++++++++-------- po/et.po | 2983 ++++++++--------- po/fr.po | 2981 ++++++++--------- po/ru.po | 2966 ++++++++-------- po/sv.po | 2948 ++++++++-------- po/tin.pot | 2945 ++++++++-------- po/tr.po | 2966 ++++++++-------- po/zh_CN.po | 8235 +++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 3075 +++++++++-------- src/Makefile.in | 1 src/active.c | 4 src/art.c | 38 src/attrib.c | 35 src/auth.c | 10 src/charset.c | 2 src/color.c | 14 src/config.c | 101 src/cook.c | 26 src/debug.c | 2 src/envarg.c | 2 src/feed.c | 2 src/filter.c | 2 src/global.c | 2 src/group.c | 11 src/hashstr.c | 2 src/header.c | 6 src/help.c | 2 src/inews.c | 22 src/init.c | 21 src/joinpath.c | 2 src/keymap.c | 2 src/lang.c | 42 src/list.c | 2 src/lock.c | 2 src/mail.c | 2 src/main.c | 17 src/makecfg.c | 14 src/memory.c | 6 src/mimetypes.c | 2 src/misc.c | 33 src/my_tmpfile.c | 2 src/newsrc.c | 2 src/nntplib.c | 53 src/nrctbl.c | 9 src/options_menu.c | 72 src/page.c | 25 src/pgp.c | 2 src/post.c | 32 src/prompt.c | 6 src/read.c | 2 src/refs.c | 4 src/regex.c | 4 src/rfc1524.c | 2 src/rfc2045.c | 9 src/rfc2046.c | 129 src/rfc2047.c | 29 src/save.c | 100 src/screen.c | 2 src/search.c | 9 src/select.c | 29 src/sigfile.c | 2 src/signal.c | 2 src/strftime.c | 2 src/string.c | 45 src/tags.c | 2 src/tcurses.c | 2 src/thread.c | 128 src/tincfg.tbl | 11 src/trace.c | 2 src/version.c | 2 src/xface.c | 2 src/xref.c | 2 tin-2.3.2/po/da.gmo |binary tin-2.3.2/po/de.gmo |binary tin-2.3.2/po/en_GB.gmo |binary tin-2.3.2/po/et.gmo |binary tin-2.3.2/po/fr.gmo |binary tin-2.3.2/po/ru.gmo |binary tin-2.3.2/po/sv.gmo |binary tin-2.3.2/po/tr.gmo |binary tin-2.3.2/po/zh_CN.gmo |binary tin-2.3.2/po/zh_TW.gmo |binary tin.spec | 4 tools/tinews.pl | 15 129 files changed, 36767 insertions(+), 26600 deletions(-) ----------------------------------------------------------------------------- diff -Nurp '--exclude=.bzr*' tin-2.3.1/MANIFEST tin-2.3.2/MANIFEST --- tin-2.3.1/MANIFEST 2014-12-24 10:39:34.000000000 +0100 +++ tin-2.3.2/MANIFEST 2015-12-24 08:48:37.511209001 +0100 @@ -1,27 +1,27 @@ -MANIFEST for tin-2.3.1 (Wed Dec 24 10:39:36 CET 2014) +MANIFEST for tin-2.3.2 (Thu Dec 24 08:48:37 CET 2015) ---------------------------------------------------- - 14465 ./Makefile - 8123 ./MANIFEST + 14508 ./Makefile + 8170 ./MANIFEST 1441 ./README 745 ./README.MAC 976 ./README.WIN - 188211 ./aclocal.m4 + 187062 ./aclocal.m4 882 ./conf-tin - 43542 ./config.guess - 35995 ./config.sub - 675241 ./configure - 35887 ./configure.in + 44242 ./config.guess + 36141 ./config.sub + 680887 ./configure + 36076 ./configure.in 7123 ./install-sh 318 ./po4a.conf - 1486 ./tin.spec + 1502 ./tin.spec 18847 ./doc/ABOUT-NLS - 2982 ./doc/CHANGES - 289012 ./doc/CHANGES.old - 5041 ./doc/CREDITS + 6431 ./doc/CHANGES + 289013 ./doc/CHANGES.old + 5085 ./doc/CREDITS 1305 ./doc/DEBUG_REFS - 31011 ./doc/INSTALL - 44538 ./doc/TODO - 260 ./doc/WHATSNEW + 31070 ./doc/INSTALL + 45785 ./doc/TODO + 671 ./doc/WHATSNEW 2618 ./doc/art_handling.txt 1701 ./doc/article.txt 4373 ./doc/auth.txt @@ -40,13 +40,13 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 5155 ./doc/opt-case.1 6964 ./doc/plp_snprintf.3 3964 ./doc/pgp.txt - 2987 ./doc/rcvars.txt + 2990 ./doc/rcvars.txt 1525 ./doc/reading-mail.txt 4947 ./doc/umlaute.txt 4246 ./doc/umlauts.txt 6957 ./doc/url_handler.1 - 136057 ./doc/tin.1 - 80671 ./doc/tin.5 + 137123 ./doc/tin.1 + 81097 ./doc/tin.5 5065 ./doc/tin.defaults 15629 ./doc/tinews.1 2418 ./doc/tools.txt @@ -56,7 +56,7 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 3815 ./tools/metamutt 2789 ./tools/opt-case.pl 1413 ./tools/tinlock - 36222 ./tools/tinews.pl + 36625 ./tools/tinews.pl 3786 ./tools/url_handler.pl 1657 ./tools/url_handler.sh 3347 ./tools/w2r.pl @@ -64,29 +64,29 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 2595 ./include/bool.h 1947 ./include/bugrep.h 2210 ./include/debug.h - 67655 ./include/extern.h + 67912 ./include/extern.h 14068 ./include/keymap.h 6333 ./include/newsrc.h - 8428 ./include/nntplib.h + 8611 ./include/nntplib.h 664 ./include/plp_snprintf.h - 15507 ./include/policy.h + 15516 ./include/policy.h 33106 ./include/proto.h - 5416 ./include/rfc2046.h + 5544 ./include/rfc2046.h 3377 ./include/stpwatch.h - 5898 ./include/tcurses.h - 70246 ./include/tin.h - 17000 ./include/tinrc.h + 5960 ./include/tcurses.h + 70579 ./include/tin.h + 17281 ./include/tinrc.h 4346 ./include/tnntp.h 2264 ./include/trace.h - 2350 ./include/version.h - 35233 ./src/active.c - 75128 ./src/art.c - 76746 ./src/attrib.c - 16369 ./src/auth.c + 2354 ./include/version.h + 35234 ./src/active.c + 75827 ./src/art.c + 77850 ./src/attrib.c + 16275 ./src/auth.c 12933 ./src/charset.c - 8552 ./src/color.c - 64286 ./src/config.c - 27706 ./src/cook.c + 8680 ./src/color.c + 66106 ./src/config.c + 27849 ./src/cook.c 27368 ./src/curses.c 10854 ./src/debug.c 3408 ./src/envarg.c @@ -94,55 +94,55 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 57003 ./src/filter.c 18148 ./src/getline.c 9070 ./src/global.c - 44970 ./src/group.c + 45109 ./src/group.c 3900 ./src/hashstr.c - 8261 ./src/header.c + 8256 ./src/header.c 6253 ./src/heapsort.c 43745 ./src/help.c - 13942 ./src/inews.c - 37820 ./src/init.c + 13931 ./src/inews.c + 38226 ./src/init.c 2435 ./src/joinpath.c 101560 ./src/keymap.c - 136694 ./src/lang.c + 137626 ./src/lang.c 4486 ./src/langinfo.c 7728 ./src/list.c 6664 ./src/lock.c 16917 ./src/mail.c - 25959 ./src/main.c - 10715 ./src/makecfg.c - 13601 ./src/memory.c + 26132 ./src/main.c + 10848 ./src/makecfg.c + 13672 ./src/memory.c 5283 ./src/mimetypes.c - 94725 ./src/misc.c + 94743 ./src/misc.c 39445 ./src/newsrc.c - 53544 ./src/nntplib.c - 7502 ./src/nrctbl.c - 103533 ./src/options_menu.c - 66068 ./src/page.c + 53522 ./src/nntplib.c + 7760 ./src/nrctbl.c + 105092 ./src/options_menu.c + 66366 ./src/page.c 24137 ./src/parsdate.y 17057 ./src/plp_snprintf.c 13212 ./src/pgp.c - 151739 ./src/post.c - 18904 ./src/prompt.c + 152067 ./src/post.c + 18910 ./src/prompt.c 10400 ./src/read.c - 27386 ./src/refs.c - 5481 ./src/regex.c + 27385 ./src/refs.c + 5482 ./src/regex.c 14526 ./src/rfc1524.c - 15069 ./src/rfc2045.c - 32307 ./src/rfc2046.c - 36645 ./src/rfc2047.c - 57076 ./src/save.c + 15181 ./src/rfc2045.c + 34420 ./src/rfc2046.c + 36742 ./src/rfc2047.c + 58962 ./src/save.c 12530 ./src/screen.c - 18246 ./src/search.c - 33716 ./src/select.c + 18276 ./src/search.c + 33785 ./src/select.c 7748 ./src/sigfile.c 14366 ./src/signal.c 7215 ./src/strftime.c - 37824 ./src/string.c + 38638 ./src/string.c 13345 ./src/tags.c 17487 ./src/tcurses.c 3070 ./src/tmpfile.c 3558 ./src/my_tmpfile.c - 41430 ./src/thread.c + 42070 ./src/thread.c 2472 ./src/trace.c 4430 ./src/version.c 5453 ./src/wildmat.c @@ -216,8 +216,8 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 53056 ./pcre/testdata/testoutput8 28769 ./pcre/testdata/testoutput9 21250 ./include/autoconf.hin - 22126 ./src/Makefile.in - 10031 ./src/tincfg.tbl + 22154 ./src/Makefile.in + 10149 ./src/tincfg.tbl 1929 ./libcanlock/CHANGES 2464 ./libcanlock/HOWTO 1259 ./libcanlock/README @@ -257,7 +257,7 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 6905 ./intl/localcharset.c 2657 ./intl/locale.alias 9432 ./intl/localealias.c - 9854 ./intl/Makefile.in + 9887 ./intl/Makefile.in 2001 ./intl/ngettext.c 38981 ./intl/plural.c 8375 ./intl/plural.y @@ -265,33 +265,35 @@ MANIFEST for tin-2.3.1 (Wed Dec 24 10:39 1044 ./intl/ref-del.sin 4481 ./intl/textdomain.c 41 ./intl/VERSION - 5068 ./po/Makefile.inn + 5096 ./po/Makefile.inn 847 ./po/POTFILES.in - 143655 ./po/tin.pot - 106888 ./po/da.gmo - 189802 ./po/da.po - 192381 ./po/de.gmo - 233440 ./po/de.po - 8368 ./po/en_GB.gmo - 147210 ./po/en_GB.po - 186548 ./po/et.gmo - 224231 ./po/et.po - 194708 ./po/fr.gmo - 232878 ./po/fr.po - 123544 ./po/ru.gmo - 205784 ./po/ru.po + 144787 ./po/tin.pot + 117742 ./po/da.gmo + 197639 ./po/da.po + 197825 ./po/de.gmo + 237156 ./po/de.po + 8584 ./po/en_GB.gmo + 148450 ./po/en_GB.po + 185640 ./po/et.gmo + 226358 ./po/et.po + 193717 ./po/fr.gmo + 235038 ./po/fr.po + 122578 ./po/ru.gmo + 207614 ./po/ru.po 22742 ./po/sv.gmo - 154141 ./po/sv.po + 155410 ./po/sv.po 4684 ./po/tr.gmo - 217686 ./po/tr.po - 220579 ./po/zh_TW.po - 179592 ./po/zh_TW.gmo - 142872 ./doc/l10n/de/tin.1 - 84194 ./doc/l10n/de/tin.5 + 219376 ./po/tr.po + 225023 ./po/zh_CN.po + 183924 ./po/zh_CN.gmo + 224392 ./po/zh_TW.po + 184064 ./po/zh_TW.gmo + 144866 ./doc/l10n/de/tin.1 + 85226 ./doc/l10n/de/tin.5 130 ./doc/l10n/de.add - 355670 ./doc/l10n/de.po - 139493 ./doc/l10n/en_GB/tin.1 - 83210 ./doc/l10n/en_GB/tin.5 - 479373 ./doc/l10n/en_GB.po - 300919 ./doc/l10n/tin-man.pot -10937172 total + 355852 ./doc/l10n/de.po + 140847 ./doc/l10n/en_GB/tin.1 + 83650 ./doc/l10n/en_GB/tin.5 + 463051 ./doc/l10n/en_GB.po + 292128 ./doc/l10n/tin-man.pot +11398999 total diff -Nurp '--exclude=.bzr*' tin-2.3.1/Makefile tin-2.3.2/Makefile --- tin-2.3.1/Makefile 2014-12-24 10:39:34.000000000 +0100 +++ tin-2.3.2/Makefile 2015-12-24 08:48:36.619208985 +0100 @@ -1,15 +1,15 @@ # Top level Makefile for tin # - for configuration options read the doc/INSTALL file. # -# Updated: 2013-01-09 +# Updated: 2015-08-29 # PROJECT = tin LVER = 2 PVER = 3 -SVER = 1 +SVER = 2 VER = $(LVER).$(PVER).$(SVER) -DVER = 20141224 +DVER = 20151224 EXE = tin # directory structure @@ -328,6 +328,8 @@ POFILES = \ $(PODIR)/sv.po \ $(PODIR)/tr.gmo \ $(PODIR)/tr.po \ + $(PODIR)/zh_CN.po \ + $(PODIR)/zh_CN.gmo \ $(PODIR)/zh_TW.po \ $(PODIR)/zh_TW.gmo diff -Nurp '--exclude=.bzr*' tin-2.3.1/aclocal.m4 tin-2.3.2/aclocal.m4 --- tin-2.3.1/aclocal.m4 2013-12-07 01:12:41.000000000 +0100 +++ tin-2.3.2/aclocal.m4 2015-11-22 01:48:13.023209115 +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 : 2013-12-06 +dnl Updated : 2015-07-21 dnl Notes : dnl -dnl Copyright (c) 1995-2014 Thomas E. Dickey +dnl Copyright (c) 1995-2016 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -61,7 +61,7 @@ AC_DEFUN([AC_ISC_POSIX], ] ) dnl --------------------------------------------------------------------------- -dnl AM_GNU_GETTEXT version: 13 updated: 2012/11/09 05:47:26 +dnl AM_GNU_GETTEXT version: 14 updated: 2015/04/15 19:08:48 dnl -------------- dnl Usage: Just like AM_WITH_NLS, which see. AC_DEFUN([AM_GNU_GETTEXT], @@ -103,7 +103,7 @@ strdup strtoul tsearch __argz_count __ar # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang"*) useit=yes;; + ("$presentlang"*) useit=yes;; esac done if test $useit = yes; then @@ -197,7 +197,7 @@ size_t iconv(); AC_SUBST(LIBICONV) ])dnl dnl --------------------------------------------------------------------------- -dnl AM_LANGINFO_CODESET version: 3 updated: 2002/10/27 23:21:42 +dnl AM_LANGINFO_CODESET version: 4 updated: 2015/04/18 08:56:57 dnl ------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -208,19 +208,19 @@ dnl dnl From Bruno Haible. AC_DEFUN([AM_LANGINFO_CODESET], [ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi +AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include ], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have and nl_langinfo(CODESET).]) + fi ])dnl dnl --------------------------------------------------------------------------- -dnl AM_LC_MESSAGES version: 4 updated: 2002/10/27 23:21:42 +dnl AM_LC_MESSAGES version: 5 updated: 2015/05/10 19:52:14 dnl -------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -241,17 +241,17 @@ dnl dnl serial 2 dnl AC_DEFUN([AM_LC_MESSAGES], - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi])dnl +[if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) + fi +fi])dnl dnl --------------------------------------------------------------------------- -dnl AM_MULTIBYTE_ABLE version: 8 updated: 2009/12/24 04:20:51 +dnl AM_MULTIBYTE_ABLE version: 9 updated: 2013/12/06 19:12:41 dnl ----------------- dnl dnl check for required multibyte/widechar functions @@ -366,7 +366,7 @@ AC_DEFUN([AM_MULTIBYTE_ABLE], fi ]) dnl --------------------------------------------------------------------------- -dnl AM_PATH_PROG_WITH_TEST version: 8 updated: 2009/01/11 20:31:12 +dnl AM_PATH_PROG_WITH_TEST version: 9 updated: 2015/04/15 19:08:48 dnl ---------------------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -395,10 +395,10 @@ set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) AC_CACHE_VAL(ac_cv_path_$1, [case "[$]$1" in - [[\\/]*|?:[\\/]]*) + ([[\\/]*|?:[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ;; - *) + (*) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in ifelse([$5], , $PATH, [$5]); do test -z "$ac_dir" && ac_dir=. @@ -425,7 +425,7 @@ fi AC_SUBST($1)dnl ])dnl dnl --------------------------------------------------------------------------- -dnl AM_WITH_NLS version: 25 updated: 2012/10/06 08:57:51 +dnl AM_WITH_NLS version: 26 updated: 2015/04/15 19:08:48 dnl ----------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -629,11 +629,12 @@ AC_DEFUN([AM_WITH_NLS], # Support "outfile[:infile[:infile...]]" case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac # PO directories have a Makefile.in generated from Makefile.inn. - case "$ac_file" in */[Mm]akefile.in) + case "$ac_file" in + (*/[Mm]akefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" @@ -644,9 +645,9 @@ AC_DEFUN([AM_WITH_NLS], test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + (.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + (/*) top_srcdir="$ac_given_srcdir" ;; + (*) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then @@ -686,11 +687,11 @@ AC_DEFUN([AM_WITH_NLS], changequote(<<,>>)dnl 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;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*) changequote([,])dnl ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac AC_MSG_RESULT([$ac_prog_version]) fi @@ -735,7 +736,7 @@ changequote([,])dnl AC_SUBST(GENCAT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 +dnl CF_ACVERSION_CHECK version: 5 updated: 2014/06/04 19:11:49 dnl ------------------ dnl Conditionally generate script according to whether we're using a given autoconf. dnl @@ -744,7 +745,7 @@ dnl $2 = code to use if AC_ACVERSION is 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([AC_ACVERSION], ,[ifdef([AC_AUTOCONF_VERSION],[m4_copy([AC_AUTOCONF_VERSION],[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( @@ -761,7 +762,7 @@ define([CF_ACVERSION_COMPARE], [ifelse([$8], , ,[$8])], [ifelse([$9], , ,[$9])])])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42 +dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl The second parameter if given makes this macro verbose. @@ -779,14 +780,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $1 do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -800,11 +801,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags) ;; @@ -813,17 +814,17 @@ no) ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -849,7 +850,7 @@ AC_SUBST(EXTRA_CPPFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_INCDIR version: 13 updated: 2010/05/26 16:44:57 +dnl CF_ADD_INCDIR version: 14 updated: 2015/05/25 20:53:04 dnl ------------- dnl Add an include-directory to $CPPFLAGS. Don't add /usr/include, since it's dnl redundant. We don't normally need to add -I/usr/local/include for gcc, @@ -900,6 +901,8 @@ if test -n "$1" ; then else break fi + else + break fi done done @@ -914,7 +917,7 @@ dnl $1 = library to add, without the "-l dnl $2 = variable to update (default $LIBS) AC_DEFUN([CF_ADD_LIB],[CF_ADD_LIBS(-l$1,ifelse($2,,LIBS,[$2]))])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIBDIR version: 9 updated: 2010/05/26 16:44:57 +dnl CF_ADD_LIBDIR version: 10 updated: 2015/04/18 08:56:57 dnl ------------- dnl Adds to the library-path dnl @@ -926,37 +929,55 @@ dnl AC_DEFUN([CF_ADD_LIBDIR], [ if test -n "$1" ; then - for cf_add_libdir in $1 - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - CF_VERBOSE(adding $cf_add_libdir to library-path) - ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])" - fi - fi - done + for cf_add_libdir in $1 + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + CF_VERBOSE(adding $cf_add_libdir to library-path) + ifelse([$2],,LDFLAGS,[$2])="-L$cf_add_libdir $ifelse([$2],,LDFLAGS,[$2])" + fi + fi + done fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_LIBS version: 1 updated: 2010/06/02 05:03:05 +dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27 dnl ----------- -dnl Add one or more libraries, used to enforce consistency. +dnl Add one or more libraries, used to enforce consistency. Libraries are +dnl prepended to an existing list, since their dependencies are assumed to +dnl already exist in the list. dnl dnl $1 = libraries to add, with the "-l", etc. dnl $2 = variable to update (default $LIBS) -AC_DEFUN([CF_ADD_LIBS],[ifelse($2,,LIBS,[$2])="$1 [$]ifelse($2,,LIBS,[$2])"])dnl +AC_DEFUN([CF_ADD_LIBS],[ +cf_add_libs="$1" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in [$]ifelse($2,,LIBS,[$2]) +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +ifelse($2,,LIBS,[$2])="$cf_add_libs" +])dnl dnl --------------------------------------------------------------------------- dnl CF_ADD_LIB_AFTER version: 3 updated: 2013/07/09 21:27:22 dnl ---------------- @@ -971,7 +992,7 @@ LIBS=`echo "$LIBS" | sed -e "s/[[ ]][[ CF_VERBOSE(...after $LIBS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_ADD_OPTIONAL_PATH version: 1 updated: 2007/07/29 12:33:33 +dnl CF_ADD_OPTIONAL_PATH version: 3 updated: 2015/05/10 19:52:14 dnl -------------------- dnl Add an optional search-path to the compile/link variables. dnl See CF_WITH_PATH @@ -979,15 +1000,15 @@ dnl dnl $1 = shell variable containing the result of --with-XXX=[DIR] dnl $2 = module to look for. AC_DEFUN([CF_ADD_OPTIONAL_PATH],[ - case "$1" in #(vi - no) #(vi - ;; - yes) #(vi - ;; - *) - CF_ADD_SEARCHPATH([$1], [AC_MSG_ERROR(cannot find $2 under $1)]) - ;; - esac +case "$1" in +(no) + ;; +(yes) + ;; +(*) + CF_ADD_SEARCHPATH([$1], [AC_MSG_ERROR(cannot find $2 under $1)]) + ;; +esac ])dnl dnl --------------------------------------------------------------------------- dnl CF_ADD_SEARCHPATH version: 5 updated: 2009/01/11 20:40:21 @@ -1126,7 +1147,7 @@ dnl Allow user to enable a normally-off AC_DEFUN([CF_ARG_ENABLE], [CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl dnl --------------------------------------------------------------------------- -dnl CF_ARG_OPTION version: 4 updated: 2010/05/26 05:38:42 +dnl CF_ARG_OPTION version: 5 updated: 2015/05/10 19:52:14 dnl ------------- dnl Restricted form of AC_ARG_ENABLE that ensures user doesn't give bogus dnl values. @@ -1139,15 +1160,15 @@ dnl $4 = action if perform if option is dnl $5 = default option value (either 'yes' or 'no') AC_DEFUN([CF_ARG_OPTION], [AC_ARG_ENABLE([$1],[$2],[test "$enableval" != ifelse([$5],no,yes,no) && enableval=ifelse([$5],no,no,yes) - if test "$enableval" != "$5" ; then + if test "$enableval" != "$5" ; then ifelse([$3],,[ :]dnl ,[ $3]) ifelse([$4],,,[ - else - $4]) - fi],[enableval=$5 ifelse([$4],,,[ - $4 + else + $4]) + fi],[enableval=$5 ifelse([$4],,,[ + $4 ])dnl - ])])dnl +])])dnl dnl --------------------------------------------------------------------------- dnl CF_ARG_WITH version: 4 updated: 2008/03/23 14:48:54 dnl ----------- @@ -1318,7 +1339,7 @@ AC_SUBST(BUILD_EXEEXT) AC_SUBST(BUILD_OBJEXT) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_BUNDLED_INTL version: 17 updated: 2012/10/06 08:57:51 +dnl CF_BUNDLED_INTL version: 18 updated: 2015/05/10 19:52:14 dnl --------------- dnl Top-level macro for configuring an application with a bundled copy of dnl the intl and po directories for gettext. @@ -1387,7 +1408,7 @@ dnl this updates SUB_MAKEFILE and MSG_DI CF_OUR_MESSAGES($1) if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then + if test "$nls_cv_force_use_gnu_gettext" = yes ; then : elif test "$nls_cv_use_gnu_gettext" = yes ; then : @@ -1485,7 +1506,7 @@ 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 CF_CC_ENV_FLAGS version: 2 updated: 2015/04/12 15:39:00 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 @@ -1496,8 +1517,8 @@ AC_DEFUN([CF_CC_ENV_FLAGS], : ${CC:=cc} AC_MSG_CHECKING(\$CC variable) -case "$CC" in #(vi -*[[\ \ ]]-[[IUD]]*) +case "$CC" in +(*[[\ \ ]]-[[IUD]]*) AC_MSG_RESULT(broken) AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options) # humor him... @@ -1505,7 +1526,7 @@ case "$CC" in #(vi CC=`echo "$CC" | sed -e 's/[[ ]].*//'` CF_ADD_CFLAGS($cf_flags) ;; -*) +(*) AC_MSG_RESULT(ok) ;; esac @@ -1588,7 +1609,7 @@ if test ".$system_name" != ".$cf_cv_syst fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_CFLAGS version: 2 updated: 2001/12/30 19:09:58 +dnl CF_CHECK_CFLAGS version: 3 updated: 2014/07/22 05:32:57 dnl --------------- dnl Conditionally add to $CFLAGS and $CPPFLAGS values which are derived from dnl a build-configuration such as imake. These have the pitfall that they @@ -1600,10 +1621,10 @@ CF_VERBOSE(checking additions to CFLAGS) cf_check_cflags="$CFLAGS" cf_check_cppflags="$CPPFLAGS" CF_ADD_CFLAGS($1,yes) -if test "$cf_check_cflags" != "$CFLAGS" ; then +if test "x$cf_check_cflags" != "x$CFLAGS" ; then AC_TRY_LINK([#include ],[printf("Hello world");],, [CF_VERBOSE(test-compile failed. Undoing change to \$CFLAGS) - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then CF_VERBOSE(but keeping change to \$CPPFLAGS) fi CFLAGS="$cf_check_flags"]) @@ -1620,7 +1641,7 @@ CF_CHECK_1_DECL(${ac_func}, ${ac_tr_func done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_ERRNO version: 11 updated: 2010/05/26 05:38:42 +dnl CF_CHECK_ERRNO version: 12 updated: 2015/04/18 08:56:57 dnl -------------- dnl Check for data that is usually declared in or , e.g., dnl the 'errno' variable. Define a DECL_xxx symbol if we must declare it @@ -1631,28 +1652,28 @@ dnl $2 = the assumed type AC_DEFUN([CF_CHECK_ERRNO], [ AC_CACHE_CHECK(if external $1 is declared, cf_cv_dcl_$1,[ - AC_TRY_COMPILE([ + AC_TRY_COMPILE([ #ifdef HAVE_STDLIB_H #include #endif #include #include #include ], - ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1, - [cf_cv_dcl_$1=yes], - [cf_cv_dcl_$1=no]) + ifelse([$2],,int,[$2]) x = (ifelse([$2],,int,[$2])) $1, + [cf_cv_dcl_$1=yes], + [cf_cv_dcl_$1=no]) ]) if test "$cf_cv_dcl_$1" = no ; then - CF_UPPER(cf_result,decl_$1) - AC_DEFINE_UNQUOTED($cf_result) + CF_UPPER(cf_result,decl_$1) + AC_DEFINE_UNQUOTED($cf_result) fi # It's possible (for near-UNIX clones) that the data doesn't exist CF_CHECK_EXTERN_DATA($1,ifelse([$2],,int,[$2])) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23 +dnl CF_CHECK_EXTERN_DATA version: 4 updated: 2015/04/18 08:56:57 dnl -------------------- dnl Check for existence of external data in the current set of libraries. If dnl we can modify it, it's real enough. @@ -1661,18 +1682,18 @@ dnl $2 = its type AC_DEFUN([CF_CHECK_EXTERN_DATA], [ AC_CACHE_CHECK(if external $1 exists, cf_cv_have_$1,[ - AC_TRY_LINK([ + AC_TRY_LINK([ #undef $1 extern $2 $1; ], - [$1 = 2], - [cf_cv_have_$1=yes], - [cf_cv_have_$1=no]) + [$1 = 2], + [cf_cv_have_$1=yes], + [cf_cv_have_$1=no]) ]) if test "$cf_cv_have_$1" = yes ; then - CF_UPPER(cf_result,have_$1) - AC_DEFINE_UNQUOTED($cf_result) + CF_UPPER(cf_result,have_$1) + AC_DEFINE_UNQUOTED($cf_result) fi ])dnl @@ -1927,22 +1948,22 @@ CF_NCURSES_VERSION CF_CURSES_LIBS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08 +dnl CF_CURSES_CPPFLAGS version: 12 updated: 2015/04/15 19:08:48 dnl ------------------ dnl Look for the curses headers. AC_DEFUN([CF_CURSES_CPPFLAGS],[ AC_CACHE_CHECK(for extra include directories,cf_cv_curses_incdir,[ cf_cv_curses_incdir=no -case $host_os in #(vi -hpux10.*) #(vi +case $host_os in +(hpux10.*) if test "x$cf_cv_screen" = "xcurses_colr" then test -d /usr/include/curses_colr && \ cf_cv_curses_incdir="-I/usr/include/curses_colr" fi ;; -sunos3*|sunos4*) +(sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then test -d /usr/5lib && \ @@ -1958,7 +1979,7 @@ CF_CURSES_HEADER CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45 +dnl CF_CURSES_HEADER version: 5 updated: 2015/04/23 20:35:30 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -1967,11 +1988,9 @@ dnl $1 = ncurses when looking for ncurse 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/curses.h]) \ - ncurses.h \ - curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) +for cf_header in \ + ncurses.h ifelse($1,,,[$1/ncurses.h]) \ + curses.h ifelse($1,,,[$1/curses.h]) ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], [initscr(); tgoto("?", 0,0)], @@ -1987,7 +2006,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50 +dnl CF_CURSES_LIBS version: 39 updated: 2015/05/10 19:52:14 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. @@ -1996,17 +2015,17 @@ AC_DEFUN([CF_CURSES_LIBS],[ AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_MSG_CHECKING(if we have identified curses libraries) AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], - [initscr(); tgoto("?", 0,0)], - cf_result=yes, - cf_result=no) + [initscr(); tgoto("?", 0,0)], + cf_result=yes, + cf_result=no) AC_MSG_RESULT($cf_result) if test "$cf_result" = no ; then -case $host_os in #(vi -freebsd*) #(vi - AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) - ;; -hpux10.*) #(vi +case $host_os in +(freebsd*) + AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) + ;; +(hpux10.*) # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr # next (1998), and xcurses "newer" (2000). There is no header file for # Hcurses; the subdirectory curses_colr has the headers (curses.h and @@ -2025,9 +2044,9 @@ hpux10.*) #(vi ])]) fi ;; -linux*) +(linux*) case `arch 2>/dev/null` in - x86_64) + (x86_64) if test -d /lib64 then CF_ADD_LIBDIR(/lib64) @@ -2035,21 +2054,21 @@ linux*) CF_ADD_LIBDIR(/lib) fi ;; - *) + (*) CF_ADD_LIBDIR(/lib) ;; esac ;; -sunos3*|sunos4*) +(sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then if test -d /usr/5lib ; then CF_ADD_LIBDIR(/usr/5lib) CF_ADD_LIBS(-lcurses -ltermcap) fi - fi - ac_cv_func_initscr=yes - ;; + fi + ac_cv_func_initscr=yes + ;; esac if test ".$ac_cv_func_initscr" != .yes ; then @@ -2115,7 +2134,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERMCAP version: 11 updated: 2012/10/06 11:17:15 +dnl CF_CURSES_TERMCAP version: 12 updated: 2015/05/15 19:42:24 dnl ----------------- dnl Check if we should include to pick up prototypes for termcap dnl functions. On terminfo systems, these are normally declared in , @@ -2182,24 +2201,24 @@ fi ]) case $cf_cv_need_curses_h in -both) #(vi +(both) 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 +(curses.h) AC_DEFINE_UNQUOTED(NEED_CURSES_H,1,[Define to 1 if we must include curses.h]) ;; -term.h) #(vi +(term.h) AC_DEFINE_UNQUOTED(NEED_TERM_H,1,[Define to 1 if we must include term.h]) ;; -termcap.h) #(vi +(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: 10 updated: 2012/10/06 08:57:51 +dnl CF_CURSES_TERM_H version: 11 updated: 2015/04/15 19:08:48 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, @@ -2216,8 +2235,8 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_he cf_header_list="term.h ncurses/term.h ncursesw/term.h" -case ${cf_cv_ncurses_header:-curses.h} in #(vi -*/*) +case ${cf_cv_ncurses_header:-curses.h} in +(*/*) cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h cf_header_list="$cf_header_item $cf_header_list" ;; @@ -2234,8 +2253,8 @@ do [cf_cv_term_header=no]) done -case $cf_cv_term_header in #(vi -no) +case $cf_cv_term_header in +(no) # If curses is ncurses, some packagers still mess it up by trying to make # us use GNU termcap. This handles the most common case. for cf_header in ncurses/term.h ncursesw/term.h @@ -2256,14 +2275,14 @@ make an error esac ]) -case $cf_cv_term_header in #(vi -term.h) #(vi +case $cf_cv_term_header in +(term.h) AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h]) ;; -ncurses/term.h) #(vi +(ncurses/term.h) AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h]) ;; -ncursesw/term.h) +(ncursesw/term.h) AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h]) ;; esac @@ -2369,7 +2388,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: 12 updated: 2012/10/06 16:30:28 +dnl CF_DISABLE_ECHO version: 13 updated: 2015/04/18 08:56:57 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. @@ -2386,17 +2405,17 @@ AC_MSG_CHECKING(if you want to see long CF_ARG_DISABLE(echo, [ --disable-echo do not display "compiling" commands], [ - ECHO_LT='--silent' - ECHO_LD='@echo linking [$]@;' - RULE_CC='@echo compiling [$]<' - SHOW_CC='@echo compiling [$]@' - ECHO_CC='@' + ECHO_LT='--silent' + ECHO_LD='@echo linking [$]@;' + RULE_CC='@echo compiling [$]<' + SHOW_CC='@echo compiling [$]@' + ECHO_CC='@' ],[ - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' ]) AC_MSG_RESULT($enableval) AC_SUBST(ECHO_LT) @@ -2414,39 +2433,7 @@ AC_DEFUN([CF_ERRNO], CF_CHECK_ERRNO(errno) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_HEADER version: 2 updated: 2007/07/29 11:32:00 -dnl -------------- -dnl Find a header file, searching for it if it is not already in the include -dnl path. -dnl -dnl $1 = the header filename -dnl $2 = the package name -dnl $3 = action to perform if successful -dnl $4 = action to perform if not successful -AC_DEFUN([CF_FIND_HEADER],[ -AC_CHECK_HEADER([$1], - cf_find_header=yes,[ - cf_find_header=no -CF_HEADER_PATH(cf_search,$2) -for cf_incdir in $cf_search -do - if test -f $cf_incdir/$1 ; then - CF_ADD_INCDIR($cf_incdir) - CF_VERBOSE(... found in $cf_incdir) - cf_find_header=yes - break - fi - CF_VERBOSE(... tested $cf_incdir) -done -]) -if test "$cf_find_header" = yes ; then -ifelse([$3],,:,[$3]) -ifelse([$4],,,[else -$4]) -fi -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_FIND_IPV6_LIBS version: 7 updated: 2007/07/29 13:35:20 +dnl CF_FIND_IPV6_LIBS version: 8 updated: 2015/04/15 19:08:48 dnl ----------------- dnl Based on the IPV6 stack type, look for the corresponding library. AC_DEFUN([CF_FIND_IPV6_LIBS],[ @@ -2456,32 +2443,32 @@ cf_ipv6lib=none cf_ipv6dir=none AC_MSG_CHECKING(for IPv6 library if required) -case $cf_cv_ipv6type in #(vi -solaris) #(vi +case $cf_cv_ipv6type in +(solaris) ;; -inria) #(vi +(inria) ;; -kame) #(vi +(kame) dnl http://www.kame.net/ cf_ipv6lib=inet6 cf_ipv6dir=v6 ;; -linux-glibc) #(vi +(linux-glibc) ;; -linux-libinet6) #(vi +(linux-libinet6) dnl http://www.v6.linux.or.jp/ cf_ipv6lib=inet6 cf_ipv6dir=inet6 ;; -toshiba) #(vi +(toshiba) cf_ipv6lib=inet6 cf_ipv6dir=v6 ;; -v6d) #(vi +(v6d) cf_ipv6lib=v6 cf_ipv6dir=v6 ;; -zeta) +(zeta) cf_ipv6lib=inet6 cf_ipv6dir=v6 ;; @@ -2527,15 +2514,15 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_IPV6_TYPE version: 5 updated: 2001/10/11 20:46:17 +dnl CF_FIND_IPV6_TYPE version: 6 updated: 2015/04/15 19:08:48 dnl ----------------- AC_DEFUN([CF_FIND_IPV6_TYPE],[ AC_CACHE_CHECK(ipv6 stack type, cf_cv_ipv6type, [ cf_cv_ipv6type=unknown for i in solaris inria kame linux-glibc linux-libinet6 toshiba v6d zeta do - case $i in #(vi - solaris) #(vi + case $i in + (solaris) if test "SunOS" = "`uname -s`" then if test -f /usr/include/netinet/ip6.h @@ -2544,7 +2531,7 @@ do fi fi ;; - inria) #(vi + (inria) dnl http://www.kame.net/ AC_EGREP_CPP(yes, [ #include @@ -2552,7 +2539,7 @@ do yes #endif], [cf_cv_ipv6type=$i]) ;; - kame) #(vi + (kame) dnl http://www.kame.net/ AC_EGREP_CPP(yes, [ #include @@ -2560,7 +2547,7 @@ yes yes #endif], [cf_cv_ipv6type=$i]) ;; - linux-glibc) #(vi + (linux-glibc) dnl http://www.v6.linux.or.jp/ AC_EGREP_CPP(yes, [ #include @@ -2568,7 +2555,7 @@ yes yes #endif], [cf_cv_ipv6type=$i]) ;; - linux-libinet6) #(vi + (linux-libinet6) dnl http://www.v6.linux.or.jp/ if test -d /usr/inet6 then @@ -2578,21 +2565,21 @@ yes cf_cv_ipv6type=$i fi ;; - toshiba) #(vi + (toshiba) AC_EGREP_CPP(yes, [ #include #ifdef _TOSHIBA_INET6 yes #endif], [cf_cv_ipv6type=$i]) ;; - v6d) #(vi + (v6d) AC_EGREP_CPP(yes, [ #include #ifdef __V6D__ yes #endif], [cf_cv_ipv6type=$i]) ;; - zeta) + (zeta) AC_EGREP_CPP(yes, [ #include #ifdef _ZETA_MINAMI_INET6 @@ -2657,7 +2644,7 @@ fi ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_FIND_LINKAGE version: 19 updated: 2010/05/29 16:31:02 +dnl CF_FIND_LINKAGE version: 20 updated: 2015/04/18 08:56:57 dnl --------------- dnl Find a library (specifically the linkage used in the code fragment), dnl searching for it if it is not already in the library path. @@ -2705,73 +2692,73 @@ AC_TRY_LINK([$1],[$2],[ cf_cv_find_linkage_$3=no LIBS="$cf_save_LIBS" - CF_VERBOSE(find linkage for $3 library) - CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)]) + CF_VERBOSE(find linkage for $3 library) + CF_MSG_LOG([Searching for headers in [FIND_LINKAGE]($3,$6)]) - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" - CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6])) - for cf_cv_header_path_$3 in $cf_search - do - if test -d $cf_cv_header_path_$3 ; then - CF_VERBOSE(... testing $cf_cv_header_path_$3) - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3" - AC_TRY_COMPILE([$1],[$2],[ - CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) - cf_cv_find_linkage_$3=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break],[ - CPPFLAGS="$cf_save_CPPFLAGS" - ]) - fi - done + CF_HEADER_PATH(cf_search,ifelse([$6],,[$3],[$6])) + for cf_cv_header_path_$3 in $cf_search + do + if test -d $cf_cv_header_path_$3 ; then + CF_VERBOSE(... testing $cf_cv_header_path_$3) + CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_$3" + AC_TRY_COMPILE([$1],[$2],[ + CF_VERBOSE(... found $3 headers in $cf_cv_header_path_$3) + cf_cv_find_linkage_$3=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break],[ + CPPFLAGS="$cf_save_CPPFLAGS" + ]) + fi + done - if test "$cf_cv_find_linkage_$3" = maybe ; then + if test "$cf_cv_find_linkage_$3" = maybe ; then - CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)]) + CF_MSG_LOG([Searching for $3 library in [FIND_LINKAGE]($3,$6)]) - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - ifelse([$6],,,[ - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-l$3 $7 $cf_save_LIBS" - AC_TRY_LINK([$1],[$2],[ - CF_VERBOSE(... found $3 library in system) - cf_cv_find_linkage_$3=yes]) - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - ]) - - if test "$cf_cv_find_linkage_$3" != yes ; then - CF_LIBRARY_PATH(cf_search,$3) - for cf_cv_library_path_$3 in $cf_search - do - if test -d $cf_cv_library_path_$3 ; then - CF_VERBOSE(... testing $cf_cv_library_path_$3) - CPPFLAGS="$cf_test_CPPFLAGS" - LIBS="-l$3 $7 $cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3" - AC_TRY_LINK([$1],[$2],[ - CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3) - cf_cv_find_linkage_$3=yes - cf_cv_library_file_$3="-l$3" - break],[ - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - ]) - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi + ifelse([$6],,,[ + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-l$3 $7 $cf_save_LIBS" + AC_TRY_LINK([$1],[$2],[ + CF_VERBOSE(... found $3 library in system) + cf_cv_find_linkage_$3=yes]) + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + ]) - else - cf_cv_find_linkage_$3=no - fi - ],$7) + if test "$cf_cv_find_linkage_$3" != yes ; then + CF_LIBRARY_PATH(cf_search,$3) + for cf_cv_library_path_$3 in $cf_search + do + if test -d $cf_cv_library_path_$3 ; then + CF_VERBOSE(... testing $cf_cv_library_path_$3) + CPPFLAGS="$cf_test_CPPFLAGS" + LIBS="-l$3 $7 $cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_$3" + AC_TRY_LINK([$1],[$2],[ + CF_VERBOSE(... found $3 library in $cf_cv_library_path_$3) + cf_cv_find_linkage_$3=yes + cf_cv_library_file_$3="-l$3" + break],[ + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" + ]) + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi + + else + cf_cv_find_linkage_$3=no + fi + ],$7) ]) LIBS="$cf_save_LIBS" @@ -3032,7 +3019,7 @@ if test "$GCC" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GCC_WARNINGS version: 31 updated: 2013/11/19 19:23:35 +dnl CF_GCC_WARNINGS version: 32 updated: 2015/04/12 15:39:00 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: @@ -3124,20 +3111,20 @@ then CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" if AC_TRY_EVAL(ac_compile); then test -n "$verbose" && AC_MSG_RESULT(... -$cf_opt) - case $cf_opt in #(vi - Wcast-qual) #(vi + case $cf_opt in + (Wcast-qual) CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" ;; - Winline) #(vi + (Winline) case $GCC_VERSION in - [[34]].*) + ([[34]].*) CF_VERBOSE(feature is broken in gcc $GCC_VERSION) continue;; esac ;; - Wpointer-arith) #(vi + (Wpointer-arith) case $GCC_VERSION in - [[12]].*) + ([[12]].*) CF_VERBOSE(feature is broken in gcc $GCC_VERSION) continue;; esac @@ -3183,7 +3170,7 @@ make an error test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_HEADER_PATH version: 12 updated: 2010/05/05 05:22:40 +dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48 dnl -------------- dnl Construct a search-list of directories for a nonstandard header-file dnl @@ -3199,8 +3186,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` CF_ADD_SUBDIR_PATH($1,$2,include,$cf_header_path,NONE) cf_header_path_list="$cf_header_path_list [$]$1" @@ -3229,7 +3216,7 @@ test -d "$oldincludedir" && { $1="[$]$1 $cf_header_path_list" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 +dnl CF_INTEL_COMPILER version: 7 updated: 2015/04/12 15:39:00 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -3248,7 +3235,7 @@ ifelse([$2],,INTEL_COMPILER,[$2])=no if test "$ifelse([$1],,[$1],GCC)" = yes ; then case $host_os in - linux*|gnu*) + (linux*|gnu*) AC_MSG_CHECKING(if this is really Intel ifelse([$1],GXX,C++,C) compiler) cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])" ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -no-gcc" @@ -3258,7 +3245,7 @@ if test "$ifelse([$1],,[$1],GCC)" = yes make an error #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2])) @@ -3267,7 +3254,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147 - fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIBRARY_PATH version: 9 updated: 2010/03/28 12:52:50 +dnl CF_LIBRARY_PATH version: 10 updated: 2015/04/15 19:08:48 dnl --------------- dnl Construct a search-list of directories for a nonstandard library-file dnl @@ -3281,8 +3268,8 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` CF_ADD_SUBDIR_PATH($1,$2,lib,$cf_library_path,NONE) cf_library_path_list="$cf_library_path_list [$]$1" @@ -3296,18 +3283,18 @@ CF_SUBDIR_PATH($1,$2,lib) $1="$cf_library_path_list [$]$1" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 +dnl CF_LIB_PREFIX version: 11 updated: 2015/04/18 08:56:57 dnl ------------- dnl Compute the library-prefix for the given host system dnl $1 = variable to set define([CF_LIB_PREFIX], [ - case $cf_cv_system_name in #(vi - OS/2*|os2*) #(vi - LIB_PREFIX='' - ;; - *) LIB_PREFIX='lib' - ;; + case $cf_cv_system_name in + (OS/2*|os2*) + LIB_PREFIX='' + ;; + (*) LIB_PREFIX='lib' + ;; esac ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) @@ -3398,7 +3385,7 @@ done ]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 +dnl CF_MAKEFLAGS version: 16 updated: 2015/04/15 19:08:48 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' dnl options to lower-levels. It's very useful for "make -n" -- if we have it. @@ -3417,18 +3404,18 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` case "$cf_result" in - .*k) + (.*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in - .*CC=*) cf_cv_makeflags= + (.*CC=*) cf_cv_makeflags= ;; - *) cf_cv_makeflags=$cf_option + (*) cf_cv_makeflags=$cf_option ;; esac break ;; - .-) ;; - *) echo "given option \"$cf_option\", no match \"$cf_result\"" + (.-) ;; + (*) echo "given option \"$cf_option\", no match \"$cf_result\"" ;; esac done @@ -3508,46 +3495,96 @@ printf("old\n"); ,[$1=no]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_CONFIG version: 10 updated: 2012/10/06 08:57:51 +dnl CF_NCURSES_CONFIG version: 17 updated: 2015/07/07 04:22:07 dnl ----------------- -dnl Tie together the configure-script macros for ncurses. -dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis. -dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable. +dnl Tie together the configure-script macros for ncurses, preferring these in +dnl order: +dnl a) ".pc" files for pkg-config, using $NCURSES_CONFIG_PKG +dnl b) the "-config" script from ncurses, using $NCURSES_CONFIG +dnl c) just plain libraries dnl dnl $1 is the root library name (default: "ncurses") -AC_DEFUN([CF_NCURSES_CONFIG], -[ +AC_DEFUN([CF_NCURSES_CONFIG],[ +AC_REQUIRE([CF_PKG_CONFIG]) cf_ncuconfig_root=ifelse($1,,ncurses,$1) +cf_have_ncuconfig=no -echo "Looking for ${cf_ncuconfig_root}-config" +if test "x${PKG_CONFIG:=none}" != xnone; then + AC_MSG_CHECKING(pkg-config for $cf_ncuconfig_root) + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + AC_MSG_RESULT(yes) -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)]) + AC_MSG_CHECKING(if the $cf_ncuconfig_root package files work) + cf_have_ncuconfig=unknown + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + CF_ADD_LIBS(`$PKG_CONFIG --libs $cf_ncuconfig_root`) + + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], + [initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);], + [AC_TRY_RUN([#include <${cf_cv_ncurses_header:-curses.h}> + int main(void) + { char *xx = curses_version(); return (xx == 0); }], + [cf_have_ncuconfig=yes], + [cf_have_ncuconfig=no], + [cf_have_ncuconfig=maybe])], + [cf_have_ncuconfig=no]) + AC_MSG_RESULT($cf_have_ncuconfig) + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + NCURSES_CONFIG_PKG=none + else + AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + fi -if test "$NCURSES_CONFIG" != none ; then + else + AC_MSG_RESULT(no) + NCURSES_CONFIG_PKG=none + fi +else + NCURSES_CONFIG_PKG=none +fi -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" -# even with config script, some packages use no-override for curses.h -CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) + CF_ACVERSION_CHECK(2.52, + [AC_CHECK_TOOLS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)], + [AC_PATH_PROGS(NCURSES_CONFIG, ${cf_ncuconfig_root}-config ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config, none)]) -dnl like CF_NCURSES_CPPFLAGS -AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) + if test "$NCURSES_CONFIG" != none ; then -dnl like CF_NCURSES_LIBS -CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) -AC_DEFINE_UNQUOTED($cf_nculib_ROOT) + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + CF_ADD_LIBS(`$NCURSES_CONFIG --libs`) -dnl like CF_NCURSES_VERSION -cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + # even with config script, some packages use no-override for curses.h + CF_CURSES_HEADER(ifelse($1,,ncurses,$1)) -else + dnl like CF_NCURSES_CPPFLAGS + AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries]) -CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) -CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + dnl like CF_NCURSES_LIBS + CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_ncuconfig_root) + AC_DEFINE_UNQUOTED($cf_nculib_ROOT) + dnl like CF_NCURSES_VERSION + cf_cv_ncurses_version=`$NCURSES_CONFIG --version` + + else + + CF_NCURSES_CPPFLAGS(ifelse($1,,ncurses,$1)) + CF_NCURSES_LIBS(ifelse($1,,ncurses,$1)) + + fi +else + NCURSES_CONFIG=none fi ])dnl dnl --------------------------------------------------------------------------- @@ -3602,7 +3639,7 @@ AC_DEFINE(NCURSES,1,[Define to 1 if we a CF_NCURSES_VERSION ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_HEADER version: 3 updated: 2012/10/06 08:57:51 +dnl CF_NCURSES_HEADER version: 4 updated: 2015/04/15 19:08:48 dnl ----------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -3651,24 +3688,24 @@ fi # Set definitions to allow ifdef'ing for ncurses.h -case $cf_cv_ncurses_header in # (vi -*ncurses.h) +case $cf_cv_ncurses_header in +(*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) +case $cf_cv_ncurses_header in +(ncurses/curses.h|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) +(ncursesw/curses.h|ncursesw/ncurses.h) AC_DEFINE(HAVE_NCURSESW_NCURSES_H,1,[Define to 1 if we have ncursesw/ncurses.h]) ;; esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_NCURSES_LIBS version: 16 updated: 2010/11/20 17:02:38 +dnl CF_NCURSES_LIBS version: 17 updated: 2015/04/15 19:08:48 dnl --------------- dnl Look for the ncurses library. This is a little complicated on Linux, dnl because it may be linked with the gpm (general purpose mouse) library. @@ -3694,8 +3731,8 @@ AC_CHECK_LIB(gpm,Gpm_Open, [LIBS="$cf_ncurses_SAVE"], [cf_ncurses_LIBS="-lgpm"])]) -case $host_os in #(vi -freebsd*) +case $host_os in +(freebsd*) # This is only necessary if you are linking against an obsolete # version of ncurses (but it should do no harm, since it's static). if test "$cf_nculib_root" = ncurses ; then @@ -3798,7 +3835,7 @@ EOF 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: 10 updated: 2013/10/08 17:47:05 +dnl CF_NETLIBS version: 11 updated: 2015/04/15 19:08:48 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 @@ -3821,8 +3858,8 @@ AC_MSG_RESULT(working...) cf_cv_netlibs="" cf_test_netlibs=yes -case $host_os in #(vi -mingw*) # (vi +case $host_os in +(mingw*) AC_CHECK_HEADERS( windows.h winsock.h winsock2.h ) if test "$ac_cv_header_winsock2_h" = "yes" ; then @@ -3855,7 +3892,7 @@ mingw*) # (vi LIBS="$cf_save_LIBS" ;; -*) +(*) AC_CHECK_FUNCS(gethostname,,[ CF_RECHECK_FUNC(gethostname,nsl,cf_cv_netlibs,[ CF_RECHECK_FUNC(gethostname,socket,cf_cv_netlibs)])]) @@ -3883,8 +3920,8 @@ mingw*) # (vi esac ]) -case $cf_cv_netlibs in #(vi -*ws2_32*) +case $cf_cv_netlibs in +(*ws2_32*) AC_DEFINE(USE_WINSOCK2_H,1,[Define to 1 if we should include winsock2.h]) ;; esac @@ -3893,7 +3930,7 @@ 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: 5 updated: 2012/10/02 20:55:03 +dnl CF_NO_LEAKS_OPTION version: 6 updated: 2015/04/12 15:39:00 dnl ------------------ dnl see CF_WITH_NO_LEAKS AC_DEFUN([CF_NO_LEAKS_OPTION],[ @@ -3909,12 +3946,12 @@ AC_ARG_WITH($1, [with_$1=]) AC_MSG_RESULT(${with_$1:-no}) -case .$with_cflags in #(vi -.*-g*) - case .$CFLAGS in #(vi - .*-g*) #(vi +case .$with_cflags in +(.*-g*) + case .$CFLAGS in + (.*-g*) ;; - *) + (*) CF_ADD_CFLAGS([-g]) ;; esac @@ -3959,7 +3996,7 @@ AC_SUBST(MSG_DIR_MAKE) AC_SUBST(SUB_MAKEFILE) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATHSEP version: 6 updated: 2012/09/29 18:38:12 +dnl CF_PATHSEP version: 7 updated: 2015/04/12 15:39:00 dnl ---------- dnl Provide a value for the $PATH and similar separator (or amend the value dnl as provided in autoconf 2.5x). @@ -3967,8 +4004,8 @@ AC_DEFUN([CF_PATHSEP], [ AC_MSG_CHECKING(for PATH separator) case $cf_cv_system_name in - os2*) PATH_SEPARATOR=';' ;; - *) ${PATH_SEPARATOR:=':'} ;; + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; esac ifelse([$1],,,[$1=$PATH_SEPARATOR]) AC_SUBST(PATH_SEPARATOR) @@ -4055,7 +4092,7 @@ fi AC_MSG_RESULT($DEFAULT_MAILER) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PATH_SYNTAX version: 14 updated: 2012/06/19 20:58:54 +dnl CF_PATH_SYNTAX version: 16 updated: 2015/04/18 08:56:57 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 @@ -4063,32 +4100,32 @@ dnl result begins with 'NONE'. This is dnl delayed evaluation of those symbols. AC_DEFUN([CF_PATH_SYNTAX],[ if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".[$]$1" in #(vi -.\[$]\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[[a-zA-Z]]:[[\\/]]*) #(vi OS/2 EMX - ;; -.\[$]{*prefix}*|.\[$]{*dir}*) #(vi - eval $1="[$]$1" - case ".[$]$1" in #(vi - .NONE/*) - $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) - ;; +case ".[$]$1" in +(.\[$]\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[[a-zA-Z]]:[[\\/]]*) # OS/2 EMX + ;; +(.\[$]{*prefix}*|.\[$]{*dir}*) + eval $1="[$]$1" + case ".[$]$1" in + (.NONE/*) + $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + ifelse([$2],,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2) + ;; esac ])dnl dnl --------------------------------------------------------------------------- @@ -4137,7 +4174,7 @@ else fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 +dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58 dnl ------------- dnl Check for the package-config program, unless disabled by command-line. AC_DEFUN([CF_PKG_CONFIG], @@ -4149,16 +4186,16 @@ AC_ARG_WITH(pkg-config, [cf_pkg_config=yes]) AC_MSG_RESULT($cf_pkg_config) -case $cf_pkg_config in #(vi -no) #(vi +case $cf_pkg_config in +(no) PKG_CONFIG=none ;; -yes) #(vi +(yes) CF_ACVERSION_CHECK(2.52, [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) ;; -*) +(*) PKG_CONFIG=$withval ;; esac @@ -4166,12 +4203,14 @@ esac test -z "$PKG_CONFIG" && PKG_CONFIG=none if test "$PKG_CONFIG" != none ; then CF_PATH_SYNTAX(PKG_CONFIG) +elif test "x$cf_pkg_config" != xno ; then + AC_MSG_WARN(pkg-config is not installed) fi AC_SUBST(PKG_CONFIG) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42 +dnl CF_POSIX_C_SOURCE version: 9 updated: 2015/04/12 15:39:00 dnl ----------------- dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if needed. dnl @@ -4203,15 +4242,15 @@ make an error #endif], [cf_cv_posix_c_source=no], [cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[[12]]??*) #(vi + case .$cf_POSIX_C_SOURCE in + (.[[12]]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) #(vi + (.2) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" cf_want_posix_source=yes ;; - .*) + (.*) cf_want_posix_source=yes ;; esac @@ -4292,7 +4331,7 @@ 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 CF_PROG_CC version: 4 updated: 2014/07/12 18:57:58 dnl ---------- dnl standard check for CC, plus followup sanity checks dnl $1 = optional parameter to pass to AC_PROG_CC to specify compiler name @@ -4302,49 +4341,24 @@ 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 -dnl given rather than by type of option. Some compilers insist on apply all -dnl of the -U options after all of the -D options. Others allow mixing them, -dnl and may predefine symbols that conflict with those we define. -AC_DEFUN([CF_PROG_CC_U_D], -[ -AC_CACHE_CHECK(if $CC -U and -D options work together,cf_cv_cc_u_d_options,[ - cf_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS" - AC_TRY_COMPILE([],[ -#ifndef U_D_OPTIONS -make an undefined-error -#endif -#ifdef D_U_OPTIONS -make a defined-error -#endif - ],[ - cf_cv_cc_u_d_options=yes],[ - cf_cv_cc_u_d_options=no]) - CPPFLAGS="$cf_save_CPPFLAGS" -]) +CF_CC_ENV_FLAGS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_PROG_EXT version: 11 updated: 2012/10/06 08:57:51 +dnl CF_PROG_EXT version: 13 updated: 2015/04/18 09:03:58 dnl ----------- dnl Compute $PROG_EXT, used for non-Unix ports, such as OS/2 EMX. AC_DEFUN([CF_PROG_EXT], [ AC_REQUIRE([CF_CHECK_CACHE]) case $cf_cv_system_name in -os2*) - CFLAGS="$CFLAGS -Zmt" - CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" - CXXFLAGS="$CXXFLAGS -Zmt" - # autoconf's macro sets -Zexe and suffix both, which conflict:w - LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" - ac_cv_exeext=.exe - ;; +(os2*) + CFLAGS="$CFLAGS -Zmt" + CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" + CXXFLAGS="$CXXFLAGS -Zmt" + # autoconf's macro sets -Zexe and suffix both, which conflict:w + LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" + ac_cv_exeext=.exe + ;; esac AC_EXEEXT @@ -4494,24 +4508,6 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SET_GID_UID version: 2 updated: 1997/08/28 23:57:55 -dnl -------------- -dnl Check for the functions that set effective/real uid/gid. This has to -dnl follow the AC_CHECK_FUNCS call. -AC_DEFUN([CF_SET_GID_UID], -[ -AC_MSG_CHECKING([for setuid-like functions]) -AC_CACHE_VAL(cf_cv_setuid_funcs,[ -if test -n "${ac_cv_func_setuid}${ac_cv_func_seteuid}${ac_cv_func_setreuid}"; then - cf_cv_setuid_funcs=yes -else - cf_cv_setuid_funcs=no -fi -]) -AC_MSG_RESULT($cf_cv_setuid_funcs) -test $cf_cv_setuid_funcs = yes && AC_DEFINE(HAVE_SET_GID_UID) -])dnl -dnl --------------------------------------------------------------------------- dnl CF_SIGWINCH version: 1 updated: 2006/04/02 16:41:09 dnl ----------- dnl Use this macro after CF_XOPEN_SOURCE, but do not require it (not all @@ -4639,7 +4635,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: 9 updated: 2012/10/06 11:17:15 +dnl CF_SIZECHANGE version: 11 updated: 2015/04/18 08:56:57 dnl ------------- dnl Check for definitions & structures needed for window size-changing dnl FIXME: check that this works with "snake" (HP-UX 10.x) @@ -4647,15 +4643,15 @@ AC_DEFUN([CF_SIZECHANGE], [ AC_REQUIRE([CF_STRUCT_TERMIOS]) AC_CACHE_CHECK(declaration of size-change, cf_cv_sizechange,[ - cf_cv_sizechange=unknown - cf_save_CPPFLAGS="$CPPFLAGS" + cf_cv_sizechange=unknown + cf_save_CPPFLAGS="$CPPFLAGS" for cf_opts in "" "NEED_PTEM_H" do - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - AC_TRY_COMPILE([#include + CPPFLAGS="$cf_save_CPPFLAGS" + test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" + AC_TRY_COMPILE([#include #ifdef HAVE_TERMIOS_H #include #else @@ -4701,8 +4697,8 @@ done ]) if test "$cf_cv_sizechange" != no ; then AC_DEFINE(HAVE_SIZECHANGE,1,[Define to 1 if sizechar declarations are provided]) - case $cf_cv_sizechange in #(vi - NEED*) + case $cf_cv_sizechange in + (NEED*) AC_DEFINE_UNQUOTED($cf_cv_sizechange ) ;; esac @@ -4799,7 +4795,7 @@ AC_DEFUN([CF_STRERROR],[ AC_CHECK_FUNCS(strerror, AC_DEFINE(HAVE_STRERROR),[CF_SYS_ERRLIST]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_STRUCT_TERMIOS version: 7 updated: 2012/10/06 17:56:13 +dnl CF_STRUCT_TERMIOS version: 8 updated: 2015/04/15 19:08:48 dnl ----------------- dnl Some machines require _POSIX_SOURCE to completely define struct termios. AC_DEFUN([CF_STRUCT_TERMIOS],[ @@ -4816,9 +4812,9 @@ if test "$ISC" = yes ; then fi if test "$ac_cv_header_termios_h" = yes ; then case "$CFLAGS $CPPFLAGS" in - *-D_POSIX_SOURCE*) + (*-D_POSIX_SOURCE*) termios_bad=dunno ;; - *) termios_bad=maybe ;; + (*) termios_bad=maybe ;; esac if test "$termios_bad" = maybe ; then AC_MSG_CHECKING(whether termios.h needs _POSIX_SOURCE) @@ -4837,7 +4833,7 @@ if test "$ac_cv_header_termios_h" = yes fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50 +dnl CF_SUBDIR_PATH version: 7 updated: 2014/12/04 04:33:06 dnl -------------- dnl Construct a search-list for a nonstandard header/lib-file dnl $1 = the variable to return as result @@ -4847,47 +4843,18 @@ AC_DEFUN([CF_SUBDIR_PATH], [ $1= -CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix) CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE) -CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix) -CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix) -CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_SUBST version: 4 updated: 2006/06/17 12:33:03 -dnl -------- -dnl Shorthand macro for substituting things that the user may override -dnl with an environment variable. -dnl -dnl $1 = long/descriptive name -dnl $2 = environment variable -dnl $3 = default value -AC_DEFUN([CF_SUBST], -[AC_CACHE_VAL(cf_cv_subst_$2,[ -AC_MSG_CHECKING(for $1 (symbol $2)) -CF_SUBST_IF([-z "[$]$2"], [$2], [$3]) -cf_cv_subst_$2=[$]$2 -AC_MSG_RESULT([$]$2) -]) -])dnl -dnl --------------------------------------------------------------------------- -dnl CF_SUBST_IF version: 2 updated: 2006/06/17 12:33:03 -dnl ----------- -dnl Shorthand macro for substituting things that the user may override -dnl with an environment variable. -dnl -dnl $1 = condition to pass to "test" -dnl $2 = environment variable -dnl $3 = value if the test succeeds -dnl $4 = value if the test fails -AC_DEFUN([CF_SUBST_IF], -[ -if test $1 ; then - $2=$3 -ifelse($4,,,[else - $2=$4]) -fi -AC_SUBST($2) + +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + [$]HOME +do + CF_ADD_SUBDIR_PATH($1,$2,$3,$cf_subdir_prefix,$prefix) +done ])dnl dnl --------------------------------------------------------------------------- dnl CF_SYS_ERRLIST version: 6 updated: 2001/12/30 13:03:23 @@ -4942,7 +4909,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: 14 updated: 2012/07/07 21:02:48 +dnl CF_TERMCAP_LIBS version: 15 updated: 2015/04/15 19:08:48 dnl --------------- dnl Look for termcap libraries, or the equivalent in terminfo. dnl @@ -4958,8 +4925,8 @@ AC_TRY_LINK([],[char *x=(char*)tgoto("", CF_VERBOSE(using functions in predefined $cf_cv_termlib LIBS) ],[ ifelse([$1],,,[ -case "$1" in # (vi -ncurses*) +case "$1" in +(ncurses*) CF_NCURSES_CONFIG($1) cf_cv_termlib=terminfo ;; @@ -5035,18 +5002,18 @@ if test $cf_cv_use_termios_h = yes; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_TERM_HEADER version: 3 updated: 2012/10/06 08:57:51 +dnl CF_TERM_HEADER version: 4 updated: 2015/04/15 19:08:48 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, dnl but some packagers change this, breaking various applications. AC_DEFUN([CF_TERM_HEADER],[ AC_CACHE_CHECK(for terminfo header, cf_cv_term_header,[ -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi +case ${cf_cv_ncurses_header} in +(*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[[^.]]*\.h$%term.h%'` ;; -*) +(*) cf_term_header=term.h ;; esac @@ -5066,17 +5033,17 @@ done # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in # (vi -*term.h) +case $cf_cv_term_header in +(*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 +case $cf_cv_term_header in +(ncurses/term.h) AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h]) ;; -ncursesw/term.h) +(ncursesw/term.h) AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h]) ;; esac @@ -5158,7 +5125,7 @@ AC_MSG_RESULT($cf_cv_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_TRIM_X_LIBS version: 2 updated: 2013/07/09 21:27:22 +dnl CF_TRIM_X_LIBS version: 3 updated: 2015/04/12 15:39:00 dnl -------------- dnl Trim extra base X libraries added as a workaround for inconsistent library dnl dependencies returned by "new" pkg-config files. @@ -5166,7 +5133,7 @@ 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*) + (*-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) ;; @@ -5240,7 +5207,7 @@ if test "$cf_cv_xopen_source" != no ; th fi ]) dnl --------------------------------------------------------------------------- -dnl CF_TYPE_OUTCHAR version: 14 updated: 2012/10/06 11:17:15 +dnl CF_TYPE_OUTCHAR version: 15 updated: 2015/05/15 19:42:24 dnl --------------- dnl Check for return and param type of 3rd -- OutChar() -- param of tputs(). dnl @@ -5304,12 +5271,12 @@ done ]) case $cf_cv_type_outchar in -int*) +(int*) AC_DEFINE(OUTC_RETURN,1,[Define to 1 if tputs outc function returns a value]) ;; esac case $cf_cv_type_outchar in -*char*) +(*char*) AC_DEFINE(OUTC_ARGS,char c,[Define to actual type to override tputs outc parameter type]) ;; esac @@ -5612,7 +5579,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 45 updated: 2013/09/07 14:06:25 +dnl CF_XOPEN_SOURCE version: 49 updated: 2015/04/12 15:39:00 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, @@ -5628,21 +5595,21 @@ cf_XOPEN_SOURCE=ifelse([$1],,500,[$1]) cf_POSIX_C_SOURCE=ifelse([$2],,199506L,[$2]) cf_xopen_source= -case $host_os in #(vi -aix[[4-7]]*) #(vi +case $host_os in +(aix[[4-7]]*) cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin|msys) #(vi +(cygwin|msys) cf_XOPEN_SOURCE=600 ;; -darwin[[0-8]].*) #(vi +(darwin[[0-8]].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; -darwin*) #(vi +(darwin*) cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -freebsd*|dragonfly*) #(vi +(freebsd*|dragonfly*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -5650,55 +5617,63 @@ freebsd*|dragonfly*) #(vi cf_XOPEN_SOURCE=600 cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ;; -hpux11*) #(vi +(hpux11*) cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; -hpux*) #(vi +(hpux*) cf_xopen_source="-D_HPUX_SOURCE" ;; -irix[[56]].*) #(vi +(irix[[56]].*) cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -linux*|gnu*|mint*|k*bsd*-gnu) #(vi +(linux*|gnu*|mint*|k*bsd*-gnu) CF_GNU_SOURCE ;; -mirbsd*) #(vi +(minix*) + cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... + ;; +(mirbsd*) # 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 +(netbsd*) 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 +(openbsd[[4-9]]*) # 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 +(openbsd*) # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; -osf[[45]]*) #(vi +(osf[[45]]*) cf_xopen_source="-D_OSF_SOURCE" ;; -nto-qnx*) #(vi +(nto-qnx*) cf_xopen_source="-D_QNX_SOURCE" ;; -sco*) #(vi +(sco*) # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.*) #(vi +(solaris2.*) cf_xopen_source="-D__EXTENSIONS__" + cf_cv_xopen_source=broken ;; -*) +(sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) + cf_XOPEN_SOURCE= + cf_POSIX_C_SOURCE= + ;; +(*) CF_TRY_XOPEN_SOURCE CF_POSIX_C_SOURCE($cf_POSIX_C_SOURCE) ;; esac if test -n "$cf_xopen_source" ; then - CF_ADD_CFLAGS($cf_xopen_source) + CF_ADD_CFLAGS($cf_xopen_source,true) fi dnl In anything but the default case, we may have system-specific setting @@ -5731,7 +5706,7 @@ make an error fi ]) dnl --------------------------------------------------------------------------- -dnl CF_X_ATHENA version: 21 updated: 2013/07/06 21:27:06 +dnl CF_X_ATHENA version: 23 updated: 2015/04/12 15:39:00 dnl ----------- dnl Check for Xaw (Athena) libraries dnl @@ -5751,6 +5726,17 @@ else AC_MSG_RESULT(no) fi +AC_MSG_CHECKING(if you want to link with Xaw 3d xft library) +withval= +AC_ARG_WITH(Xaw3dxft, + [ --with-Xaw3dxft link with Xaw 3d xft library]) +if test "$withval" = yes ; then + cf_x_athena=Xaw3dxft + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi + AC_MSG_CHECKING(if you want to link with neXT Athena library) withval= AC_ARG_WITH(neXtaw, @@ -5802,10 +5788,10 @@ int check = XmuCompareISOLatin1("big", " if test "$cf_cv_xaw_compat" = no then # workaround for broken ".pc" files... - case "$cf_x_athena_lib" in #(vi - *-lXmu*) #(vi + case "$cf_x_athena_lib" in + (*-lXmu*) ;; - *) + (*) CF_VERBOSE(work around broken package) cf_save_xmu="$LIBS" cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^[ ][ ]*//' -e 's/ .*//'` @@ -5950,23 +5936,36 @@ CF_TRY_PKG_CONFIG(Xext,,[ [CF_ADD_LIB(Xext)])]) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_X_TOOLKIT version: 21 updated: 2012/10/04 06:57:36 +dnl CF_X_TOOLKIT version: 23 updated: 2015/04/12 15:39:00 dnl ------------ dnl Check for X Toolkit libraries -dnl AC_DEFUN([CF_X_TOOLKIT], [ AC_REQUIRE([AC_PATH_XTRA]) AC_REQUIRE([CF_CHECK_CACHE]) +# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and +# in some cases has installed dummy files in the former, other cases replaced +# it with a link to the new location). This complicates the configure script. +# Check for that pitfall, and recover using pkg-config +# +# If none of these are set, the configuration is almost certainly broken. +if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}" +then + CF_TRY_PKG_CONFIG(x11,,[AC_MSG_WARN(unable to find X11 library)]) + CF_TRY_PKG_CONFIG(ice,,[AC_MSG_WARN(unable to find ICE library)]) + CF_TRY_PKG_CONFIG(sm,,[AC_MSG_WARN(unable to find SM library)]) + CF_TRY_PKG_CONFIG(xt,,[AC_MSG_WARN(unable to find Xt library)]) +fi + cf_have_X_LIBS=no CF_TRY_PKG_CONFIG(xt,[ - case "x$LIBS" in #(vi - *-lX11*) #(vi + case "x$LIBS" in + (*-lX11*) ;; - *) + (*) # we have an "xt" package, but it may omit Xt's dependency on X11 AC_CACHE_CHECK(for usable X dependency,cf_cv_xt_x11_compat,[ AC_TRY_LINK([ @@ -5995,12 +5994,12 @@ AC_TRY_LINK([ if test "$cf_cv_xt_ice_compat" = no then # workaround for broken ".pc" files used for X Toolkit. - case "x$X_PRE_LIBS" in #(vi - *-lICE*) - case "x$LIBS" in #(vi - *-lICE*) #(vi + case "x$X_PRE_LIBS" in + (*-lICE*) + case "x$LIBS" in + (*-lICE*) ;; - *) + (*) CF_VERBOSE(work around broken ICE dependency) CF_TRY_PKG_CONFIG(ice, [CF_TRY_PKG_CONFIG(sm)], @@ -6055,15 +6054,15 @@ define([CF__ICONV_HEAD],[ #include ] )dnl dnl --------------------------------------------------------------------------- -dnl CF__INTL_BODY version: 1 updated: 2007/07/26 17:35:47 +dnl CF__INTL_BODY version: 2 updated: 2015/05/10 19:52:14 dnl ------------- dnl Test-code needed for libintl compile-checks dnl $1 = parameter 2 from AM_WITH_NLS define([CF__INTL_BODY],[ - bindtextdomain ("", ""); - return (int) gettext ("") - ifelse([$1], need-ngettext, [ + (int) ngettext ("", "", 0)], []) - [ + _nl_msg_cat_cntr] + bindtextdomain ("", ""); + return (int) gettext ("") + ifelse([$1], need-ngettext, [ + (int) ngettext ("", "", 0)], []) + [ + _nl_msg_cat_cntr] ]) dnl --------------------------------------------------------------------------- dnl CF__INTL_HEAD version: 1 updated: 2007/07/26 17:35:47 @@ -6074,7 +6073,7 @@ define([CF__INTL_HEAD],[ extern int _nl_msg_cat_cntr; ])dnl dnl --------------------------------------------------------------------------- -dnl jm_GLIBC21 version: 3 updated: 2002/10/27 23:21:42 +dnl jm_GLIBC21 version: 4 updated: 2015/05/10 19:52:14 dnl ---------- dnl Inserted as requested by gettext 0.10.40 dnl File from /usr/share/aclocal @@ -6085,10 +6084,10 @@ dnl dnl Test for the GNU C Library, version 2.1 or newer. dnl From Bruno Haible. AC_DEFUN([jm_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], +[ +AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], [ #include #ifdef __GNU_LIBRARY__ @@ -6098,10 +6097,7 @@ AC_DEFUN([jm_GLIBC21], #endif ], ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) + ac_cv_gnu_library_2_1=no)]) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" +]) diff -Nurp '--exclude=.bzr*' tin-2.3.1/config.guess tin-2.3.2/config.guess --- tin-2.3.1/config.guess 2014-11-05 22:55:17.000000000 +0100 +++ tin-2.3.2/config.guess 2015-12-15 12:16:04.927210385 +0100 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2014 Free Software Foundation, Inc. +# Copyright 1992-2015 Free Software Foundation, Inc. -timestamp='2014-11-04' +timestamp='2015-12-14' # 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 @@ -49,7 +49,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2014 Free Software Foundation, Inc. +Copyright 1992-2015 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." @@ -167,20 +167,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` + UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ + /sbin/$sysctl 2>/dev/null || \ + /usr/sbin/$sysctl 2>/dev/null || \ + echo unknown)` case "${UNAME_MACHINE_ARCH}" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; + earmv*) + arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` + endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` + machine=${arch}${endian}-unknown + ;; *) machine=${UNAME_MACHINE_ARCH}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ @@ -196,6 +203,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ os=netbsd ;; esac + # Determine ABI tags. + case "${UNAME_MACHINE_ARCH}" in + earm*) + expr='s/^earmv[0-9]/-eabi/;s/eb$//' + abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` + ;; + esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need @@ -206,13 +220,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ release='-gnu' ;; *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" + echo "${machine}-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -234,6 +248,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} exit ;; + *:Sortix:*:*) + echo ${UNAME_MACHINE}-unknown-sortix + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -932,6 +949,9 @@ EOF crisv32:Linux:*:*) echo ${UNAME_MACHINE}-axis-linux-${LIBC} exit ;; + e2k:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; frv:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -944,6 +964,9 @@ EOF ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; + k1om:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; @@ -1020,7 +1043,7 @@ EOF echo ${UNAME_MACHINE}-dec-linux-${LIBC} exit ;; x86_64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + echo ${UNAME_MACHINE}-pc-linux-${LIBC} exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} @@ -1099,7 +1122,7 @@ EOF # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that + # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; @@ -1369,6 +1392,9 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 <> confdefs.h <&6 -echo "configure:681: checking host system type" >&5 +echo "configure:682: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -726,10 +727,10 @@ fi echo $ac_n "checking for PATH separator""... $ac_c" 1>&6 -echo "configure:730: checking for PATH separator" >&5 +echo "configure:731: checking for PATH separator" >&5 case $cf_cv_system_name in - os2*) PATH_SEPARATOR=';' ;; - *) ${PATH_SEPARATOR:=':'} ;; + (os2*) PATH_SEPARATOR=';' ;; + (*) ${PATH_SEPARATOR:=':'} ;; esac @@ -746,32 +747,32 @@ fi if true ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac fi @@ -812,7 +813,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:816: checking for $ac_word" >&5 +echo "configure:817: 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 @@ -855,7 +856,7 @@ fi esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru sv tr zh_TW" +ALL_LINGUAS="da de en_GB et fr ru sv tr zh_CN zh_TW" ### Checks for programs save_CFLAGS="$CFLAGS" @@ -865,9 +866,9 @@ save_CFLAGS="$CFLAGS" : ${CC:=cc} echo $ac_n "checking \$CC variable""... $ac_c" 1>&6 -echo "configure:869: checking \$CC variable" >&5 -case "$CC" in #(vi -*[\ \ ]-[IUD]*) +echo "configure:870: checking \$CC variable" >&5 +case "$CC" in +(*[\ \ ]-[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... @@ -882,14 +883,14 @@ 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 +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -903,11 +904,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -920,17 +921,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -956,14 +957,14 @@ fi ;; -*) +(*) 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 +echo "configure:968: 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 @@ -995,14 +996,14 @@ 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 +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -1016,11 +1017,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -1033,17 +1034,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -1069,7 +1070,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ansi_cc="$cf_arg"; break else @@ -1112,14 +1113,14 @@ 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 +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -1133,11 +1134,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -1150,17 +1151,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -1197,7 +1198,7 @@ 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 +echo "configure:1202: 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 @@ -1227,7 +1228,7 @@ 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 +echo "configure:1232: 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 @@ -1278,7 +1279,7 @@ fi # 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 +echo "configure:1283: 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 @@ -1310,7 +1311,7 @@ fi 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 +echo "configure:1315: 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. @@ -1321,12 +1322,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1325 "configure" +#line 1326 "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 +if { (eval echo configure:1331: \"$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 @@ -1352,12 +1353,12 @@ 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 "configure:1357: 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 +echo "configure:1362: 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 @@ -1366,7 +1367,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1371: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1385,7 +1386,7 @@ 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 +echo "configure:1390: 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 @@ -1421,7 +1422,7 @@ 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 +echo "configure:1426: 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 @@ -1442,9 +1443,9 @@ fi : ${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 "configure:1447: checking \$CC variable" >&5 +case "$CC" in +(*[\ \ ]-[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... @@ -1459,14 +1460,14 @@ 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 +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -1480,11 +1481,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -1497,17 +1498,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -1533,14 +1534,14 @@ fi ;; -*) +(*) echo "$ac_t""ok" 1>&6 ;; esac - + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1544: checking how to run the C preprocessor" >&5 +echo "configure:1545: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1555,13 +1556,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:1565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1566: \"$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 : @@ -1572,13 +1573,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:1582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1583: \"$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 : @@ -1589,13 +1590,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:1599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1600: \"$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 : @@ -1621,13 +1622,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:1625: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:1626: 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 @@ -1645,7 +1646,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -1667,7 +1668,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:1671: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1672: 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 @@ -1705,7 +1706,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:1709: checking for a BSD compatible install" >&5 +echo "configure:1710: 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 @@ -1782,14 +1783,14 @@ EOF do rm -f y.tab.ch echo $ac_n "checking for $cf_prog""... $ac_c" 1>&6 -echo "configure:1786: checking for $cf_prog" >&5 +echo "configure:1787: checking for $cf_prog" >&5 cf_command="$cf_prog conftest.y" cf_result=no - if { (eval echo configure:1789: \"$cf_command\") 1>&5; (eval $cf_command) 2>&5; } && test -s y.tab.c ; then + if { (eval echo configure:1790: \"$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:1793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then + if { (eval echo configure:1794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest ; then cf_result=yes fi else @@ -1813,7 +1814,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:1817: checking for $ac_word" >&5 +echo "configure:1818: 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 @@ -1850,21 +1851,21 @@ cf_XOPEN_SOURCE=500 cf_POSIX_C_SOURCE=199506L cf_xopen_source= -case $host_os in #(vi -aix[4-7]*) #(vi +case $host_os in +(aix[4-7]*) cf_xopen_source="-D_ALL_SOURCE" ;; -cygwin|msys) #(vi +(cygwin|msys) cf_XOPEN_SOURCE=600 ;; -darwin[0-8].*) #(vi +(darwin[0-8].*) cf_xopen_source="-D_APPLE_C_SOURCE" ;; -darwin*) #(vi +(darwin*) cf_xopen_source="-D_DARWIN_C_SOURCE" cf_XOPEN_SOURCE= ;; -freebsd*|dragonfly*) #(vi +(freebsd*|dragonfly*) # 5.x headers associate # _XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L # _XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L @@ -1872,26 +1873,26 @@ freebsd*|dragonfly*) #(vi cf_XOPEN_SOURCE=600 cf_xopen_source="-D_BSD_TYPES -D__BSD_VISIBLE -D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" ;; -hpux11*) #(vi +(hpux11*) cf_xopen_source="-D_HPUX_SOURCE -D_XOPEN_SOURCE=500" ;; -hpux*) #(vi +(hpux*) cf_xopen_source="-D_HPUX_SOURCE" ;; -irix[56].*) #(vi +(irix[56].*) cf_xopen_source="-D_SGI_SOURCE" cf_XOPEN_SOURCE= ;; -linux*|gnu*|mint*|k*bsd*-gnu) #(vi +(linux*|gnu*|mint*|k*bsd*-gnu) echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6 -echo "configure:1889: checking if we must define _GNU_SOURCE" >&5 +echo "configure:1890: 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() { @@ -1901,7 +1902,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1911,7 +1912,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" cat > conftest.$ac_ext < int main() { @@ -1921,7 +1922,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1926: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_gnu_source=no else @@ -1942,7 +1943,10 @@ echo "$ac_t""$cf_cv_gnu_source" 1>&6 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ;; -mirbsd*) #(vi +(minix*) + cf_xopen_source="-D_NETBSD_SOURCE" # POSIX.1-2001 features are ifdef'd with this... + ;; +(mirbsd*) # setting _XOPEN_SOURCE or _POSIX_SOURCE breaks and other headers which use u_int / u_short types cf_XOPEN_SOURCE= @@ -1963,16 +1967,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:1967: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:1971: 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 +echo "${as_me:-configure}:1977: testing if the symbol is already defined go no further ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -1982,7 +1986,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:1986: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_posix_c_source=no else @@ -1990,21 +1994,21 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[12]??*) #(vi + case .$cf_POSIX_C_SOURCE in + (.[12]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) #(vi + (.2) 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() { @@ -2014,7 +2018,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2025,15 +2029,15 @@ fi rm -f conftest* fi -echo "${as_me:-configure}:2029: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:2033: 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 +echo "${as_me:-configure}:2038: testing if the second compile does not leave our definition intact error ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -2043,7 +2047,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2074,14 +2078,14 @@ 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 +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2095,11 +2099,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -2112,17 +2116,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2151,39 +2155,44 @@ fi ;; -netbsd*) #(vi +(netbsd*) 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 +(openbsd[4-9]*) # 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 +(openbsd*) # setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw ;; -osf[45]*) #(vi +(osf[45]*) cf_xopen_source="-D_OSF_SOURCE" ;; -nto-qnx*) #(vi +(nto-qnx*) cf_xopen_source="-D_QNX_SOURCE" ;; -sco*) #(vi +(sco*) # setting _XOPEN_SOURCE breaks Lynx on SCO Unix / OpenServer ;; -solaris2.*) #(vi +(solaris2.*) cf_xopen_source="-D__EXTENSIONS__" + cf_cv_xopen_source=broken ;; -*) +(sysv4.2uw2.*) # Novell/SCO UnixWare 2.x (tested on 2.1.2) + cf_XOPEN_SOURCE= + cf_POSIX_C_SOURCE= + ;; +(*) 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 +echo "configure:2190: 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 < @@ -2197,7 +2206,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -2207,7 +2216,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat > conftest.$ac_ext < @@ -2221,7 +2230,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -2261,14 +2270,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_xopen_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2282,11 +2291,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -2299,17 +2308,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2354,16 +2363,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:2358: checking if we should define _POSIX_C_SOURCE" >&5 +echo "configure:2367: 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}:2364: testing if the symbol is already defined go no further ..." 1>&5 +echo "${as_me:-configure}:2373: testing if the symbol is already defined go no further ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -2373,7 +2382,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_posix_c_source=no else @@ -2381,21 +2390,21 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cf_want_posix_source=no - case .$cf_POSIX_C_SOURCE in #(vi - .[12]??*) #(vi + case .$cf_POSIX_C_SOURCE in + (.[12]??*) cf_cv_posix_c_source="-D_POSIX_C_SOURCE=$cf_POSIX_C_SOURCE" ;; - .2) #(vi + (.2) 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() { @@ -2405,7 +2414,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2416,15 +2425,15 @@ fi rm -f conftest* fi -echo "${as_me:-configure}:2420: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5 +echo "${as_me:-configure}:2429: 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}:2425: testing if the second compile does not leave our definition intact error ..." 1>&5 +echo "${as_me:-configure}:2434: testing if the second compile does not leave our definition intact error ..." 1>&5 cat > conftest.$ac_ext < int main() { @@ -2434,7 +2443,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2465,14 +2474,14 @@ 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 +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2486,11 +2495,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -2503,17 +2512,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2554,14 +2563,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_xopen_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2575,11 +2584,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -2592,17 +2601,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2610,17 +2619,29 @@ esac done if test -n "$cf_new_cflags" ; then - + test -n "$verbose" && echo " add to \$CFLAGS $cf_new_cflags" 1>&6 + +echo "${as_me:-configure}:2625: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 + + CFLAGS="$CFLAGS $cf_new_cflags" fi if test -n "$cf_new_cppflags" ; then - + test -n "$verbose" && echo " add to \$CPPFLAGS $cf_new_cppflags" 1>&6 + +echo "${as_me:-configure}:2634: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 + + CPPFLAGS="$CPPFLAGS $cf_new_cppflags" 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}:2643: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 + + EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" fi @@ -2631,9 +2652,9 @@ fi 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 +echo "configure:2656: checking if _XOPEN_SOURCE really is set" >&5 cat > conftest.$ac_ext < int main() { @@ -2643,7 +2664,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_XOPEN_SOURCE_set=yes else @@ -2657,7 +2678,7 @@ rm -f conftest* if test $cf_XOPEN_SOURCE_set = yes then cat > conftest.$ac_ext < int main() { @@ -2667,7 +2688,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2692: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_XOPEN_SOURCE_set_ok=yes else @@ -2684,13 +2705,13 @@ rm -f conftest* 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 +echo "configure:2709: 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 < @@ -2704,7 +2725,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -2714,7 +2735,7 @@ else cf_save="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE" cat > conftest.$ac_ext < @@ -2728,7 +2749,7 @@ make an error #endif ; return 0; } EOF -if { (eval echo configure:2732: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_xopen_source=no else @@ -2768,14 +2789,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_temp_xopen_source do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2789,11 +2810,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -2806,17 +2827,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2848,13 +2869,13 @@ fi echo $ac_n "checking if SIGWINCH is defined""... $ac_c" 1>&6 -echo "configure:2852: checking if SIGWINCH is defined" >&5 +echo "configure:2873: 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 > conftest.$ac_ext < @@ -2864,7 +2885,7 @@ int main() { int x = SIGWINCH ; return 0; } EOF -if { (eval echo configure:2868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_define_sigwinch=yes else @@ -2872,7 +2893,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_define_sigwinch=maybe else @@ -2905,7 +2926,7 @@ echo "$ac_t""$cf_cv_define_sigwinch" 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 +echo "configure:2930: 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 @@ -2915,7 +2936,7 @@ cf_sigwinch=32 while test $cf_sigwinch != 1 do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_fixup_sigwinch=$cf_sigwinch break @@ -2955,12 +2976,12 @@ echo "$ac_t""$cf_cv_fixup_sigwinch" 1>&6 fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:2959: checking for Cygwin environment" >&5 +echo "configure:2980: 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:2996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -2988,19 +3009,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:2992: checking for mingw32 environment" >&5 +echo "configure:3013: 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:3025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -3019,20 +3040,20 @@ test "$ac_cv_mingw32" = yes && MINGW32=y case $cf_cv_system_name in -os2*) - CFLAGS="$CFLAGS -Zmt" - CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" - CXXFLAGS="$CXXFLAGS -Zmt" - # autoconf's macro sets -Zexe and suffix both, which conflict:w - LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" - ac_cv_exeext=.exe - ;; +(os2*) + CFLAGS="$CFLAGS -Zmt" + CPPFLAGS="$CPPFLAGS -D__ST_MT_ERRNO__" + CXXFLAGS="$CXXFLAGS -Zmt" + # autoconf's macro sets -Zexe and suffix both, which conflict:w + LDFLAGS="$LDFLAGS -Zmt -Zcrtdll" + ac_cv_exeext=.exe + ;; esac echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:3036: checking for executable suffix" >&5 +echo "configure:3057: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3042,7 +3063,7 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:3046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:3067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do if test -f $file ; then case $file in @@ -3066,13 +3087,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:3070: checking for object suffix" >&5 +echo "configure:3091: 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:3076: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3097: \"$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 @@ -3101,18 +3122,18 @@ EOF - case $cf_cv_system_name in #(vi - OS/2*|os2*) #(vi - LIB_PREFIX='' - ;; - *) LIB_PREFIX='lib' - ;; + case $cf_cv_system_name in + (OS/2*|os2*) + LIB_PREFIX='' + ;; + (*) LIB_PREFIX='lib' + ;; esac LIB_PREFIX=$LIB_PREFIX echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3116: checking whether ln -s works" >&5 +echo "configure:3137: 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 @@ -3157,7 +3178,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:3161: checking for $ac_word" >&5 +echo "configure:3182: 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 @@ -3189,11 +3210,11 @@ done fi echo $ac_n "checking for native build C compiler""... $ac_c" 1>&6 -echo "configure:3193: checking for native build C compiler" >&5 +echo "configure:3214: 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:3197: checking for native build C preprocessor" >&5 +echo "configure:3218: 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 @@ -3206,7 +3227,7 @@ fi echo "$ac_t""$BUILD_CPP" 1>&6 echo $ac_n "checking for native build C flags""... $ac_c" 1>&6 -echo "configure:3210: checking for native build C flags" >&5 +echo "configure:3231: 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 @@ -3217,7 +3238,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:3221: checking for native build C preprocessor-flags" >&5 +echo "configure:3242: 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 @@ -3228,7 +3249,7 @@ fi echo "$ac_t""$BUILD_CPPFLAGS" 1>&6 echo $ac_n "checking for native build linker-flags""... $ac_c" 1>&6 -echo "configure:3232: checking for native build linker-flags" >&5 +echo "configure:3253: 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 @@ -3239,7 +3260,7 @@ fi echo "$ac_t""$BUILD_LDFLAGS" 1>&6 echo $ac_n "checking for native build linker-libraries""... $ac_c" 1>&6 -echo "configure:3243: checking for native build linker-libraries" >&5 +echo "configure:3264: 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 @@ -3282,7 +3303,7 @@ fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:3286: checking build system type" >&5 +echo "configure:3307: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -3308,7 +3329,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:3312: checking for $ac_word" >&5 +echo "configure:3333: 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 @@ -3340,7 +3361,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:3344: checking for $ac_word" >&5 +echo "configure:3365: 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 @@ -3375,7 +3396,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:3379: checking for $ac_word" >&5 +echo "configure:3400: 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 @@ -3407,7 +3428,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:3411: checking for $ac_word" >&5 +echo "configure:3432: 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 @@ -3443,7 +3464,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:3447: checking for $ac_word" >&5 +echo "configure:3468: 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 @@ -3475,7 +3496,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:3479: checking for $ac_word" >&5 +echo "configure:3500: 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 @@ -3512,7 +3533,7 @@ fi echo $ac_n "checking for options to update archives""... $ac_c" 1>&6 -echo "configure:3516: checking for options to update archives" >&5 +echo "configure:3537: 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 @@ -3534,10 +3555,10 @@ else rm -f conftest.a cat >conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; } ; then + if { (eval echo configure:3562: \"$ac_compile\") 1>&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 @@ -3547,7 +3568,7 @@ EOF else test -n "$verbose" && echo " cannot compile test-program" 1>&6 -echo "${as_me:-configure}:3551: testing cannot compile test-program ..." 1>&5 +echo "${as_me:-configure}:3572: testing cannot compile test-program ..." 1>&5 break @@ -3590,21 +3611,21 @@ 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 +echo "configure:3615: 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 + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + cf_use_heapsort=no + else + cf_use_heapsort=yes + fi else - enableval=no - cf_use_heapsort=no - + enableval=yes + cf_use_heapsort=yes + fi echo "$ac_t""$cf_use_heapsort" 1>&6 @@ -3612,12 +3633,12 @@ 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 +echo "configure:3637: 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:3665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -3666,9 +3687,9 @@ 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 +echo "configure:3691: checking if its prototype is compatible with qsort" >&5 cat > conftest.$ac_ext < @@ -3682,7 +3703,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3686: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3695,7 +3716,7 @@ rm -f conftest*; 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 +echo "${as_me:-configure}:3720: testing will use our own heapsort function ..." 1>&5 EXTRAO_DEP='' @@ -3722,7 +3743,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:3726: checking for ispell" >&5 +echo "configure:3747: checking for ispell" >&5 ac_cv_path_PATH_ISPELL="$withval" cat >> confdefs.h <&6 -echo "configure:3743: checking for $ac_word" >&5 +echo "configure:3764: 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 @@ -3796,7 +3817,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:3800: checking for metamail" >&5 +echo "configure:3821: checking for metamail" >&5 ac_cv_path_PATH_METAMAIL="$withval" cat >> confdefs.h <&6 -echo "configure:3817: checking for $ac_word" >&5 +echo "configure:3838: 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 @@ -3870,7 +3891,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:3874: checking for sum" >&5 +echo "configure:3895: checking for sum" >&5 ac_cv_path_PATH_SUM="$withval" cat >> confdefs.h <&6 -echo "configure:3891: checking for $ac_word" >&5 +echo "configure:3912: 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 @@ -3934,12 +3955,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:3938: checking if $ac_cv_path_PATH_SUM takes -r" >&5 +echo "configure:3959: 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:3943: \"$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:3964: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then ac_cv_prog_sum_r=yes else @@ -3969,7 +3990,7 @@ fi echo $ac_n "checking for default editor""... $ac_c" 1>&6 -echo "configure:3973: checking for default editor" >&5 +echo "configure:3994: checking for default editor" >&5 # Check whether --with-editor or --without-editor was given. if test "${with_editor+set}" = set; then @@ -3997,7 +4018,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:4001: checking for $ac_word" >&5 +echo "configure:4022: 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 @@ -4042,7 +4063,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:4046: checking for $ac_word" >&5 +echo "configure:4067: 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 @@ -4096,7 +4117,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:4100: checking for $ac_word" >&5 +echo "configure:4121: 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 @@ -4133,7 +4154,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:4137: checking for $ac_word" >&5 +echo "configure:4158: 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 @@ -4167,7 +4188,7 @@ fi fi echo $ac_n "checking for default mailer""... $ac_c" 1>&6 -echo "configure:4171: checking for default mailer" >&5 +echo "configure:4192: checking for default mailer" >&5 if test -n "$DEFAULT_MAILER" ; then case $cf_cv_system_name in #(vi @@ -4194,7 +4215,7 @@ echo "$ac_t""$DEFAULT_MAILER" 1>&6 echo $ac_n "checking for incoming-mail directory""... $ac_c" 1>&6 -echo "configure:4198: checking for incoming-mail directory" >&5 +echo "configure:4219: checking for incoming-mail directory" >&5 # Check whether --with-mailbox or --without-mailbox was given. if test "${with_mailbox+set}" = set; then @@ -4240,21 +4261,21 @@ 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:4244: checking if you want PGP/GPG-Support" >&5 +echo "configure:4265: 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 enableval="$enable_pgp_gpg" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then USE_PGP_GPG=no - else - USE_PGP_GPG=yes - fi + else + USE_PGP_GPG=yes + fi else enableval=yes - USE_PGP_GPG=yes - + USE_PGP_GPG=yes + fi echo "$ac_t""$enableval" 1>&6 @@ -4272,7 +4293,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:4276: checking for pgp" >&5 +echo "configure:4297: checking for pgp" >&5 ac_cv_path_PATH_PGP="$withval" cat >> confdefs.h <&6 -echo "configure:4293: checking for $ac_word" >&5 +echo "configure:4314: 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 @@ -4347,7 +4368,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:4351: checking for pgpk" >&5 +echo "configure:4372: checking for pgpk" >&5 ac_cv_path_PATH_PGPK="$withval" cat >> confdefs.h <&6 -echo "configure:4368: checking for $ac_word" >&5 +echo "configure:4389: 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 @@ -4422,7 +4443,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:4426: checking for gpg" >&5 +echo "configure:4447: checking for gpg" >&5 ac_cv_path_PATH_GPG="$withval" cat >> confdefs.h <&6 -echo "configure:4443: checking for $ac_word" >&5 +echo "configure:4464: 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 @@ -4498,7 +4519,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:4502: checking for slrnface" >&5 +echo "configure:4523: checking for slrnface" >&5 ac_cv_path_PATH_SLRNFACE="$withval" cat >> confdefs.h <&6 -echo "configure:4519: checking for $ac_word" >&5 +echo "configure:4540: 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 @@ -4575,13 +4596,13 @@ fi echo $ac_n "checking for the default shell program""... $ac_c" 1>&6 -echo "configure:4579: checking for the default shell program" >&5 +echo "configure:4600: 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 < @@ -4594,7 +4615,7 @@ make an error ; return 0; } EOF -if { (eval echo configure:4598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* $cf_shell_progs="csh tcsh $cf_shell_progs" else @@ -4604,11 +4625,11 @@ fi rm -f conftest* fi -echo "${as_me:-configure}:4608: testing paths of shell programs: $cf_shell_progs ..." 1>&5 +echo "${as_me:-configure}:4629: 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}:4612: testing /etc/shells ..." 1>&5 +echo "${as_me:-configure}:4633: testing /etc/shells ..." 1>&5 for cf_prog in $cf_shell_progs do @@ -4643,14 +4664,14 @@ echo "${as_me:-configure}:4612: testing echo "$ac_t""$DEFAULT_SHELL" 1>&6 else -echo "${as_me:-configure}:4647: testing $PATH ..." 1>&5 +echo "${as_me:-configure}:4668: 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:4654: checking for $ac_word" >&5 +echo "configure:4675: 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 @@ -4703,21 +4724,21 @@ 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:4707: checking if NNTP-support will be used" >&5 +echo "configure:4728: checking if NNTP-support will be used" >&5 # Check whether --enable-nntp or --disable-nntp was given. if test "${enable_nntp+set}" = set; then enableval="$enable_nntp" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then USE_NNTP=no - else - USE_NNTP=yes - fi + else + USE_NNTP=yes + fi else enableval=yes - USE_NNTP=yes - + USE_NNTP=yes + fi echo "$ac_t""$enableval" 1>&6 @@ -4725,31 +4746,31 @@ 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:4729: checking whether to be NNTP_ONLY" >&5 +echo "configure:4750: 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 enableval="$enable_nntp_only" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define NNTP_ONLY 1 EOF USE_SPOOLDIR=no - else - cat >> confdefs.h <<\EOF + else + cat >> confdefs.h <<\EOF #define NNTP_ABLE 1 EOF - fi + fi else enableval=no - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NNTP_ABLE 1 EOF - + fi echo "$ac_t""$enableval" 1>&6 @@ -4757,25 +4778,25 @@ 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:4761: checking if you want to compile-in debug support" >&5 +echo "configure:4782: 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 enableval="$enable_debug" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then ENABLE_DEBUG='' CFLAGS="-g $CFLAGS" LDFLAGS="-g $LDFLAGS" - else - ENABLE_DEBUG='#' + else + ENABLE_DEBUG='#' test -z "$save_CFLAGS" && CFLAGS=`echo $CFLAGS|sed -e 's/-g //' -e 's/-g$//'` - fi + fi else enableval=no - ENABLE_DEBUG='#' + ENABLE_DEBUG='#' test -z "$save_CFLAGS" && CFLAGS=`echo $CFLAGS|sed -e 's/-g //' -e 's/-g$//'` - + fi echo "$ac_t""$enableval" 1>&6 @@ -4784,39 +4805,39 @@ 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:4788: checking if you want to see long compiling messages" >&5 +echo "configure:4809: 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 enableval="$enable_echo" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then - ECHO_LT='--silent' - ECHO_LD='@echo linking $@;' - RULE_CC='@echo compiling $<' - SHOW_CC='@echo compiling $@' - ECHO_CC='@' + ECHO_LT='--silent' + ECHO_LD='@echo linking $@;' + RULE_CC='@echo compiling $<' + SHOW_CC='@echo compiling $@' + ECHO_CC='@' - else - - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + else + + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' - fi + fi else enableval=yes - - ECHO_LT='' - ECHO_LD='' - RULE_CC='' - SHOW_CC='' - ECHO_CC='' + + ECHO_LT='' + ECHO_LD='' + RULE_CC='' + SHOW_CC='' + ECHO_CC='' + - fi echo "$ac_t""$enableval" 1>&6 @@ -4829,21 +4850,21 @@ 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:4833: checking if you want to compile with fallback prototypes" >&5 +echo "configure:4854: 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 enableval="$enable_prototypes" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then with_decl_check=yes - else - with_decl_check=no - fi + else + with_decl_check=no + fi else enableval=no - with_decl_check=no - + with_decl_check=no + fi echo "$ac_t""$enableval" 1>&6 @@ -4853,21 +4874,21 @@ 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:4857: checking if you want to turn on gcc warnings" >&5 +echo "configure:4878: 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 enableval="$enable_warnings" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then with_warnings=yes - else - with_warnings=no - fi + else + with_warnings=no + fi else enableval=no - with_warnings=no - + with_warnings=no + fi echo "$ac_t""$with_warnings" 1>&6 @@ -4882,13 +4903,13 @@ INTEL_COMPILER=no if test "$GCC" = yes ; then case $host_os in - linux*|gnu*) + (linux*|gnu*) echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6 -echo "configure:4888: checking if this is really Intel C compiler" >&5 +echo "configure:4909: 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:4925: \"$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" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "configure: failed program was:" >&5 @@ -4921,11 +4942,11 @@ 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 +echo "configure:4946: 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 +if { (eval echo configure:4962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CLANG_COMPILER=yes cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments" @@ -4953,7 +4974,7 @@ fi cat > conftest.$ac_ext <&6 -echo "configure:4975: checking for $CC warning options" >&5 +echo "configure:4996: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS="-Wall" for cf_opt in \ @@ -4986,7 +5007,7 @@ echo "configure:4975: checking for $CC w wd981 do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:4990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5011: \"$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 @@ -4996,7 +5017,7 @@ echo "configure:4975: checking for $CC w elif test "$GCC" = yes then echo "checking for $CC warning options" 1>&6 -echo "configure:5000: checking for $CC warning options" >&5 +echo "configure:5021: checking for $CC warning options" >&5 cf_save_CFLAGS="$CFLAGS" EXTRA_CFLAGS= cf_warn_CONST="" @@ -5019,29 +5040,29 @@ echo "configure:5000: checking for $CC w Wundef $cf_gcc_warnings $cf_warn_CONST do CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt" - if { (eval echo configure:5023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:5044: \"$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 + case $cf_opt in + (Wcast-qual) CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES" ;; - Winline) #(vi + (Winline) case $GCC_VERSION in - [34].*) + ([34].*) test -n "$verbose" && echo " feature is broken in gcc $GCC_VERSION" 1>&6 -echo "${as_me:-configure}:5034: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 +echo "${as_me:-configure}:5055: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; esac ;; - Wpointer-arith) #(vi + (Wpointer-arith) case $GCC_VERSION in - [12].*) + ([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 +echo "${as_me:-configure}:5066: testing feature is broken in gcc $GCC_VERSION ..." 1>&5 continue;; @@ -5064,7 +5085,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:5068: checking for news-library path" >&5 +echo "configure:5089: checking for news-library path" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then @@ -5076,32 +5097,32 @@ fi if true ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac fi @@ -5110,7 +5131,7 @@ eval NEWSLIBDIR="$withval" echo "$ac_t""$NEWSLIBDIR" 1>&6 echo $ac_n "checking for news spool-directory path""... $ac_c" 1>&6 -echo "configure:5114: checking for news spool-directory path" >&5 +echo "configure:5135: checking for news spool-directory path" >&5 # Check whether --with-spooldir or --without-spooldir was given. if test "${with_spooldir+set}" = set; then @@ -5122,32 +5143,32 @@ fi if true ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac fi @@ -5156,7 +5177,7 @@ eval SPOOLDIR="$withval" echo "$ac_t""$SPOOLDIR" 1>&6 echo $ac_n "checking for news overview-directory path""... $ac_c" 1>&6 -echo "configure:5160: checking for news overview-directory path" >&5 +echo "configure:5181: 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 @@ -5168,32 +5189,32 @@ fi if true ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac fi @@ -5202,7 +5223,7 @@ eval NOVROOTDIR="$withval" echo "$ac_t""$NOVROOTDIR" 1>&6 echo $ac_n "checking for overview filename""... $ac_c" 1>&6 -echo "configure:5206: checking for overview filename" >&5 +echo "configure:5227: checking for overview filename" >&5 # Check whether --with-nov-fname or --without-nov-fname was given. if test "${with_nov_fname+set}" = set; then @@ -5238,7 +5259,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:5242: checking for directory containing \"inews\"" >&5 +echo "configure:5263: 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 @@ -5250,32 +5271,32 @@ fi if true ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac fi @@ -5287,7 +5308,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:5291: checking for $ac_word" >&5 +echo "configure:5312: 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 @@ -5343,7 +5364,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:5347: checking if you want socks library" >&5 +echo "configure:5368: 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 @@ -5363,7 +5384,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:5367: checking if you want socks5 library" >&5 +echo "configure:5388: 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 @@ -5385,13 +5406,13 @@ echo "$ac_t""$cf_cv_use_libsocks5" 1>&6 if test "x$cf_cv_use_libsocks" != xno ; then - case "$cf_cv_use_libsocks" in #(vi - no) #(vi - ;; - yes) #(vi - ;; - *) - +case "$cf_cv_use_libsocks" in +(no) + ;; +(yes) + ;; +(*) + for cf_searchpath in `echo "$cf_cv_use_libsocks" | tr $PATH_SEPARATOR ' '`; do if test -d $cf_searchpath/include; then @@ -5420,14 +5441,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:5431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5444,7 +5465,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}:5448: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5469: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5455,6 +5476,8 @@ echo "${as_me:-configure}:5448: testing else break fi + else + break fi done done @@ -5486,14 +5509,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:5497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -5510,7 +5533,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}:5514: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:5537: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -5521,6 +5544,8 @@ echo "${as_me:-configure}:5514: testing else break fi + else + break fi done done @@ -5532,61 +5557,61 @@ fi if test -d $cf_searchpath/lib; then if test -n "$cf_searchpath/lib" ; then - for cf_add_libdir in $cf_searchpath/lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_searchpath/lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5554: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5579: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi elif test -d $cf_searchpath ; then if test -n "$cf_searchpath" ; then - for cf_add_libdir in $cf_searchpath - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_searchpath + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:5584: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:5609: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi else @@ -5594,8 +5619,8 @@ fi fi done - ;; - esac + ;; +esac @@ -5605,13 +5630,13 @@ cf_cv_header_path_socks= cf_cv_library_path_socks= -echo "${as_me:-configure}:5609: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 +echo "${as_me:-configure}:5634: testing Starting FIND_LINKAGE(socks,) ..." 1>&5 cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -5622,7 +5647,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_socks=yes @@ -5638,7 +5663,7 @@ else LIBS="-lsocks $cf_save_LIBS" cat > conftest.$ac_ext < @@ -5649,7 +5674,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_socks=yes @@ -5665,19 +5690,19 @@ else cf_cv_find_linkage_socks=no LIBS="$cf_save_LIBS" - test -n "$verbose" && echo " find linkage for socks library" 1>&6 + test -n "$verbose" && echo " find linkage for socks library" 1>&6 -echo "${as_me:-configure}:5671: testing find linkage for socks library ..." 1>&5 +echo "${as_me:-configure}:5696: testing find linkage for socks library ..." 1>&5 - -echo "${as_me:-configure}:5675: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 + +echo "${as_me:-configure}:5700: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5 - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" - + cf_search= # collect the current set of include-directories from compiler flags @@ -5685,8 +5710,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -5711,18 +5736,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/include/socks/include && cf_search="$cf_search /usr/include/socks/include" - test -d /usr/socks/include && cf_search="$cf_search /usr/socks/include" - test -d /usr/socks/include/socks && cf_search="$cf_search /usr/socks/include/socks" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -5735,41 +5748,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/include/socks/include && cf_search="$cf_search /usr/local/include/socks/include" - test -d /usr/local/socks/include && cf_search="$cf_search /usr/local/socks/include" - test -d /usr/local/socks/include/socks && cf_search="$cf_search /usr/local/socks/include/socks" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/include/socks/include && cf_search="$cf_search /opt/include/socks/include" - test -d /opt/socks/include && cf_search="$cf_search /opt/socks/include" - test -d /opt/socks/include/socks && cf_search="$cf_search /opt/socks/include/socks" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/include/socks/include && cf_search="$cf_search $HOME/include/socks/include" - test -d $HOME/socks/include && cf_search="$cf_search $HOME/socks/include" - test -d $HOME/socks/include/socks && cf_search="$cf_search $HOME/socks/include/socks" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/socks && cf_search="$cf_search $cf_subdir_prefix/include/socks" + test -d $cf_subdir_prefix/include/socks/include && cf_search="$cf_search $cf_subdir_prefix/include/socks/include" + test -d $cf_subdir_prefix/socks/include && cf_search="$cf_search $cf_subdir_prefix/socks/include" + test -d $cf_subdir_prefix/socks/include/socks && cf_search="$cf_search $cf_subdir_prefix/socks/include/socks" } +done test "$includedir" != NONE && \ @@ -5788,17 +5787,17 @@ test -d "$oldincludedir" && { cf_search="$cf_search $cf_header_path_list" - for cf_cv_header_path_socks in $cf_search - do - if test -d $cf_cv_header_path_socks ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_socks" 1>&6 + for cf_cv_header_path_socks in $cf_search + do + 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}:5797: testing ... testing $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:5796: testing ... testing $cf_cv_header_path_socks ..." 1>&5 - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks" - cat > conftest.$ac_ext < conftest.$ac_ext < @@ -5809,49 +5808,49 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5812: \"$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 + test -n "$verbose" && echo " ... found socks headers in $cf_cv_header_path_socks" 1>&6 -echo "${as_me:-configure}:5818: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 +echo "${as_me:-configure}:5817: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5 - cf_cv_find_linkage_socks=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + cf_cv_find_linkage_socks=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" - + CPPFLAGS="$cf_save_CPPFLAGS" + fi rm -f conftest* - fi - done + fi + done - if test "$cf_cv_find_linkage_socks" = maybe ; then + if test "$cf_cv_find_linkage_socks" = maybe ; then - -echo "${as_me:-configure}:5839: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 + +echo "${as_me:-configure}:5838: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5 - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - + - if test "$cf_cv_find_linkage_socks" != yes ; then - + if test "$cf_cv_find_linkage_socks" != yes ; then + cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -5875,18 +5874,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/lib/socks/lib && cf_search="$cf_search /usr/lib/socks/lib" - test -d /usr/socks/lib && cf_search="$cf_search /usr/socks/lib" - test -d /usr/socks/lib/socks && cf_search="$cf_search /usr/socks/lib/socks" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -5899,58 +5886,44 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/lib/socks/lib && cf_search="$cf_search /usr/local/lib/socks/lib" - test -d /usr/local/socks/lib && cf_search="$cf_search /usr/local/socks/lib" - test -d /usr/local/socks/lib/socks && cf_search="$cf_search /usr/local/socks/lib/socks" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/lib/socks/lib && cf_search="$cf_search /opt/lib/socks/lib" - test -d /opt/socks/lib && cf_search="$cf_search /opt/socks/lib" - test -d /opt/socks/lib/socks && cf_search="$cf_search /opt/socks/lib/socks" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/lib/socks/lib && cf_search="$cf_search $HOME/lib/socks/lib" - test -d $HOME/socks/lib && cf_search="$cf_search $HOME/socks/lib" - test -d $HOME/socks/lib/socks && cf_search="$cf_search $HOME/socks/lib/socks" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/socks && cf_search="$cf_search $cf_subdir_prefix/lib/socks" + test -d $cf_subdir_prefix/lib/socks/lib && cf_search="$cf_search $cf_subdir_prefix/lib/socks/lib" + test -d $cf_subdir_prefix/socks/lib && cf_search="$cf_search $cf_subdir_prefix/socks/lib" + test -d $cf_subdir_prefix/socks/lib/socks && cf_search="$cf_search $cf_subdir_prefix/socks/lib/socks" } +done cf_search="$cf_library_path_list $cf_search" - for cf_cv_library_path_socks in $cf_search - do - 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}:5947: testing ... testing $cf_cv_library_path_socks ..." 1>&5 + for cf_cv_library_path_socks in $cf_search + do + 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}:5920: 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 < conftest.$ac_ext < @@ -5961,38 +5934,38 @@ int main() { ; return 0; } EOF -if { (eval echo configure:5965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5938: \"$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 + test -n "$verbose" && echo " ... found socks library in $cf_cv_library_path_socks" 1>&6 -echo "${as_me:-configure}:5970: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 +echo "${as_me:-configure}:5943: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5 - cf_cv_find_linkage_socks=yes - cf_cv_library_file_socks="-lsocks" - break + cf_cv_find_linkage_socks=yes + cf_cv_library_file_socks="-lsocks" + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" + fi rm -rf conftest* - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi - else - cf_cv_find_linkage_socks=no - fi - + else + cf_cv_find_linkage_socks=no + fi + fi rm -rf conftest* @@ -6028,14 +6001,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:6039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -6052,7 +6025,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}:6056: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:6029: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -6063,6 +6036,8 @@ echo "${as_me:-configure}:6056: testing else break fi + else + break fi done done @@ -6070,34 +6045,50 @@ fi if test -n "$cf_cv_library_path_socks" ; then - for cf_add_libdir in $cf_cv_library_path_socks - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_cv_library_path_socks + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:6092: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:6067: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi - LIBS="-lsocks $LIBS" + +cf_add_libs="-lsocks" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else echo "configure: warning: Cannot find socks library" 1>&2 @@ -6151,7 +6142,7 @@ else cf_test_netlibs=no echo $ac_n "checking for network libraries""... $ac_c" 1>&6 -echo "configure:6155: checking for network libraries" >&5 +echo "configure:6146: checking for network libraries" >&5 if eval "test \"`echo '$''{'cf_cv_netlibs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6162,23 +6153,23 @@ echo "$ac_t""working..." 1>&6 cf_cv_netlibs="" cf_test_netlibs=yes -case $host_os in #(vi -mingw*) # (vi +case $host_os in +(mingw*) 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:6172: checking for $ac_hdr" >&5 +echo "configure:6163: 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:6182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6173: \"$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* @@ -6212,10 +6203,26 @@ done fi cf_save_LIBS="$LIBS" - LIBS="$cf_winsock_lib $LIBS" + +cf_add_libs="$cf_winsock_lib" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6248: \"$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 @@ -6250,16 +6257,16 @@ rm -rf conftest* LIBS="$cf_save_LIBS" ;; -*) +(*) for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6258: checking for $ac_func" >&5 +echo "configure:6265: 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:6293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6305,7 +6312,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -echo "configure:6309: checking for gethostname in -lnsl" >&5 +echo "configure:6316: 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 @@ -6313,7 +6320,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:6335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6357,7 +6364,7 @@ else echo $ac_n "checking for gethostname in -lsocket""... $ac_c" 1>&6 -echo "configure:6361: checking for gethostname in -lsocket" >&5 +echo "configure:6368: 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 @@ -6365,7 +6372,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:6387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6418,7 +6425,7 @@ done echo $ac_n "checking for main in -linet""... $ac_c" 1>&6 -echo "configure:6422: checking for main in -linet" >&5 +echo "configure:6429: 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 @@ -6426,14 +6433,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:6444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6458,12 +6465,12 @@ fi for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6462: checking for $ac_func" >&5 +echo "configure:6469: 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:6497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6509,7 +6516,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:6513: checking for socket in -lsocket" >&5 +echo "configure:6520: 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 @@ -6517,7 +6524,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:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6561,7 +6568,7 @@ else echo $ac_n "checking for socket in -lbsd""... $ac_c" 1>&6 -echo "configure:6565: checking for socket in -lbsd" >&5 +echo "configure:6572: 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 @@ -6569,7 +6576,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:6591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6625,12 +6632,12 @@ done for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6629: checking for $ac_func" >&5 +echo "configure:6636: 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:6664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6676,7 +6683,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:6680: checking for gethostbyname in -lnsl" >&5 +echo "configure:6687: 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 @@ -6684,7 +6691,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:6706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6736,12 +6743,12 @@ 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 +echo "configure:6747: 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:6775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6787,7 +6794,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for inet_ntoa in -lnsl""... $ac_c" 1>&6 -echo "configure:6791: checking for inet_ntoa in -lnsl" >&5 +echo "configure:6798: 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 @@ -6795,7 +6802,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:6817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6847,12 +6854,12 @@ done for ac_func in gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6851: checking for $ac_func" >&5 +echo "configure:6858: 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:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -6898,7 +6905,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for gethostbyname in -lnetwork""... $ac_c" 1>&6 -echo "configure:6902: checking for gethostbyname in -lnetwork" >&5 +echo "configure:6909: 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 @@ -6906,7 +6913,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:6928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6958,12 +6965,12 @@ done for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6962: checking for $ac_func" >&5 +echo "configure:6969: 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:6997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -7009,7 +7016,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6 -echo "configure:7013: checking for strcasecmp in -lresolv" >&5 +echo "configure:7020: 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 @@ -7017,7 +7024,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:7039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7071,8 +7078,8 @@ esac fi -case $cf_cv_netlibs in #(vi -*ws2_32*) +case $cf_cv_netlibs in +(*ws2_32*) cat >> confdefs.h <<\EOF #define USE_WINSOCK2_H 1 EOF @@ -7080,19 +7087,35 @@ EOF ;; esac -LIBS="$cf_cv_netlibs $LIBS" + +cf_add_libs="$cf_cv_netlibs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6 if test "x$cf_cv_use_libsocks5" != xno ; then - case "$cf_cv_use_libsocks5" in #(vi - no) #(vi - ;; - yes) #(vi - ;; - *) - +case "$cf_cv_use_libsocks5" in +(no) + ;; +(yes) + ;; +(*) + for cf_searchpath in `echo "$cf_cv_use_libsocks5" | tr $PATH_SEPARATOR ' '`; do if test -d $cf_searchpath/include; then @@ -7121,14 +7144,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:7132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7145,7 +7168,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}:7149: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7172: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7156,6 +7179,8 @@ echo "${as_me:-configure}:7149: testing else break fi + else + break fi done done @@ -7187,14 +7212,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:7198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7211,7 +7236,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}:7215: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7240: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7222,6 +7247,8 @@ echo "${as_me:-configure}:7215: testing else break fi + else + break fi done done @@ -7233,61 +7260,61 @@ fi if test -d $cf_searchpath/lib; then if test -n "$cf_searchpath/lib" ; then - for cf_add_libdir in $cf_searchpath/lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_searchpath/lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7255: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7282: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi elif test -d $cf_searchpath ; then if test -n "$cf_searchpath" ; then - for cf_add_libdir in $cf_searchpath - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_searchpath + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7285: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:7312: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi else @@ -7295,11 +7322,27 @@ fi fi done - ;; - esac + ;; +esac + -LIBS="-lsocks5 $LIBS" +cf_add_libs="-lsocks5" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat >> confdefs.h <<\EOF #define USE_SOCKS5 1 @@ -7311,10 +7354,10 @@ EOF echo $ac_n "checking if the socks library uses socks4 prefix""... $ac_c" 1>&6 -echo "configure:7315: checking if the socks library uses socks4 prefix" >&5 +echo "configure:7358: checking if the socks library uses socks4 prefix" >&5 cf_use_socks4=error cat > conftest.$ac_ext < @@ -7323,7 +7366,7 @@ int main() { Rinit((char *)0) ; return 0; } EOF -if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF #define USE_SOCKS4_PREFIX 1 @@ -7335,14 +7378,14 @@ else cat conftest.$ac_ext >&5 cat > conftest.$ac_ext < int main() { SOCKSinit((char *)0) ; return 0; } EOF -if { (eval echo configure:7346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_use_socks4=no else @@ -7409,9 +7452,9 @@ EOF fi echo $ac_n "checking if socks5p.h is available""... $ac_c" 1>&6 -echo "configure:7413: checking if socks5p.h is available" >&5 +echo "configure:7456: checking if socks5p.h is available" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_use_socks5p_h=yes else @@ -7448,17 +7491,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:7452: checking for $ac_hdr" >&5 +echo "configure:7495: 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:7462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7505: \"$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* @@ -7485,12 +7528,12 @@ fi done echo $ac_n "checking for fcntl""... $ac_c" 1>&6 -echo "configure:7489: checking for fcntl" >&5 +echo "configure:7532: 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:7560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_fcntl=yes" else @@ -7533,12 +7576,12 @@ else fi echo $ac_n "checking for lockf""... $ac_c" 1>&6 -echo "configure:7537: checking for lockf" >&5 +echo "configure:7580: 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:7608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_lockf=yes" else @@ -7581,12 +7624,12 @@ else fi echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:7585: checking for flock" >&5 +echo "configure:7628: 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:7656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_flock=yes" else @@ -7630,7 +7673,7 @@ fi echo $ac_n "checking for file-locking functions""... $ac_c" 1>&6 -echo "configure:7634: checking for file-locking functions" >&5 +echo "configure:7677: 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 @@ -7642,7 +7685,7 @@ if eval 'test ${ac_cv_func_'$cf_lock'+se case $cf_lock in #(vi fcntl) #(vi cat > conftest.$ac_ext < @@ -7670,7 +7713,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7682,7 +7725,7 @@ rm -f conftest* ;; lockf) #(vi cat > conftest.$ac_ext < @@ -7702,7 +7745,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7714,7 +7757,7 @@ rm -f conftest* ;; flock) cat > conftest.$ac_ext < @@ -7737,7 +7780,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:7741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7758,7 +7801,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:7762: checking which locking method will be used" >&5 +echo "configure:7805: checking which locking method will be used" >&5 ### fcntl() is preferred, if the user just disables fcntl() ### without specifying an alternative lockf() is preferred @@ -7766,15 +7809,15 @@ echo "configure:7762: checking which loc if test "${enable_fcntl+set}" = set; then enableval="$enable_fcntl" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then requested_lock="lockf" - else - requested_lock="fcntl" - fi + else + requested_lock="fcntl" + fi else enableval=yes - requested_lock="fcntl" - + requested_lock="fcntl" + fi @@ -7782,11 +7825,11 @@ fi if test "${enable_lockf+set}" = set; then enableval="$enable_lockf" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then requested_lock="lockf" - fi + fi else - enableval=no + enableval=no fi @@ -7794,11 +7837,11 @@ fi if test "${enable_flock+set}" = set; then enableval="$enable_flock" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then requested_lock="flock" - fi + fi else - enableval=no + enableval=no fi ### now check the users wishes against available locking methods @@ -7827,7 +7870,7 @@ else fi echo $ac_n "checking for screen type""... $ac_c" 1>&6 -echo "configure:7831: checking for screen type" >&5 +echo "configure:7874: checking for screen type" >&5 # Check whether --with-screen or --without-screen was given. if test "${with_screen+set}" = set; then @@ -7845,7 +7888,7 @@ use_ncurses=no echo $ac_n "checking for specific curses-directory""... $ac_c" 1>&6 -echo "configure:7849: checking for specific curses-directory" >&5 +echo "configure:7892: 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 @@ -7861,32 +7904,32 @@ if ( test -n "$cf_cv_curses_dir" && test then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac if test -d "$cf_cv_curses_dir" @@ -7916,14 +7959,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:7927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -7940,7 +7983,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}:7944: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:7987: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -7951,6 +7994,8 @@ echo "${as_me:-configure}:7944: testing else break fi + else + break fi done done @@ -7958,31 +8003,31 @@ fi if test -n "$cf_cv_curses_dir/lib" ; then - for cf_add_libdir in $cf_cv_curses_dir/lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_cv_curses_dir/lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:7980: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:8025: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi fi @@ -8008,7 +8053,7 @@ pdcurses) #(vi ;; none) echo $ac_n "checking if you want to use ncurses library""... $ac_c" 1>&6 -echo "configure:8012: checking if you want to use ncurses library" >&5 +echo "configure:8057: 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 @@ -8021,21 +8066,21 @@ 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:8025: checking if you want curses rather than termcap interface" >&5 +echo "configure:8070: 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 enableval="$enable_curses" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cf_with_screen=curses; use_curses=$withval - else - cf_with_screen=termcap; use_curses=no - fi + else + cf_with_screen=termcap; use_curses=no + fi else enableval=no - cf_with_screen=termcap; use_curses=no - + cf_with_screen=termcap; use_curses=no + fi echo "$ac_t""$enableval" 1>&6 @@ -8050,26 +8095,38 @@ EOF case $cf_with_screen in #(vi ncurses) #(vi -cf_ncuconfig_root=ncurses +echo $ac_n "checking if you want to use pkg-config""... $ac_c" 1>&6 +echo "configure:8100: checking if you want to use pkg-config" >&5 -echo "Looking for ${cf_ncuconfig_root}-config" +# Check whether --with-pkg-config or --without-pkg-config was given. +if test "${with_pkg_config+set}" = set; then + withval="$with_pkg_config" + cf_pkg_config=$withval +else + cf_pkg_config=yes +fi +echo "$ac_t""$cf_pkg_config" 1>&6 -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 +case $cf_pkg_config in +(no) + PKG_CONFIG=none + ;; +(yes) + +# 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:8064: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_NCURSES_CONFIG'+set}'`\" = set"; then +echo "configure:8121: 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 - case "$NCURSES_CONFIG" in + case "$PKG_CONFIG" in /*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; ?:/*) - ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. ;; *) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" @@ -8077,55 +8134,254 @@ else for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then - ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word" + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" break fi done IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none" ;; esac fi -NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" -if test -n "$NCURSES_CONFIG"; then - echo "$ac_t""$NCURSES_CONFIG" 1>&6 +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 else echo "$ac_t""no" 1>&6 fi -test -n "$NCURSES_CONFIG" && break -done -test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" + ;; +(*) + PKG_CONFIG=$withval + ;; +esac + +test -z "$PKG_CONFIG" && PKG_CONFIG=none +if test "$PKG_CONFIG" != none ; then + +if test "x$prefix" != xNONE; then + cf_path_syntax="$prefix" +else + cf_path_syntax="$ac_default_prefix" +fi + +case ".$PKG_CONFIG" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval PKG_CONFIG="$PKG_CONFIG" + case ".$PKG_CONFIG" in + (.NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$PKG_CONFIG\"" 1>&2; exit 1; } + ;; +esac +elif test "x$cf_pkg_config" != xno ; then + echo "configure: warning: pkg-config is not installed" 1>&2 +fi -if test "$NCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -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: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/curses.h \ - ncurses.h \ - curses.h + +cf_ncuconfig_root=ncurses +cf_have_ncuconfig=no + +if test "x${PKG_CONFIG:=none}" != xnone; then + echo $ac_n "checking pkg-config for $cf_ncuconfig_root""... $ac_c" 1>&6 +echo "configure:8205: checking pkg-config for $cf_ncuconfig_root" >&5 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking if the $cf_ncuconfig_root package files work""... $ac_c" 1>&6 +echo "configure:8210: checking if the $cf_ncuconfig_root package files work" >&5 + cf_have_ncuconfig=unknown + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + +cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + + cat > conftest.$ac_ext < +int main() { +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +; return 0; } +EOF +if { (eval echo configure:8243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe +else + cat > conftest.$ac_ext < + int main(void) + { char *xx = curses_version(); return (xx == 0); } +EOF +if { (eval echo configure:8255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + cf_have_ncuconfig=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + cf_have_ncuconfig=no +fi +rm -fr conftest* +fi + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + cf_have_ncuconfig=no +fi +rm -rf conftest* + echo "$ac_t""$cf_have_ncuconfig" 1>&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + NCURSES_CONFIG_PKG=none + else + cat >> confdefs.h <<\EOF +#define NCURSES 1 +EOF + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + fi + + else + echo "$ac_t""no" 1>&6 + NCURSES_CONFIG_PKG=none + fi +else + NCURSES_CONFIG_PKG=none +fi + +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" + + +for ac_prog in ${cf_ncuconfig_root}-config ${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:8306: 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 + case "$NCURSES_CONFIG" in + /*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_NCURSES_CONFIG="$NCURSES_CONFIG" # Let the user override the test with a dos path. + ;; + *) + 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_path_NCURSES_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + ;; +esac +fi +NCURSES_CONFIG="$ac_cv_path_NCURSES_CONFIG" +if test -n "$NCURSES_CONFIG"; then + echo "$ac_t""$NCURSES_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$NCURSES_CONFIG" && break +done +test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" + + + if test "$NCURSES_CONFIG" != none ; then + + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + +cf_add_libs="`$NCURSES_CONFIG --libs`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_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:8367: 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.h ncurses/ncurses.h \ + curses.h ncurses/curses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:8129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -8148,17 +8404,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:8152: checking for $ac_hdr" >&5 +echo "configure:8408: 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:8162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8418: \"$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* @@ -8186,24 +8442,24 @@ done -cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NCURSES 1 EOF - + cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat >> confdefs.h <> confdefs.h < conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:8245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8258,7 +8514,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}:8262: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8518: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8269,6 +8525,8 @@ echo "${as_me:-configure}:8262: testing else break fi + else + break fi done done @@ -8277,7 +8535,7 @@ fi } echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:8281: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:8539: 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 @@ -8288,7 +8546,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -8335,7 +8593,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:8339: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:8597: 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 @@ -8349,8 +8607,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -8375,18 +8633,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" - test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -8399,41 +8645,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" - test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" - test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } +done test "$includedir" != NONE && \ @@ -8481,14 +8713,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:8492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8505,7 +8737,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}:8509: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8741: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8516,6 +8748,8 @@ echo "${as_me:-configure}:8509: testing else break fi + else + break fi done done @@ -8527,7 +8761,7 @@ fi do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -8606,14 +8840,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:8617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -8630,7 +8864,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}:8634: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:8868: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -8641,6 +8875,8 @@ echo "${as_me:-configure}:8634: testing else break fi + else + break fi done done @@ -8651,8 +8887,8 @@ fi # Set definitions to allow ifdef'ing for ncurses.h -case $cf_cv_ncurses_header in # (vi -*ncurses.h) +case $cf_cv_ncurses_header in +(*ncurses.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_H 1 EOF @@ -8660,14 +8896,14 @@ EOF ;; esac -case $cf_cv_ncurses_header in # (vi -ncurses/curses.h|ncurses/ncurses.h) +case $cf_cv_ncurses_header in +(ncurses/curses.h|ncurses/ncurses.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_NCURSES_H 1 EOF ;; -ncursesw/curses.h|ncursesw/ncurses.h) +(ncursesw/curses.h|ncursesw/ncurses.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSESW_NCURSES_H 1 EOF @@ -8678,16 +8914,16 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:8682: checking for terminfo header" >&5 +echo "configure:8918: 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 -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi +case ${cf_cv_ncurses_header} in +(*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; -*) +(*) cf_term_header=term.h ;; esac @@ -8695,7 +8931,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}> @@ -8705,7 +8941,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:8709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -8727,8 +8963,8 @@ echo "$ac_t""$cf_cv_term_header" 1>&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in # (vi -*term.h) +case $cf_cv_term_header in +(*term.h) cat >> confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -8736,14 +8972,14 @@ EOF ;; esac -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi +case $cf_cv_term_header in +(ncurses/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; -ncursesw/term.h) +(ncursesw/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF @@ -8760,7 +8996,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:8764: checking for ncurses version" >&5 +echo "configure:9000: 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 @@ -8786,7 +9022,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:8790: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:9026: \"$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" @@ -8795,7 +9031,7 @@ EOF else cat > conftest.$ac_ext < @@ -8819,7 +9055,7 @@ int main() ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:8823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9059: \"$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` @@ -8841,7 +9077,7 @@ EOF - + cf_nculib_root=ncurses # This works, except for the special case where we find gpm, but @@ -8850,7 +9086,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:8854: checking for Gpm_Open in -lgpm" >&5 +echo "configure:9090: 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 @@ -8858,7 +9094,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:9109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8885,7 +9121,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:8889: checking for initscr in -lgpm" >&5 +echo "configure:9125: 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 @@ -8893,7 +9129,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:9144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8930,13 +9166,13 @@ else fi -case $host_os in #(vi -freebsd*) +case $host_os in +(freebsd*) # This is only necessary if you are linking against an obsolete # 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:8940: checking for tgoto in -lmytinfo" >&5 +echo "configure:9176: 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 @@ -8944,7 +9180,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:9195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8979,22 +9215,54 @@ fi ;; esac -LIBS="$cf_ncurses_LIBS $LIBS" + +cf_add_libs="$cf_ncurses_LIBS" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - LIBS="-l$cf_nculib_root $LIBS" + +cf_add_libs="-l$cf_nculib_root" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:8993: checking for initscr" >&5 +echo "configure:9261: 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:9289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_initscr=yes" else @@ -9037,17 +9305,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:9041: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:9309: 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:9051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9319: \"$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' @@ -9063,8 +9331,8 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -9088,18 +9356,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" - test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -9112,41 +9368,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" - test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib" - test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" + test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" + test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" + test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" } +done cf_search="$cf_library_path_list $cf_search" @@ -9154,17 +9396,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:9158: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:9400: 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:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9410: \"$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' @@ -9195,7 +9437,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:9199: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:9441: 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$%%"` @@ -9204,14 +9446,14 @@ echo "configure:9199: 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:9215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 else @@ -9233,6 +9475,9 @@ EOF + fi +else + NCURSES_CONFIG=none fi ;; @@ -9241,9 +9486,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:9245: checking for $cf_hdr" >&5 +echo "configure:9490: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -9251,7 +9496,7 @@ echo "configure:9245: checking for $cf_h EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9500: \"$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* @@ -9278,12 +9523,12 @@ done echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:9282: checking for wide char and multibyte support" >&5 +echo "configure:9527: 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 @@ -9337,7 +9582,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:9341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=yes else @@ -9347,7 +9592,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -9391,7 +9636,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:9395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=libutf8 else @@ -9424,17 +9669,114 @@ EOF fi + cf_ncuconfig_root=ncursesw +cf_have_ncuconfig=no + +if test "x${PKG_CONFIG:=none}" != xnone; then + echo $ac_n "checking pkg-config for $cf_ncuconfig_root""... $ac_c" 1>&6 +echo "configure:9679: checking pkg-config for $cf_ncuconfig_root" >&5 + if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then + echo "$ac_t""yes" 1>&6 + + echo $ac_n "checking if the $cf_ncuconfig_root package files work""... $ac_c" 1>&6 +echo "configure:9684: checking if the $cf_ncuconfig_root package files work" >&5 + cf_have_ncuconfig=unknown + + cf_save_CPPFLAGS="$CPPFLAGS" + cf_save_LIBS="$LIBS" + + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags $cf_ncuconfig_root`" + +cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + + cat > conftest.$ac_ext < +int main() { +initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); +; return 0; } +EOF +if { (eval echo configure:9717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + if test "$cross_compiling" = yes; then + cf_have_ncuconfig=maybe +else + cat > conftest.$ac_ext < + int main(void) + { char *xx = curses_version(); return (xx == 0); } +EOF +if { (eval echo configure:9729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + cf_have_ncuconfig=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + cf_have_ncuconfig=no +fi +rm -fr conftest* +fi -echo "Looking for ${cf_ncuconfig_root}-config" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + cf_have_ncuconfig=no +fi +rm -rf conftest* + echo "$ac_t""$cf_have_ncuconfig" 1>&6 + test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes + if test "$cf_have_ncuconfig" != "yes" + then + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + NCURSES_CONFIG_PKG=none + else + cat >> confdefs.h <<\EOF +#define NCURSES 1 +EOF + + NCURSES_CONFIG_PKG=$cf_ncuconfig_root + fi + + else + echo "$ac_t""no" 1>&6 + NCURSES_CONFIG_PKG=none + fi +else + NCURSES_CONFIG_PKG=none +fi +if test "x$cf_have_ncuconfig" = "xno"; then + echo "Looking for ${cf_ncuconfig_root}-config" -for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config + +for ac_prog in ${cf_ncuconfig_root}-config ${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:9438: checking for $ac_word" >&5 +echo "configure:9780: 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 @@ -9471,35 +9813,49 @@ done test -n "$NCURSES_CONFIG" || NCURSES_CONFIG="none" -if test "$NCURSES_CONFIG" != none ; then + if test "$NCURSES_CONFIG" != none ; then -CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" -LIBS="`$NCURSES_CONFIG --libs` $LIBS" + CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" + +cf_add_libs="`$NCURSES_CONFIG --libs`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" -# even with config script, some packages use no-override for curses.h + # 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:9483: checking if we have identified curses headers" >&5 +echo "configure:9841: 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/curses.h \ - ncurses.h \ - curses.h +for cf_header in \ + ncurses.h ncursesw/ncurses.h \ + curses.h ncursesw/curses.h do cat > conftest.$ac_ext < int main() { initscr(); tgoto("?", 0,0) ; return 0; } EOF -if { (eval echo configure:9503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -9522,17 +9878,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:9526: checking for $ac_hdr" >&5 +echo "configure:9882: 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:9536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9892: \"$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* @@ -9560,24 +9916,24 @@ done -cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define NCURSES 1 EOF - + cf_nculib_ROOT=`echo "HAVE_LIB$cf_ncuconfig_root" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` -cat >> confdefs.h <> confdefs.h < conftest.$ac_ext < int main() { printf("Hello") ; return 0; } EOF -if { (eval echo configure:9619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9975: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -9632,7 +9988,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}:9636: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:9992: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9643,6 +9999,8 @@ echo "${as_me:-configure}:9636: testing else break fi + else + break fi done done @@ -9651,7 +10009,7 @@ fi } echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6 -echo "configure:9655: checking for $cf_ncuhdr_root header in include-path" >&5 +echo "configure:10013: 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 @@ -9662,7 +10020,7 @@ else do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h=$cf_header @@ -9717,7 +10075,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:9721: checking for $cf_ncuhdr_root include-path" >&5 +echo "configure:10079: 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 @@ -9731,8 +10089,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -9757,18 +10115,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include" - test -d /usr/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/$cf_ncuhdr_root/include" - test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -9781,41 +10127,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include" - test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/include/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include && cf_search="$cf_search /opt/$cf_ncuhdr_root/include" - test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/include/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include" - test -d $HOME/$cf_ncuhdr_root/include && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include" - test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root" + test -d $cf_subdir_prefix/include/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ncuhdr_root/include" + test -d $cf_subdir_prefix/$cf_ncuhdr_root/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include" + test -d $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search $cf_subdir_prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root" } +done test "$includedir" != NONE && \ @@ -9863,14 +10195,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:9874: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -9887,7 +10219,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}:9891: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10223: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -9898,6 +10230,8 @@ echo "${as_me:-configure}:9891: testing else break fi + else + break fi done done @@ -9909,7 +10243,7 @@ fi do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_h2=$cf_header @@ -9988,14 +10322,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:9999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -10012,7 +10346,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}:10016: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:10350: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -10023,6 +10357,8 @@ echo "${as_me:-configure}:10016: testing else break fi + else + break fi done done @@ -10033,8 +10369,8 @@ fi # Set definitions to allow ifdef'ing for ncurses.h -case $cf_cv_ncurses_header in # (vi -*ncurses.h) +case $cf_cv_ncurses_header in +(*ncurses.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_H 1 EOF @@ -10042,14 +10378,14 @@ EOF ;; esac -case $cf_cv_ncurses_header in # (vi -ncurses/curses.h|ncurses/ncurses.h) +case $cf_cv_ncurses_header in +(ncurses/curses.h|ncurses/ncurses.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_NCURSES_H 1 EOF ;; -ncursesw/curses.h|ncursesw/ncurses.h) +(ncursesw/curses.h|ncursesw/ncurses.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSESW_NCURSES_H 1 EOF @@ -10060,16 +10396,16 @@ esac echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:10064: checking for terminfo header" >&5 +echo "configure:10400: 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 -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi +case ${cf_cv_ncurses_header} in +(*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; -*) +(*) cf_term_header=term.h ;; esac @@ -10077,7 +10413,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}> @@ -10087,7 +10423,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:10091: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -10109,8 +10445,8 @@ echo "$ac_t""$cf_cv_term_header" 1>&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in # (vi -*term.h) +case $cf_cv_term_header in +(*term.h) cat >> confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -10118,14 +10454,14 @@ EOF ;; esac -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi +case $cf_cv_term_header in +(ncurses/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; -ncursesw/term.h) +(ncursesw/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF @@ -10142,7 +10478,7 @@ EOF echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10146: checking for ncurses version" >&5 +echo "configure:10482: 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 @@ -10168,7 +10504,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10172: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:10508: \"$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" @@ -10177,7 +10513,7 @@ EOF else cat > conftest.$ac_ext < @@ -10201,7 +10537,7 @@ int main() ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:10205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10541: \"$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` @@ -10223,7 +10559,7 @@ EOF - + cf_nculib_root=ncursesw # This works, except for the special case where we find gpm, but @@ -10232,7 +10568,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:10236: checking for Gpm_Open in -lgpm" >&5 +echo "configure:10572: 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 @@ -10240,7 +10576,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:10591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10267,7 +10603,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:10271: checking for initscr in -lgpm" >&5 +echo "configure:10607: 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 @@ -10275,7 +10611,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:10626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10312,13 +10648,13 @@ else fi -case $host_os in #(vi -freebsd*) +case $host_os in +(freebsd*) # This is only necessary if you are linking against an obsolete # 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:10322: checking for tgoto in -lmytinfo" >&5 +echo "configure:10658: 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 @@ -10326,7 +10662,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:10677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10361,22 +10697,54 @@ fi ;; esac -LIBS="$cf_ncurses_LIBS $LIBS" + +cf_add_libs="$cf_ncurses_LIBS" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) then - LIBS="-l$cf_nculib_root $LIBS" + +cf_add_libs="-l$cf_nculib_root" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else eval 'cf_cv_have_lib_'$cf_nculib_root'=no' cf_libdir="" echo $ac_n "checking for initscr""... $ac_c" 1>&6 -echo "configure:10375: checking for initscr" >&5 +echo "configure:10743: 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:10771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_initscr=yes" else @@ -10419,17 +10787,17 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6 -echo "configure:10423: checking for initscr in -l$cf_nculib_root" >&5 +echo "configure:10791: 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:10433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10801: \"$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' @@ -10445,8 +10813,8 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -10470,18 +10838,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/lib/$cf_nculib_root/lib" - test -d /usr/$cf_nculib_root/lib && cf_search="$cf_search /usr/$cf_nculib_root/lib" - test -d /usr/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -10494,41 +10850,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/$cf_nculib_root/lib" - test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/lib/$cf_nculib_root/lib && cf_search="$cf_search /opt/lib/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib && cf_search="$cf_search /opt/$cf_nculib_root/lib" - test -d /opt/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/lib/$cf_nculib_root/lib && cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib" - test -d $HOME/$cf_nculib_root/lib && cf_search="$cf_search $HOME/$cf_nculib_root/lib" - test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root" + test -d $cf_subdir_prefix/lib/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_nculib_root/lib" + test -d $cf_subdir_prefix/$cf_nculib_root/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib" + test -d $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search $cf_subdir_prefix/$cf_nculib_root/lib/$cf_nculib_root" } +done cf_search="$cf_library_path_list $cf_search" @@ -10536,17 +10878,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:10540: checking for -l$cf_nculib_root in $cf_libdir" >&5 +echo "configure:10882: 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:10550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10892: \"$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' @@ -10577,7 +10919,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:10581: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5 +echo "configure:10923: 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$%%"` @@ -10586,14 +10928,14 @@ echo "configure:10581: checking if we ca fi done cat > conftest.$ac_ext < int main() { initscr(); mousemask(0,0); tgoto((char *)0, 0, 0); ; return 0; } EOF -if { (eval echo configure:10597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then echo "$ac_t""yes" 1>&6 else @@ -10615,17 +10957,20 @@ EOF + fi +else + NCURSES_CONFIG=none 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:10968: 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 +10987,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:10991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=no else @@ -10650,7 +10995,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:11016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=yes else @@ -10691,21 +11036,21 @@ test $cf_cv_need_xopen_extension = yes & echo $ac_n "checking for extra include directories""... $ac_c" 1>&6 -echo "configure:10695: checking for extra include directories" >&5 +echo "configure:11040: 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 cf_cv_curses_incdir=no -case $host_os in #(vi -hpux10.*) #(vi +case $host_os in +(hpux10.*) if test "x$cf_cv_screen" = "xcurses_colr" then test -d /usr/include/curses_colr && \ cf_cv_curses_incdir="-I/usr/include/curses_colr" fi ;; -sunos3*|sunos4*) +(sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then test -d /usr/5lib && \ @@ -10722,25 +11067,25 @@ test "$cf_cv_curses_incdir" != no && CPP echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6 -echo "configure:10726: checking if we have identified curses headers" >&5 +echo "configure:11071: 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.h \ - curses.h ncurses/ncurses.h ncurses/curses.h +for cf_header in \ + ncurses.h \ + 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:10744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_header=$cf_header; break else @@ -10763,17 +11108,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:10767: checking for $ac_hdr" >&5 +echo "configure:11112: 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:10777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:11122: \"$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* @@ -10802,16 +11147,16 @@ done echo $ac_n "checking for terminfo header""... $ac_c" 1>&6 -echo "configure:10806: checking for terminfo header" >&5 +echo "configure:11151: 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 -case ${cf_cv_ncurses_header} in #(vi -*/ncurses.h|*/ncursesw.h) #(vi +case ${cf_cv_ncurses_header} in +(*/ncurses.h|*/ncursesw.h) cf_term_header=`echo "$cf_cv_ncurses_header" | sed -e 's%ncurses[^.]*\.h$%term.h%'` ;; -*) +(*) cf_term_header=term.h ;; esac @@ -10819,7 +11164,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}> @@ -10829,7 +11174,7 @@ int main() { int x = auto_left_margin ; return 0; } EOF -if { (eval echo configure:10833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header="$cf_test" @@ -10851,8 +11196,8 @@ echo "$ac_t""$cf_cv_term_header" 1>&6 # Set definitions to allow ifdef'ing to accommodate subdirectories -case $cf_cv_term_header in # (vi -*term.h) +case $cf_cv_term_header in +(*term.h) cat >> confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF @@ -10860,14 +11205,14 @@ EOF ;; esac -case $cf_cv_term_header in # (vi -ncurses/term.h) #(vi +case $cf_cv_term_header in +(ncurses/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; -ncursesw/term.h) +(ncursesw/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF @@ -10878,7 +11223,7 @@ esac echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10882: checking for ncurses version" >&5 +echo "configure:11227: 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 @@ -10904,7 +11249,7 @@ Autoconf "old" #endif EOF cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out" - { (eval echo configure:10908: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; } + { (eval echo configure:11253: \"$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" @@ -10913,7 +11258,7 @@ EOF else cat > conftest.$ac_ext < @@ -10937,7 +11282,7 @@ int main() ${cf_cv_main_return:-return}(0); } EOF -if { (eval echo configure:10941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11286: \"$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` @@ -10961,16 +11306,16 @@ EOF echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6 -echo "configure:10965: checking if we have identified curses libraries" >&5 +echo "configure:11310: 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:10974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -10983,10 +11328,10 @@ rm -rf conftest* echo "$ac_t""$cf_result" 1>&6 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:10990: checking for tgoto in -lmytinfo" >&5 +case $host_os in +(freebsd*) + echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6 +echo "configure:11335: 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 @@ -10994,7 +11339,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:11354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11020,13 +11365,29 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lmytinfo $LIBS" + +cf_add_libs="-lmytinfo" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else echo "$ac_t""no" 1>&6 fi - ;; -hpux10.*) #(vi + ;; +(hpux10.*) # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr # next (1998), and xcurses "newer" (2000). There is no header file for # Hcurses; the subdirectory curses_colr has the headers (curses.h and @@ -11034,7 +11395,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:11038: checking for initscr in -lcur_colr" >&5 +echo "configure:11399: 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 @@ -11042,7 +11403,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:11418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11069,14 +11430,30 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lcur_colr $LIBS" + +cf_add_libs="-lcur_colr" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + ac_cv_func_initscr=yes else echo "$ac_t""no" 1>&6 echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6 -echo "configure:11080: checking for initscr in -lHcurses" >&5 +echo "configure:11457: 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 @@ -11084,7 +11461,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:11476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11112,7 +11489,23 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l echo "$ac_t""yes" 1>&6 # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - LIBS="-lHcurses $LIBS" + +cf_add_libs="-lHcurses" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" ac_cv_func_initscr=yes @@ -11124,143 +11517,159 @@ fi fi ;; -linux*) +(linux*) case `arch 2>/dev/null` in - x86_64) + (x86_64) if test -d /lib64 then if test -n "/lib64" ; then - for cf_add_libdir in /lib64 - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in /lib64 + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11153: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11546: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi else if test -n "/lib" ; then - for cf_add_libdir in /lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in /lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11183: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11576: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi fi ;; - *) + (*) if test -n "/lib" ; then - for cf_add_libdir in /lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in /lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11215: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11608: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi ;; esac ;; -sunos3*|sunos4*) +(sunos3*|sunos4*) if test "x$cf_cv_screen" = "xcurses_5lib" then if test -d /usr/5lib ; then if test -n "/usr/5lib" ; then - for cf_add_libdir in /usr/5lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in /usr/5lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:11251: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:11644: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi - LIBS="-lcurses -ltermcap $LIBS" + +cf_add_libs="-lcurses -ltermcap" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break fi - fi - ac_cv_func_initscr=yes - ;; + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + fi + fi + ac_cv_func_initscr=yes + ;; esac if test ".$ac_cv_func_initscr" != .yes ; then @@ -11278,12 +11687,12 @@ if test ".$ac_cv_func_initscr" != .yes ; 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 +echo "configure:11691: 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:11719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_tgoto=yes" else @@ -11327,7 +11736,7 @@ else 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 +echo "configure:11740: 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 @@ -11335,7 +11744,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:11759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11379,7 +11788,7 @@ fi 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 +echo "configure:11792: 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 @@ -11387,7 +11796,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:11811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11425,16 +11834,16 @@ fi 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:11429: checking if we can link with $cf_curs_lib library" >&5 +echo "configure:11838: 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:11438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -11450,16 +11859,16 @@ rm -rf conftest* : 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 +echo "configure:11863: 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:11463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=no else @@ -11469,14 +11878,14 @@ else LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" cat > conftest.$ac_ext < int main() { initscr() ; return 0; } EOF -if { (eval echo configure:11480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -11498,13 +11907,13 @@ fi echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6 -echo "configure:11502: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5 +echo "configure:11911: 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 < @@ -11521,7 +11930,7 @@ int main() { getbegyx(stdscr, y1, x1) ; return 0; } EOF -if { (eval echo configure:11525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=no else @@ -11529,7 +11938,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:11959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_need_xopen_extension=yes else @@ -11569,7 +11978,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:11573: checking if you want to use installed version of pcre" >&5 +echo "configure:11982: 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 @@ -11601,32 +12010,32 @@ case .$cf_pcre_home in #(vi .*) if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$cf_pcre_home" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval cf_pcre_home="$cf_pcre_home" - case ".$cf_pcre_home" in #(vi - .NONE/*) - cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$cf_pcre_home\"" 1>&2; exit 1; } - ;; +case ".$cf_pcre_home" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval cf_pcre_home="$cf_pcre_home" + case ".$cf_pcre_home" in + (.NONE/*) + cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + cf_pcre_home=`echo $cf_pcre_home | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$cf_pcre_home\"" 1>&2; exit 1; } + ;; esac PCREDIR_MAKE='#' @@ -11651,7 +12060,7 @@ debug_malloc=none echo $ac_n "checking if you want to use dbmalloc for testing""... $ac_c" 1>&6 -echo "configure:11655: checking if you want to use dbmalloc for testing" >&5 +echo "configure:12064: 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 @@ -11671,12 +12080,12 @@ fi echo "$ac_t""${with_dbmalloc:-no}" 1>&6 -case .$with_cflags in #(vi -.*-g*) - case .$CFLAGS in #(vi - .*-g*) #(vi +case .$with_cflags in +(.*-g*) + case .$CFLAGS in + (.*-g*) ;; - *) + (*) cf_fix_cppflags=no cf_new_cflags= @@ -11686,14 +12095,14 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -11707,11 +12116,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -11724,17 +12133,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -11768,17 +12177,17 @@ esac if test "$with_dbmalloc" = yes ; then ac_safe=`echo "dbmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dbmalloc.h""... $ac_c" 1>&6 -echo "configure:11772: checking for dbmalloc.h" >&5 +echo "configure:12181: 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:11782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12191: \"$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* @@ -11795,7 +12204,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:11799: checking for debug_malloc in -ldbmalloc" >&5 +echo "configure:12208: 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 @@ -11803,7 +12212,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:12227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11843,7 +12252,7 @@ fi echo $ac_n "checking if you want to use dmalloc for testing""... $ac_c" 1>&6 -echo "configure:11847: checking if you want to use dmalloc for testing" >&5 +echo "configure:12256: 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 @@ -11863,12 +12272,12 @@ fi echo "$ac_t""${with_dmalloc:-no}" 1>&6 -case .$with_cflags in #(vi -.*-g*) - case .$CFLAGS in #(vi - .*-g*) #(vi +case .$with_cflags in +(.*-g*) + case .$CFLAGS in + (.*-g*) ;; - *) + (*) cf_fix_cppflags=no cf_new_cflags= @@ -11878,14 +12287,14 @@ cf_new_extra_cppflags= for cf_add_cflags in -g do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -11899,11 +12308,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -11916,17 +12325,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -11960,17 +12369,17 @@ esac if test "$with_dmalloc" = yes ; then ac_safe=`echo "dmalloc.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dmalloc.h""... $ac_c" 1>&6 -echo "configure:11964: checking for dmalloc.h" >&5 +echo "configure:12373: 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:11974: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12383: \"$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* @@ -11987,7 +12396,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:11991: checking for dmalloc_debug in -ldmalloc" >&5 +echo "configure:12400: 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 @@ -11995,7 +12404,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:12419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12039,12 +12448,12 @@ if test "${with_trace+set}" = set; then withval="$with_trace" echo $ac_n "checking for _tracef""... $ac_c" 1>&6 -echo "configure:12043: checking for _tracef" >&5 +echo "configure:12452: 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:12480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func__tracef=yes" else @@ -12089,7 +12498,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:12093: checking for _tracef in -l${cf_with_screen}_g" >&5 +echo "configure:12502: 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 @@ -12097,7 +12506,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:12521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12154,7 +12563,7 @@ fi ## options for miscellaneous definitions echo $ac_n "checking for domain-name""... $ac_c" 1>&6 -echo "configure:12158: checking for domain-name" >&5 +echo "configure:12567: checking for domain-name" >&5 # Check whether --with-domain-name or --without-domain-name was given. if test "${with_domain_name+set}" = set; then @@ -12183,7 +12592,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:12187: checking for NNTP default-server" >&5 +echo "configure:12596: 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 @@ -12249,20 +12658,20 @@ EOF ## optional features echo $ac_n "checking whether to use MH style mail handling for mailgroups""... $ac_c" 1>&6 -echo "configure:12253: checking whether to use MH style mail handling for mailgroups" >&5 +echo "configure:12662: 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 enableval="$enable_mh_mail_handling" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define HAVE_MH_MAIL_HANDLING 1 EOF - fi + fi else - enableval=no + enableval=no fi echo "$ac_t""$enableval" 1>&6 @@ -12270,28 +12679,28 @@ 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:12274: checking whether to use Cancel-Locks" >&5 +echo "configure:12683: 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 enableval="$enable_cancel_locks" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then CANLIBS='-L../libcanlock -lcanlock' CAN_MAKEFILE="libcanlock/Makefile" cat >> confdefs.h <<\EOF #define USE_CANLOCK 1 EOF - else - CANDIR_MAKE='#' + else + CANDIR_MAKE='#' CANLIBS='' - fi + fi else enableval=no - CANDIR_MAKE='#' + CANDIR_MAKE='#' CANLIBS='' - + fi echo "$ac_t""$enableval" 1>&6 @@ -12302,17 +12711,17 @@ echo "$ac_t""$enableval" 1>&6 gsasl=no ac_safe=`echo "gsasl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for gsasl.h""... $ac_c" 1>&6 -echo "configure:12306: checking for gsasl.h" >&5 +echo "configure:12715: 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:12316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:12725: \"$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* @@ -12329,7 +12738,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:12333: checking for gsasl_check_version in -lgsasl" >&5 +echo "configure:12742: 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 @@ -12337,7 +12746,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:12761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12379,138 +12788,138 @@ if test "$gsasl" = "yes"; then if test "${enable_gsasl+set}" = set; then enableval="$enable_gsasl" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then USE_SASL=no - else - USE_SASL=yes + else + USE_SASL=yes cat >> confdefs.h <<\EOF #define USE_SASL 1 EOF LIBS="$LIBS -lgsasl" - fi + fi else enableval=yes - USE_SASL=yes + USE_SASL=yes cat >> confdefs.h <<\EOF #define USE_SASL 1 EOF LIBS="$LIBS -lgsasl" - + fi fi echo $ac_n "checking whether to enable 8-bit keycodes""... $ac_c" 1>&6 -echo "configure:12407: checking whether to enable 8-bit keycodes" >&5 +echo "configure:12816: 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 enableval="$enable_8bit_keys" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then : - else - cat >> confdefs.h <<\EOF + else + cat >> confdefs.h <<\EOF #define HAVE_KEY_PREFIX 1 EOF - fi + fi else enableval=yes - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_KEY_PREFIX 1 EOF - + fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable ANSI-color""... $ac_c" 1>&6 -echo "configure:12433: checking whether to enable ANSI-color" >&5 +echo "configure:12842: checking whether to enable ANSI-color" >&5 # Check whether --enable-color or --disable-color was given. if test "${enable_color+set}" = set; then enableval="$enable_color" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then : - fi + fi else - enableval=yes + enableval=yes fi 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:12450: checking whether to enable posting-etiquette" >&5 +echo "configure:12859: checking whether to enable posting-etiquette" >&5 # Check whether --enable-etiquette or --disable-etiquette was given. if test "${enable_etiquette+set}" = set; then enableval="$enable_etiquette" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define NO_ETIQUETTE 1 EOF - fi + fi else - enableval=yes + enableval=yes 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:12469: checking whether to strictly observe RFC2047 and break long lines" >&5 +echo "configure:12878: 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 enableval="$enable_break_long_lines" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define MIME_BREAK_LONG_LINES 1 EOF - fi + fi else - enableval=no + enableval=no 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:12488: checking whether to force MM_CHARSET obeyance when decoding mime" >&5 +echo "configure:12897: 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 enableval="$enable_mime_strict_charset" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then : - else - cat >> confdefs.h <<\EOF + else + cat >> confdefs.h <<\EOF #define MIME_STRICT_CHARSET 1 EOF - fi + fi else enableval=yes - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define MIME_STRICT_CHARSET 1 EOF - + fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking for MIME character-set""... $ac_c" 1>&6 -echo "configure:12514: checking for MIME character-set" >&5 +echo "configure:12923: 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 @@ -12532,7 +12941,7 @@ EOF echo "$ac_t""$MM_CHARSET" 1>&6 echo $ac_n "checking for default ISO/ASCII table""... $ac_c" 1>&6 -echo "configure:12536: checking for default ISO/ASCII table" >&5 +echo "configure:12945: 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 @@ -12554,233 +12963,233 @@ EOF echo "$ac_t""$DEFAULT_ISO2ASC" 1>&6 echo $ac_n "checking whether to enable locale support""... $ac_c" 1>&6 -echo "configure:12558: checking whether to enable locale support" >&5 +echo "configure:12967: checking whether to enable locale support" >&5 # Check whether --enable-locale or --disable-locale was given. if test "${enable_locale+set}" = set; then enableval="$enable_locale" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define NO_LOCALE 1 EOF - fi + fi else - enableval=yes + enableval=yes fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable posting""... $ac_c" 1>&6 -echo "configure:12577: checking whether to enable posting" >&5 +echo "configure:12986: checking whether to enable posting" >&5 # Check whether --enable-posting or --disable-posting was given. if test "${enable_posting+set}" = set; then enableval="$enable_posting" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define NO_POSTING 1 EOF - fi + fi else - enableval=yes + enableval=yes fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable shell escape""... $ac_c" 1>&6 -echo "configure:12596: checking whether to enable shell escape" >&5 +echo "configure:13005: 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 enableval="$enable_shell_escape" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define NO_SHELL_ESCAPE 1 EOF - fi + fi else - enableval=yes + enableval=yes fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to have fascist newsadmin""... $ac_c" 1>&6 -echo "configure:12615: checking whether to have fascist newsadmin" >&5 +echo "configure:13024: 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 enableval="$enable_fascist_newsadmin" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define HAVE_FASCIST_NEWSADMIN 1 EOF - fi + fi else - enableval=no + enableval=no fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable inverse video and highlighting""... $ac_c" 1>&6 -echo "configure:12634: checking whether to enable inverse video and highlighting" >&5 +echo "configure:13043: 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 enableval="$enable_inverse_video" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define USE_INVERSE_HACK 1 EOF - fi + fi else - enableval=yes + enableval=yes fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable piping support""... $ac_c" 1>&6 -echo "configure:12653: checking whether to enable piping support" >&5 +echo "configure:13062: checking whether to enable piping support" >&5 # Check whether --enable-piping or --disable-piping was given. if test "${enable_piping+set}" = set; then enableval="$enable_piping" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define DONT_HAVE_PIPING 1 EOF - fi + fi else - enableval=yes + enableval=yes fi echo "$ac_t""$enableval" 1>&6 echo $ac_n "checking whether to enable printer support""... $ac_c" 1>&6 -echo "configure:12672: checking whether to enable printer support" >&5 +echo "configure:13081: checking whether to enable printer support" >&5 # Check whether --enable-printing or --disable-printing was given. if test "${enable_printing+set}" = set; then enableval="$enable_printing" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then cat >> confdefs.h <<\EOF #define DISABLE_PRINTING 1 EOF - fi + fi else - enableval=yes + enableval=yes 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:12691: checking whether to unique tmp-files by appending .pid" >&5 +echo "configure:13100: 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 enableval="$enable_append_pid" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then : - else - cat >> confdefs.h <<\EOF + else + cat >> confdefs.h <<\EOF #define APPEND_PID 1 EOF - fi + fi else enableval=yes - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define APPEND_PID 1 EOF - + 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:12717: checking whether to fallback to XHDR XREF if XOVER isn't supported" >&5 +echo "configure:13126: 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 enableval="$enable_xhdr_xref" test "$enableval" != no && enableval=yes - if test "$enableval" != "yes" ; then + if test "$enableval" != "yes" ; then : - else - cat >> confdefs.h <<\EOF + else + cat >> confdefs.h <<\EOF #define XHDR_XREF 1 EOF - fi + fi else enableval=yes - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define XHDR_XREF 1 EOF - + fi 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:12744: checking whether to send a GROUP command before a LISTGROUP" >&5 +echo "configure:13153: 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 enableval="$enable_broken_listgroup_fix" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define BROKEN_LISTGROUP 1 EOF - fi + fi else - enableval=no + enableval=no fi 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:12764: checking whether to ignore system()s return value" >&5 +echo "configure:13173: 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 enableval="$enable_broken_system_fix" test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define IGNORE_SYSTEM_STATUS 1 EOF - fi + fi else - enableval=no + enableval=no fi 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:12784: checking for directory containing tin.defaults file" >&5 +echo "configure:13193: 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 @@ -12792,32 +13201,32 @@ fi if true ; then if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" + cf_path_syntax="$prefix" else - cf_path_syntax="$ac_default_prefix" + cf_path_syntax="$ac_default_prefix" fi -case ".$withval" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval withval="$withval" - case ".$withval" in #(vi - .NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } - ;; +case ".$withval" in +(.\$\(*\)*|.\'*\'*) + ;; +(..|./*|.\\*) + ;; +(.[a-zA-Z]:[\\/]*) # OS/2 EMX + ;; +(.\${*prefix}*|.\${*dir}*) + eval withval="$withval" + case ".$withval" in + (.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; + esac + ;; +(.no|.NONE/*) + withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%` + ;; +(*) + { echo "configure: error: expected a pathname, not \"$withval\"" 1>&2; exit 1; } + ;; esac fi @@ -12831,20 +13240,27 @@ EOF ### check for ipv6 support echo $ac_n "checking whether to enable IPv6""... $ac_c" 1>&6 -echo "configure:12835: checking whether to enable IPv6" >&5 +echo "configure:13244: checking whether to enable IPv6" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" - test "$enableval" != yes && enableval=no - if test "$enableval" != "no" ; then - cat >> confdefs.h <<\EOF + test "$enableval" != no && enableval=yes + if test "$enableval" != "yes" ; then + : + else + cat >> confdefs.h <<\EOF #define ENABLE_IPV6 1 EOF - - fi + + fi else - enableval=no + enableval=yes + cat >> confdefs.h <<\EOF +#define ENABLE_IPV6 1 +EOF + + fi echo "$ac_t""$enableval" 1>&6 @@ -12852,7 +13268,7 @@ if test "$enableval" = "yes"; then echo $ac_n "checking ipv6 stack type""... $ac_c" 1>&6 -echo "configure:12856: checking ipv6 stack type" >&5 +echo "configure:13272: checking ipv6 stack type" >&5 if eval "test \"`echo '$''{'cf_cv_ipv6type'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12860,8 +13276,8 @@ else cf_cv_ipv6type=unknown for i in solaris inria kame linux-glibc linux-libinet6 toshiba v6d zeta do - case $i in #(vi - solaris) #(vi + case $i in + (solaris) if test "SunOS" = "`uname -s`" then if test -f /usr/include/netinet/ip6.h @@ -12870,9 +13286,9 @@ do fi fi ;; - inria) #(vi + (inria) cat > conftest.$ac_ext < @@ -12888,9 +13304,9 @@ fi rm -f conftest* ;; - kame) #(vi + (kame) cat > conftest.$ac_ext < @@ -12906,9 +13322,9 @@ fi rm -f conftest* ;; - linux-glibc) #(vi + (linux-glibc) cat > conftest.$ac_ext < @@ -12924,7 +13340,7 @@ fi rm -f conftest* ;; - linux-libinet6) #(vi + (linux-libinet6) if test -d /usr/inet6 then cf_cv_ipv6type=$i @@ -12933,9 +13349,9 @@ rm -f conftest* cf_cv_ipv6type=$i fi ;; - toshiba) #(vi + (toshiba) cat > conftest.$ac_ext < @@ -12951,9 +13367,9 @@ fi rm -f conftest* ;; - v6d) #(vi + (v6d) cat > conftest.$ac_ext < @@ -12969,9 +13385,9 @@ fi rm -f conftest* ;; - zeta) + (zeta) cat > conftest.$ac_ext < @@ -13004,31 +13420,31 @@ cf_ipv6lib=none cf_ipv6dir=none echo $ac_n "checking for IPv6 library if required""... $ac_c" 1>&6 -echo "configure:13008: checking for IPv6 library if required" >&5 -case $cf_cv_ipv6type in #(vi -solaris) #(vi +echo "configure:13424: checking for IPv6 library if required" >&5 +case $cf_cv_ipv6type in +(solaris) ;; -inria) #(vi +(inria) ;; -kame) #(vi +(kame) cf_ipv6lib=inet6 cf_ipv6dir=v6 ;; -linux-glibc) #(vi +(linux-glibc) ;; -linux-libinet6) #(vi +(linux-libinet6) cf_ipv6lib=inet6 cf_ipv6dir=inet6 ;; -toshiba) #(vi +(toshiba) cf_ipv6lib=inet6 cf_ipv6dir=v6 ;; -v6d) #(vi +(v6d) cf_ipv6lib=v6 cf_ipv6dir=v6 ;; -zeta) +(zeta) cf_ipv6lib=inet6 cf_ipv6dir=v6 ;; @@ -13038,7 +13454,7 @@ echo "$ac_t""$cf_ipv6lib" 1>&6 if test "$cf_ipv6lib" != "none"; then cat > conftest.$ac_ext < @@ -13049,7 +13465,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -13064,8 +13480,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -13090,18 +13506,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/include/$cf_ipv6dir/include && cf_search="$cf_search /usr/include/$cf_ipv6dir/include" - test -d /usr/$cf_ipv6dir/include && cf_search="$cf_search /usr/$cf_ipv6dir/include" - test -d /usr/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search /usr/$cf_ipv6dir/include/$cf_ipv6dir" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -13114,41 +13518,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/include/$cf_ipv6dir/include && cf_search="$cf_search /usr/local/include/$cf_ipv6dir/include" - test -d /usr/local/$cf_ipv6dir/include && cf_search="$cf_search /usr/local/$cf_ipv6dir/include" - test -d /usr/local/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search /usr/local/$cf_ipv6dir/include/$cf_ipv6dir" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/include/$cf_ipv6dir/include && cf_search="$cf_search /opt/include/$cf_ipv6dir/include" - test -d /opt/$cf_ipv6dir/include && cf_search="$cf_search /opt/$cf_ipv6dir/include" - test -d /opt/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search /opt/$cf_ipv6dir/include/$cf_ipv6dir" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/include/$cf_ipv6dir/include && cf_search="$cf_search $HOME/include/$cf_ipv6dir/include" - test -d $HOME/$cf_ipv6dir/include && cf_search="$cf_search $HOME/$cf_ipv6dir/include" - test -d $HOME/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $HOME/$cf_ipv6dir/include/$cf_ipv6dir" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/$cf_ipv6dir && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ipv6dir" + test -d $cf_subdir_prefix/include/$cf_ipv6dir/include && cf_search="$cf_search $cf_subdir_prefix/include/$cf_ipv6dir/include" + test -d $cf_subdir_prefix/$cf_ipv6dir/include && cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/include" + test -d $cf_subdir_prefix/$cf_ipv6dir/include/$cf_ipv6dir && cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/include/$cf_ipv6dir" } +done test "$includedir" != NONE && \ @@ -13197,14 +13587,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:13208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -13221,7 +13611,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}:13225: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:13615: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -13232,6 +13622,8 @@ echo "${as_me:-configure}:13225: testing else break fi + else + break fi done done @@ -13250,12 +13642,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:13254: checking for getaddrinfo" >&5 +echo "configure:13646: 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:13674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_getaddrinfo=yes" else @@ -13298,10 +13690,10 @@ else cf_save_LIBS="$LIBS" echo $ac_n "checking for getaddrinfo in -l$cf_ipv6lib""... $ac_c" 1>&6 -echo "configure:13302: checking for getaddrinfo in -l$cf_ipv6lib" >&5 +echo "configure:13694: checking for getaddrinfo in -l$cf_ipv6lib" >&5 LIBS="-l$cf_ipv6lib $LIBS" cat > conftest.$ac_ext < @@ -13312,7 +13704,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13708: \"$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' @@ -13328,8 +13720,8 @@ cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -13353,18 +13745,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/lib/$cf_ipv6dir/lib && cf_search="$cf_search /usr/lib/$cf_ipv6dir/lib" - test -d /usr/$cf_ipv6dir/lib && cf_search="$cf_search /usr/$cf_ipv6dir/lib" - test -d /usr/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search /usr/$cf_ipv6dir/lib/$cf_ipv6dir" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -13377,41 +13757,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/lib/$cf_ipv6dir/lib && cf_search="$cf_search /usr/local/lib/$cf_ipv6dir/lib" - test -d /usr/local/$cf_ipv6dir/lib && cf_search="$cf_search /usr/local/$cf_ipv6dir/lib" - test -d /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search /usr/local/$cf_ipv6dir/lib/$cf_ipv6dir" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/lib/$cf_ipv6dir/lib && cf_search="$cf_search /opt/lib/$cf_ipv6dir/lib" - test -d /opt/$cf_ipv6dir/lib && cf_search="$cf_search /opt/$cf_ipv6dir/lib" - test -d /opt/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search /opt/$cf_ipv6dir/lib/$cf_ipv6dir" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/lib/$cf_ipv6dir/lib && cf_search="$cf_search $HOME/lib/$cf_ipv6dir/lib" - test -d $HOME/$cf_ipv6dir/lib && cf_search="$cf_search $HOME/$cf_ipv6dir/lib" - test -d $HOME/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $HOME/$cf_ipv6dir/lib/$cf_ipv6dir" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/$cf_ipv6dir && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_ipv6dir" + test -d $cf_subdir_prefix/lib/$cf_ipv6dir/lib && cf_search="$cf_search $cf_subdir_prefix/lib/$cf_ipv6dir/lib" + test -d $cf_subdir_prefix/$cf_ipv6dir/lib && cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/lib" + test -d $cf_subdir_prefix/$cf_ipv6dir/lib/$cf_ipv6dir && cf_search="$cf_search $cf_subdir_prefix/$cf_ipv6dir/lib/$cf_ipv6dir" } +done cf_search="$cf_library_path_list $cf_search" @@ -13419,10 +13785,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:13423: checking for -l$cf_ipv6lib in $cf_libdir" >&5 +echo "configure:13789: checking for -l$cf_ipv6lib in $cf_libdir" >&5 LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS" cat > conftest.$ac_ext < @@ -13433,7 +13799,7 @@ int main() { getaddrinfo(0, 0, 0, 0) ; return 0; } EOF -if { (eval echo configure:13437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13803: \"$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' @@ -13466,7 +13832,7 @@ fi echo $ac_n "checking working getaddrinfo""... $ac_c" 1>&6 -echo "configure:13470: checking working getaddrinfo" >&5 +echo "configure:13836: checking working getaddrinfo" >&5 if eval "test \"`echo '$''{'cf_cv_getaddrinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13475,7 +13841,7 @@ if test "$cross_compiling" = yes; then cf_cv_getaddrinfo=unknown else cat > conftest.$ac_ext < @@ -13554,7 +13920,7 @@ int main() } EOF -if { (eval echo configure:13558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:13924: \"$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 @@ -13598,12 +13964,12 @@ fi for ac_func in getaddrinfo getnameinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13602: checking for $ac_func" >&5 +echo "configure:13968: 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:13996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -13655,27 +14021,27 @@ 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 +echo "configure:14025: 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 + if test "$enableval" != "no" ; then cat >> confdefs.h <<\EOF #define ENABLE_LONG_ARTICLE_NUMBERS 1 EOF - fi + fi else - enableval=no + 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:13679: checking whether to make a coffee while compiling" >&5 +echo "configure:14045: 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 @@ -13700,7 +14066,7 @@ fi ### checks for compiler characteristics echo $ac_n "checking for makeflags variable""... $ac_c" 1>&6 -echo "configure:13704: checking for makeflags variable" >&5 +echo "configure:14070: checking for makeflags variable" >&5 if eval "test \"`echo '$''{'cf_cv_makeflags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13715,18 +14081,18 @@ all : CF_EOF cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[ ]*$,,'` case "$cf_result" in - .*k) + (.*k|.*kw) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` case "$cf_result" in - .*CC=*) cf_cv_makeflags= + (.*CC=*) cf_cv_makeflags= ;; - *) cf_cv_makeflags=$cf_option + (*) cf_cv_makeflags=$cf_option ;; esac break ;; - .-) ;; - *) echo "given option \"$cf_option\", no match \"$cf_result\"" + (.-) ;; + (*) echo "given option \"$cf_option\", no match \"$cf_result\"" ;; esac done @@ -13746,12 +14112,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:13750: checking for working const" >&5 +echo "configure:14116: 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:14170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -13821,21 +14187,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:13825: checking for inline" >&5 +echo "configure:14191: 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:14205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -13862,13 +14228,13 @@ esac echo $ac_n "checking for ansi token expansion/substitution""... $ac_c" 1>&6 -echo "configure:13866: checking for ansi token expansion/substitution" >&5 +echo "configure:14232: 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:14246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_expands=yes else @@ -13897,13 +14263,13 @@ EOF echo $ac_n "checking for ansi token concatenation""... $ac_c" 1>&6 -echo "configure:13901: checking for ansi token concatenation" >&5 +echo "configure:14267: 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:14281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_cpp_concats=yes else @@ -13932,20 +14298,20 @@ EOF echo $ac_n "checking if nested parameters work""... $ac_c" 1>&6 -echo "configure:13936: checking if nested parameters work" >&5 +echo "configure:14302: 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:14315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_nested_params=yes else @@ -13968,12 +14334,12 @@ EOF ### Checks for header files. echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:13972: checking for ANSI C header files" >&5 +echo "configure:14338: 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 @@ -13981,7 +14347,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:13985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14351: \"$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* @@ -13998,7 +14364,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 @@ -14016,7 +14382,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 @@ -14037,7 +14403,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -14048,7 +14414,7 @@ if (XOR (islower (i), ISLOWER (i)) || to exit (0); } EOF -if { (eval echo configure:14052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:14418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -14076,12 +14442,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:14080: checking for $ac_hdr that defines DIR" >&5 +echo "configure:14446: 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> @@ -14089,7 +14455,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:14093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14459: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -14114,7 +14480,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:14118: checking for opendir in -ldir" >&5 +echo "configure:14484: 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 @@ -14122,7 +14488,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:14503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14155,7 +14521,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:14159: checking for opendir in -lx" >&5 +echo "configure:14525: 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 @@ -14163,7 +14529,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:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -14197,12 +14563,12 @@ fi fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:14201: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:14567: 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 @@ -14211,7 +14577,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:14215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -14232,12 +14598,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:14236: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:14602: 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 @@ -14253,7 +14619,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:14257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -14334,9 +14700,9 @@ for cf_hdr in \ do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:14338: checking for $cf_hdr" >&5 +echo "configure:14704: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -14344,7 +14710,7 @@ echo "configure:14338: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:14348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14714: \"$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* @@ -14382,17 +14748,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:14386: checking for $ac_hdr" >&5 +echo "configure:14752: 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:14396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14762: \"$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* @@ -14424,17 +14790,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:14428: checking for $ac_hdr" >&5 +echo "configure:14794: 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:14438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:14804: \"$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* @@ -14463,22 +14829,22 @@ done fi if test "$ac_cv_header_termios_h" = yes ; then case "$CFLAGS $CPPFLAGS" in - *-D_POSIX_SOURCE*) + (*-D_POSIX_SOURCE*) termios_bad=dunno ;; - *) termios_bad=maybe ;; + (*) termios_bad=maybe ;; esac if test "$termios_bad" = maybe ; then echo $ac_n "checking whether termios.h needs _POSIX_SOURCE""... $ac_c" 1>&6 -echo "configure:14473: checking whether termios.h needs _POSIX_SOURCE" >&5 +echo "configure:14839: 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:14482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14848: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=no else @@ -14487,7 +14853,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* termios_bad=unknown else @@ -14519,21 +14885,21 @@ fi echo $ac_n "checking declaration of size-change""... $ac_c" 1>&6 -echo "configure:14523: checking declaration of size-change" >&5 +echo "configure:14889: 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 - cf_cv_sizechange=unknown - cf_save_CPPFLAGS="$CPPFLAGS" + cf_cv_sizechange=unknown + cf_save_CPPFLAGS="$CPPFLAGS" for cf_opts in "" "NEED_PTEM_H" do - CPPFLAGS="$cf_save_CPPFLAGS" - test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts" - cat > conftest.$ac_ext < conftest.$ac_ext < #ifdef HAVE_TERMIOS_H @@ -14572,7 +14938,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:14576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sizechange=yes else @@ -14599,8 +14965,8 @@ if test "$cf_cv_sizechange" != no ; then #define HAVE_SIZECHANGE 1 EOF - case $cf_cv_sizechange in #(vi - NEED*) + case $cf_cv_sizechange in + (NEED*) cat >> confdefs.h <&6 -echo "configure:14615: checking if sys/time.h conflicts with sys/select.h" >&5 +echo "configure:14981: 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 @@ -14619,7 +14985,7 @@ else for cf_opts in no yes do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sys_select_timeval=$cf_opts break @@ -14671,12 +15037,12 @@ EOF ### Checks for Datatypes. echo $ac_n "checking for gid_t""... $ac_c" 1>&6 -echo "configure:14675: checking for gid_t" >&5 +echo "configure:15041: 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 @@ -14704,12 +15070,12 @@ EOF fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:14708: checking for mode_t" >&5 +echo "configure:15074: 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 @@ -14737,12 +15103,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:14741: checking for off_t" >&5 +echo "configure:15107: 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 @@ -14770,12 +15136,12 @@ EOF fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:14774: checking for pid_t" >&5 +echo "configure:15140: 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 @@ -14803,12 +15169,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:14807: checking for size_t" >&5 +echo "configure:15173: 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 @@ -14836,12 +15202,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:14840: checking for ssize_t" >&5 +echo "configure:15206: 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 @@ -14869,12 +15235,12 @@ EOF fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:14873: checking for time_t" >&5 +echo "configure:15239: 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 @@ -14902,7 +15268,7 @@ EOF fi cat > conftest.$ac_ext < EOF @@ -14913,7 +15279,7 @@ else rm -rf conftest* cat > conftest.$ac_ext < EOF @@ -14924,12 +15290,12 @@ 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 +echo "configure:15294: 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 @@ -14965,12 +15331,12 @@ 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 +echo "configure:15335: 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 @@ -15000,9 +15366,9 @@ fi echo $ac_n "checking for quad_t""... $ac_c" 1>&6 -echo "configure:15004: checking for quad_t" >&5 +echo "configure:15370: checking for quad_t" >&5 cat > conftest.$ac_ext < @@ -15015,7 +15381,7 @@ 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 +if { (eval echo configure:15385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_quad_t=yes else @@ -15034,9 +15400,9 @@ EOF fi echo $ac_n "checking for long long""... $ac_c" 1>&6 -echo "configure:15038: checking for long long" >&5 +echo "configure:15404: checking for long long" >&5 cat > conftest.$ac_ext < @@ -15045,7 +15411,7 @@ 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 +if { (eval echo configure:15415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_long_long=yes else @@ -15064,9 +15430,9 @@ EOF fi echo $ac_n "checking for int_least64_t""... $ac_c" 1>&6 -echo "configure:15068: checking for int_least64_t" >&5 +echo "configure:15434: checking for int_least64_t" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_least64_t=yes else @@ -15098,9 +15464,9 @@ EOF echo $ac_n "checking for INT64_C""... $ac_c" 1>&6 -echo "configure:15102: checking for INT64_C" >&5 +echo "configure:15468: checking for INT64_C" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_c=yes else @@ -15135,9 +15501,9 @@ fi echo $ac_n "checking for nl_item""... $ac_c" 1>&6 -echo "configure:15139: checking for nl_item" >&5 +echo "configure:15505: checking for nl_item" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_nl_item=yes else @@ -15174,7 +15540,7 @@ fi # 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 +echo "configure:15544: 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 @@ -15182,7 +15548,7 @@ else ac_save_LIBS="$LIBS" LIBS="-luu $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15210,17 +15576,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l 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 +echo "configure:15580: 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 < EOF 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; } +{ (eval echo configure:15590: \"$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* @@ -15262,20 +15628,23 @@ fi # - unorm_normalize() # - uidna_IDNToUnicode() # - ubidi_open() +# and for IDNA2008 +# - uidna_openUTS46() +# - uidna_nameToUnicode() 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 +echo "configure:15638: 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 < EOF 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; } +{ (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* @@ -15294,17 +15663,17 @@ if eval "test \"`echo '$ac_cv_header_'$a 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 +echo "configure:15667: 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; } +{ (eval echo configure:15677: \"$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* @@ -15330,12 +15699,12 @@ EOF EOF echo $ac_n "checking for unorm_normalize in libicuuc""... $ac_c" 1>&6 -echo "configure:15334: checking for unorm_normalize in libicuuc" >&5 +echo "configure:15703: checking for unorm_normalize in libicuuc" >&5 cf_save_LIBS="$LIBS" cf_try_icuuc="no" LIBS="$LIBS -licuuc" cat > conftest.$ac_ext < int main() { @@ -15345,7 +15714,7 @@ int main() { 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 +if { (eval echo configure:15718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF @@ -15364,17 +15733,17 @@ 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 +echo "configure:15737: 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 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; } +{ (eval echo configure:15747: \"$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* @@ -15402,17 +15771,17 @@ fi ac_safe=`echo "unicode/ubidi.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for unicode/ubidi.h""... $ac_c" 1>&6 -echo "configure:15406: checking for unicode/ubidi.h" >&5 +echo "configure:15775: 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 < EOF 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; } +{ (eval echo configure:15785: \"$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* @@ -15453,17 +15822,17 @@ fi 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 +echo "configure:15826: 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 cat > conftest.$ac_ext < EOF 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; } +{ (eval echo configure:15836: \"$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* @@ -15482,17 +15851,17 @@ if eval "test \"`echo '$ac_cv_header_'$a 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 +echo "configure:15855: 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 < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15865: \"$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* @@ -15518,12 +15887,12 @@ EOF EOF echo $ac_n "checking for u8_normalize in libunistring""... $ac_c" 1>&6 -echo "configure:15522: checking for u8_normalize in libunistring" >&5 +echo "configure:15891: checking for u8_normalize in libunistring" >&5 cf_save_LIBS="$LIBS" cf_try_unistring="no" LIBS="$LIBS -lunistring" cat > conftest.$ac_ext < #include @@ -15533,7 +15902,7 @@ int main() { 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 +if { (eval echo configure:15906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF @@ -15563,9 +15932,10 @@ fi fi # without icuuc try libidn for Internationalized Domain Names / IDN 2003 +# TODO: check for libidn2 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 +echo "configure:15939: 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 @@ -15573,7 +15943,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:15958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15601,17 +15971,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:15605: checking for stringprep.h" >&5 +echo "configure:15975: 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:15615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:15985: \"$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* @@ -15634,17 +16004,17 @@ EOF ac_safe=`echo "idna.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for idna.h""... $ac_c" 1>&6 -echo "configure:15638: checking for idna.h" >&5 +echo "configure:16008: 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:15648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16018: \"$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* @@ -15666,7 +16036,7 @@ if eval "test \"`echo '$ac_cv_header_'$a EOF 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 +echo "configure:16040: 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 @@ -15674,7 +16044,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:16059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15706,9 +16076,9 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l EOF echo $ac_n "checking for IDNA_USE_STD3_ASCII_RULES""... $ac_c" 1>&6 -echo "configure:15710: checking for IDNA_USE_STD3_ASCII_RULES" >&5 +echo "configure:16080: checking for IDNA_USE_STD3_ASCII_RULES" >&5 cat > conftest.$ac_ext < EOF @@ -15734,7 +16104,7 @@ else fi echo $ac_n "checking for idna_strerror in -lidn""... $ac_c" 1>&6 -echo "configure:15738: checking for idna_strerror in -lidn" >&5 +echo "configure:16108: 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 @@ -15742,7 +16112,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:16127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15802,7 +16172,7 @@ fi # 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 +echo "configure:16176: 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 @@ -15810,7 +16180,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lidnkit $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15839,17 +16209,17 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l 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 +echo "configure:16213: 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 < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:15853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:16223: \"$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* @@ -15867,11 +16237,11 @@ if eval "test \"`echo '$ac_cv_header_'$a echo "$ac_t""yes" 1>&6 echo $ac_n "checking for IDN_DECODE_LOOKUP""... $ac_c" 1>&6 -echo "configure:15871: checking for IDN_DECODE_LOOKUP" >&5 +echo "configure:16241: checking for IDN_DECODE_LOOKUP" >&5 cf_save_LIBS="$LIBS" LIBS="$LIBS -lidnkit" cat > conftest.$ac_ext < #include @@ -15884,7 +16254,7 @@ int main() { idn_result_tostring(rs); ; return 0; } EOF -if { (eval echo configure:15888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cat >> confdefs.h <<\EOF @@ -15932,24 +16302,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:16313: \"$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:16323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_termlib=terminfo else @@ -15961,7 +16331,7 @@ fi rm -rf conftest* test -n "$verbose" && echo " using functions in predefined $cf_cv_termlib LIBS" 1>&6 -echo "${as_me:-configure}:15965: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 +echo "${as_me:-configure}:16335: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5 @@ -15981,16 +16351,16 @@ if test "$cf_cv_termlib" = none; then for cf_func in tigetstr tgetstr do echo $ac_n "checking for $cf_func in -l$cf_lib""... $ac_c" 1>&6 -echo "configure:15985: checking for $cf_func in -l$cf_lib" >&5 +echo "configure:16355: 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:16364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -16017,7 +16387,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:16021: checking for initscr in -lcurses" >&5 +echo "configure:16391: 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 @@ -16025,7 +16395,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:16410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16051,13 +16421,29 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lcurses $LIBS" + +cf_add_libs="-lcurses" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:16061: checking for tgoto in -ltermcap" >&5 +echo "configure:16447: 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 @@ -16065,7 +16451,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:16466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -16091,7 +16477,23 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-ltermcap $LIBS" cf_cv_termlib=termcap + +cf_add_libs="-ltermcap" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_cv_termlib=termcap else echo "$ac_t""no" 1>&6 fi @@ -16109,11 +16511,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:16113: checking if we should include termcap.h" >&5 +echo "configure:16515: 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:16532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -16145,7 +16547,7 @@ EOF echo $ac_n "checking for term.h""... $ac_c" 1>&6 -echo "configure:16149: checking for term.h" >&5 +echo "configure:16551: 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 @@ -16156,8 +16558,8 @@ else cf_header_list="term.h ncurses/term.h ncursesw/term.h" -case ${cf_cv_ncurses_header:-curses.h} in #(vi -*/*) +case ${cf_cv_ncurses_header:-curses.h} in +(*/*) cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h cf_header_list="$cf_header_item $cf_header_list" ;; @@ -16166,7 +16568,7 @@ esac for cf_header in $cf_header_list do cat > conftest.$ac_ext < @@ -16175,7 +16577,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:16179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -16188,14 +16590,14 @@ fi rm -f conftest* done -case $cf_cv_term_header in #(vi -no) +case $cf_cv_term_header in +(no) # If curses is ncurses, some packagers still mess it up by trying to make # us use GNU termcap. This handles the most common case. for cf_header in ncurses/term.h ncursesw/term.h do cat > conftest.$ac_ext < @@ -16208,7 +16610,7 @@ int main() { WINDOW *x ; return 0; } EOF -if { (eval echo configure:16212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_term_header=$cf_header break @@ -16227,20 +16629,20 @@ fi echo "$ac_t""$cf_cv_term_header" 1>&6 -case $cf_cv_term_header in #(vi -term.h) #(vi +case $cf_cv_term_header in +(term.h) cat >> confdefs.h <<\EOF #define HAVE_TERM_H 1 EOF ;; -ncurses/term.h) #(vi +(ncurses/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSES_TERM_H 1 EOF ;; -ncursesw/term.h) +(ncursesw/term.h) cat >> confdefs.h <<\EOF #define HAVE_NCURSESW_TERM_H 1 EOF @@ -16251,7 +16653,7 @@ esac echo $ac_n "checking if we should include curses.h or termcap.h""... $ac_c" 1>&6 -echo "configure:16255: checking if we should include curses.h or termcap.h" >&5 +echo "configure:16657: 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 @@ -16269,7 +16671,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:16683: \"$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 @@ -16290,7 +16692,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:16704: \"$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 @@ -16339,7 +16741,7 @@ fi echo "$ac_t""$cf_cv_need_curses_h" 1>&6 case $cf_cv_need_curses_h in -both) #(vi +(both) cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <&6 -echo "configure:16378: checking declaration of tputs 3rd param" >&5 +echo "configure:16780: 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 @@ -16390,10 +16792,10 @@ for Q in int void; do for R in int char; do for S in "" const; do -echo "${as_me:-configure}:16394: testing loop variables P:$P, Q:$Q, R:$R, S:$S ..." 1>&5 +echo "${as_me:-configure}:16796: 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:16808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_outchar="$Q OutChar($R)" cf_cv_found=yes @@ -16425,7 +16827,7 @@ fi echo "$ac_t""$cf_cv_type_outchar" 1>&6 case $cf_cv_type_outchar in -int*) +(int*) cat >> confdefs.h <<\EOF #define OUTC_RETURN 1 EOF @@ -16433,7 +16835,7 @@ EOF ;; esac case $cf_cv_type_outchar in -*char*) +(*char*) cat >> confdefs.h <<\EOF #define OUTC_ARGS char c EOF @@ -16457,14 +16859,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:16870: \"$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 @@ -16483,13 +16885,13 @@ fi echo $ac_n "checking if external errno is declared""... $ac_c" 1>&6 -echo "configure:16487: checking if external errno is declared" >&5 +echo "configure:16889: 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 < conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_errno=yes else @@ -16518,10 +16920,10 @@ fi echo "$ac_t""$cf_cv_dcl_errno" 1>&6 if test "$cf_cv_dcl_errno" = no ; then - + cf_result=`echo "decl_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:16534: checking if external errno exists" >&5 +echo "configure:16936: 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 < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_have_errno=yes else @@ -16562,10 +16964,10 @@ fi echo "$ac_t""$cf_cv_have_errno" 1>&6 if test "$cf_cv_have_errno" = yes ; then - + cf_result=`echo "have_errno" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:16582: checking for $ac_func" >&5 +echo "configure:16984: 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:17012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -16633,13 +17035,13 @@ else echo $ac_n "checking if external sys_nerr is declared""... $ac_c" 1>&6 -echo "configure:16637: checking if external sys_nerr is declared" >&5 +echo "configure:17039: 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 < conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_nerr=yes else @@ -16668,10 +17070,10 @@ fi echo "$ac_t""$cf_cv_dcl_sys_nerr" 1>&6 if test "$cf_cv_dcl_sys_nerr" = no ; then - + cf_result=`echo "decl_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:16684: checking if external sys_nerr exists" >&5 +echo "configure:17086: 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 < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_have_sys_nerr=yes else @@ -16712,10 +17114,10 @@ fi echo "$ac_t""$cf_cv_have_sys_nerr" 1>&6 if test "$cf_cv_have_sys_nerr" = yes ; then - + cf_result=`echo "have_sys_nerr" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:16729: checking if external sys_errlist is declared" >&5 +echo "configure:17131: 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 < conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_dcl_sys_errlist=yes else @@ -16760,10 +17162,10 @@ fi echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6 if test "$cf_cv_dcl_sys_errlist" = no ; then - + cf_result=`echo "decl_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:16776: checking if external sys_errlist exists" >&5 +echo "configure:17178: 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 < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_have_sys_errlist=yes else @@ -16804,10 +17206,10 @@ fi echo "$ac_t""$cf_cv_have_sys_errlist" 1>&6 if test "$cf_cv_have_sys_errlist" = yes ; then - + cf_result=`echo "have_sys_errlist" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` - cat >> confdefs.h <> confdefs.h <&6 -echo "configure:16894: checking for $ac_func" >&5 +echo "configure:17296: 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:17324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -16944,12 +17346,12 @@ done echo $ac_n "checking for flock""... $ac_c" 1>&6 -echo "configure:16948: checking for flock" >&5 +echo "configure:17350: 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:17378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_flock=yes" else @@ -16994,7 +17396,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for flock in -lbsd""... $ac_c" 1>&6 -echo "configure:16998: checking for flock in -lbsd" >&5 +echo "configure:17400: 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 @@ -17002,7 +17404,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:17419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17042,12 +17444,12 @@ fi # clock_gettime() / librt echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 -echo "configure:17046: checking for clock_gettime" >&5 +echo "configure:17448: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_clock_gettime=yes" else @@ -17092,7 +17494,7 @@ 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 +echo "configure:17498: 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 @@ -17100,7 +17502,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -17143,12 +17545,12 @@ fi echo $ac_n "checking for wide char and multibyte support""... $ac_c" 1>&6 -echo "configure:17147: checking for wide char and multibyte support" >&5 +echo "configure:17549: 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 @@ -17202,7 +17604,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:17206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=yes else @@ -17212,7 +17614,7 @@ else cf_save_LIBS="$LIBS" LIBS="-lutf8 $LIBS" cat > conftest.$ac_ext < int main() { @@ -17256,7 +17658,7 @@ const char icb[5] = {0xa4, 0xa4, 0xa4, 0 wcsncat(wcb2, wcb, 5); ; return 0; } EOF -if { (eval echo configure:17260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_multibyte_able=libutf8 else @@ -17290,9 +17692,9 @@ EOF echo $ac_n "checking if gettimeofday takes two arguments""... $ac_c" 1>&6 -echo "configure:17294: checking if gettimeofday takes two arguments" >&5 +echo "configure:17696: checking if gettimeofday takes two arguments" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17710: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_gettimeofday_2args=yes else @@ -17323,12 +17725,12 @@ EOF fi echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:17327: checking return type of signal handlers" >&5 +echo "configure:17729: 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 @@ -17345,7 +17747,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:17349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -17365,7 +17767,7 @@ EOF echo $ac_n "checking declaration of signal arguments""... $ac_c" 1>&6 -echo "configure:17369: checking declaration of signal arguments" >&5 +echo "configure:17771: 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 @@ -17374,7 +17776,7 @@ cf_cv_sig_args= for cf_test in "int sig" "int sig, ..." do cat > conftest.$ac_ext < @@ -17382,7 +17784,7 @@ int main() { extern RETSIGTYPE catch($cf_test); signal(SIGINT, catch) ; return 0; } EOF -if { (eval echo configure:17386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sig_args="$cf_test";break else @@ -17408,13 +17810,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:17412: checking whether sigaction needs _POSIX_SOURCE" >&5 +echo "configure:17814: 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 < @@ -17423,7 +17825,7 @@ int main() { struct sigaction act ; return 0; } EOF -if { (eval echo configure:17427: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17829: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_sigact_bad=no else @@ -17444,13 +17846,13 @@ EOF echo $ac_n "checking if we have sigaction/related functions""... $ac_c" 1>&6 -echo "configure:17448: checking if we have sigaction/related functions" >&5 +echo "configure:17850: 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:17874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_sigaction_funcs=yes else @@ -17490,7 +17892,7 @@ EOF fi echo $ac_n "checking for fork""... $ac_c" 1>&6 -echo "configure:17494: checking for fork" >&5 +echo "configure:17896: checking for fork" >&5 if eval "test \"`echo '$''{'cf_cv_func_fork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17499,7 +17901,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:17915: \"$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 @@ -17531,12 +17933,12 @@ EOF echo $ac_n "checking for memmove""... $ac_c" 1>&6 -echo "configure:17535: checking for memmove" >&5 +echo "configure:17937: 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:17965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_memmove=yes" else @@ -17578,12 +17980,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for bcopy""... $ac_c" 1>&6 -echo "configure:17582: checking for bcopy" >&5 +echo "configure:17984: 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:18012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_bcopy=yes" else @@ -17622,7 +18024,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:17626: checking if bcopy does overlapping moves" >&5 +echo "configure:18028: 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 @@ -17631,7 +18033,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:18050: \"$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 @@ -17682,9 +18084,9 @@ fi echo $ac_n "checking if select expects int * arguments""... $ac_c" 1>&6 -echo "configure:17686: checking if select expects int * arguments" >&5 +echo "configure:18088: checking if select expects int * arguments" >&5 cat > conftest.$ac_ext < EOF @@ -17704,7 +18106,7 @@ rm -f conftest* echo $ac_n "checking whether closedir returns void""... $ac_c" 1>&6 -echo "configure:17708: checking whether closedir returns void" >&5 +echo "configure:18110: 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 @@ -17712,13 +18114,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:17722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18124: \"$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 @@ -17744,7 +18146,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:17748: checking whether setvbuf arguments are reversed" >&5 +echo "configure:18150: 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 @@ -17752,7 +18154,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. */ @@ -17766,7 +18168,7 @@ main () { exit(0); /* Non-reversed systems segv here. */ } EOF -if { (eval echo configure:17770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18172: \"$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 @@ -17804,12 +18206,12 @@ for ac_func in \ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17808: checking for $ac_func" >&5 +echo "configure:18210: 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:18238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -17859,13 +18261,13 @@ done echo $ac_n "checking for type sigaction_t""... $ac_c" 1>&6 -echo "configure:17863: checking for type sigaction_t" >&5 +echo "configure:18265: 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 < @@ -17873,7 +18275,7 @@ int main() { sigaction_t x ; return 0; } EOF -if { (eval echo configure:17877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_type_sigaction=yes else @@ -17893,13 +18295,13 @@ EOF echo $ac_n "checking for nonconflicting termios.h""... $ac_c" 1>&6 -echo "configure:17897: checking for nonconflicting termios.h" >&5 +echo "configure:18299: 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:18327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_use_termios_h=yes else @@ -17952,13 +18354,13 @@ fi echo $ac_n "checking for passwd.pw_gecos""... $ac_c" 1>&6 -echo "configure:17956: checking for passwd.pw_gecos" >&5 +echo "configure:18358: 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 < @@ -17969,7 +18371,7 @@ int main() { char bar = foo.pw_gecos ; return 0; } EOF -if { (eval echo configure:17973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_pw_gecos=yes else @@ -17989,13 +18391,13 @@ EOF echo $ac_n "checking for tm.tm_gmtoff""... $ac_c" 1>&6 -echo "configure:17993: checking for tm.tm_gmtoff" >&5 +echo "configure:18395: 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:18421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_tm_gmtoff=yes else @@ -18035,7 +18437,7 @@ EOF echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:18039: checking for long file names" >&5 +echo "configure:18441: 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 @@ -18083,17 +18485,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:18087: checking for $ac_hdr" >&5 +echo "configure:18489: 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:18097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18499: \"$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* @@ -18130,17 +18532,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:18134: checking for $ac_hdr" >&5 +echo "configure:18536: 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:18144: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18546: \"$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* @@ -18170,17 +18572,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:18174: checking for $ac_hdr" >&5 +echo "configure:18576: 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:18184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18586: \"$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* @@ -18221,13 +18623,13 @@ fi echo $ac_n "checking for union wait""... $ac_c" 1>&6 -echo "configure:18225: checking for union wait" >&5 +echo "configure:18627: 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:18644: \"$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 @@ -18249,7 +18651,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18670: \"$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 @@ -18289,7 +18691,7 @@ EOF echo $ac_n "checking if the system function returns usable child-status""... $ac_c" 1>&6 -echo "configure:18293: checking if the system function returns usable child-status" >&5 +echo "configure:18695: 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 @@ -18298,7 +18700,7 @@ else cf_cv_system_status=unknown else cat > conftest.$ac_ext < @@ -18331,7 +18733,7 @@ int main() } EOF -if { (eval echo configure:18335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18737: \"$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 @@ -18342,11 +18744,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:18752: \"$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 @@ -18389,13 +18791,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:18393: checking for obsolete/broken version of ncurses" >&5 +echo "configure:18795: 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 < @@ -18409,7 +18811,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:18413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_ncurses_broken=no else @@ -18434,13 +18836,13 @@ fi echo $ac_n "checking if curses supports color attributes""... $ac_c" 1>&6 -echo "configure:18438: checking if curses supports color attributes" >&5 +echo "configure:18840: 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 < @@ -18455,7 +18857,7 @@ chtype x = COLOR_BLUE; ; return 0; } EOF -if { (eval echo configure:18459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_color_curses=yes else @@ -18506,7 +18908,7 @@ if test $check_sig_const = yes ; then echo $ac_n "checking for redefinable signal constants""... $ac_c" 1>&6 -echo "configure:18510: checking for redefinable signal constants" >&5 +echo "configure:18912: 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 @@ -18518,7 +18920,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:18951: \"$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 @@ -18571,13 +18973,13 @@ fi echo $ac_n "checking for ANSI qsort""... $ac_c" 1>&6 -echo "configure:18575: checking for ANSI qsort" >&5 +echo "configure:18977: 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:18995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_cv_comptype=yes else @@ -18617,7 +19019,7 @@ fi echo $ac_n "checking if application can dump core""... $ac_c" 1>&6 -echo "configure:18621: checking if application can dump core" >&5 +echo "configure:19023: 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 @@ -18626,7 +19028,7 @@ else cf_cv_corefile=unknown else cat > conftest.$ac_ext < @@ -18667,7 +19069,7 @@ int main() #endif } EOF -if { (eval echo configure:18671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:19073: \"$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 @@ -18715,18 +19117,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:18719: checking for missing "${ac_func}" extern" >&5 +echo "configure:19121: 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}:18725: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19127: 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:19146: \"$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 @@ -18748,7 +19150,7 @@ if { (eval echo configure:18744: \"$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:19164: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -18807,18 +19209,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:18811: checking for missing "${ac_func}" extern" >&5 +echo "configure:19213: 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}:18817: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19219: 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:19238: \"$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 @@ -18840,7 +19242,7 @@ if { (eval echo configure:18836: \"$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:19256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -18897,18 +19299,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:18901: checking for missing "${ac_func}" extern" >&5 +echo "configure:19303: 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}:18907: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19309: 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:19328: \"$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 @@ -18930,7 +19332,7 @@ if { (eval echo configure:18926: \"$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:19346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -19043,18 +19445,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:19047: checking for missing "${ac_func}" extern" >&5 +echo "configure:19449: 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}:19053: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19455: 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:19474: \"$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 @@ -19076,7 +19478,7 @@ if { (eval echo configure:19072: \"$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:19492: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -19130,18 +19532,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:19134: checking for missing "${ac_func}" extern" >&5 +echo "configure:19536: 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}:19140: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19542: 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:19561: \"$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 @@ -19163,7 +19565,7 @@ if { (eval echo configure:19159: \"$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:19579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -19220,18 +19622,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:19224: checking for missing "${ac_func}" extern" >&5 +echo "configure:19626: 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}:19230: testing for missing "${ac_func}" external ..." 1>&5 +echo "${as_me:-configure}:19632: 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:19651: \"$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 @@ -19253,7 +19655,7 @@ if { (eval echo configure:19249: \"$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:19669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval 'cf_cv_func_'${ac_func}'=yes' else @@ -19301,7 +19703,7 @@ fi echo $ac_n "checking for working TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:19305: checking for working TIOCGWINSZ" >&5 +echo "configure:19707: 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 @@ -19312,7 +19714,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:19743: \"$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 @@ -19384,7 +19786,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:19388: checking for $ac_word" >&5 +echo "configure:19790: 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 @@ -19414,19 +19816,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:19418: checking for working alloca.h" >&5 +echo "configure:19820: 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:19430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_header_alloca_h=yes else @@ -19447,12 +19849,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:19451: checking for alloca" >&5 +echo "configure:19853: 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:19886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_func_alloca_works=yes else @@ -19512,12 +19914,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:19516: checking whether alloca needs Cray hooks" >&5 +echo "configure:19918: 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:19546: checking for $ac_func" >&5 +echo "configure:19948: 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:19976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -19597,7 +19999,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:19601: checking stack direction for C alloca" >&5 +echo "configure:20003: 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 @@ -19605,7 +20007,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:20030: \"$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 @@ -19649,17 +20051,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:19653: checking for $ac_hdr" >&5 +echo "configure:20055: 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:19663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20065: \"$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* @@ -19688,12 +20090,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19692: checking for $ac_func" >&5 +echo "configure:20094: 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:20122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -19741,7 +20143,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:19745: checking for working mmap" >&5 +echo "configure:20147: 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 @@ -19749,7 +20151,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:20295: \"$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 @@ -19912,13 +20314,13 @@ EOF fi - echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:19917: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 +echo "configure:20319: 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 < @@ -19939,14 +20341,11 @@ else fi rm -f conftest* - - fi echo "$ac_t""$ac_cv_gnu_library_2_1" 1>&6 - - GLIBC21="$ac_cv_gnu_library_2_1" - + + GLIBC21="$ac_cv_gnu_library_2_1" cf_makefile=Makefile @@ -19976,17 +20375,17 @@ 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:19980: checking for $ac_hdr" >&5 +echo "configure:20379: 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:19990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:20389: \"$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* @@ -20017,12 +20416,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:20021: checking for $ac_func" >&5 +echo "configure:20420: 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:20448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -20078,13 +20477,13 @@ if test "${with_libiconv_prefix+set}" = withval="$with_libiconv_prefix" - case "$withval" in #(vi - no) #(vi - ;; - yes) #(vi - ;; - *) - +case "$withval" in +(no) + ;; +(yes) + ;; +(*) + for cf_searchpath in `echo "$withval" | tr $PATH_SEPARATOR ' '`; do if test -d $cf_searchpath/include; then @@ -20113,14 +20512,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:20124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20137,7 +20536,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}:20141: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20540: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -20148,6 +20547,8 @@ echo "${as_me:-configure}:20141: testing else break fi + else + break fi done done @@ -20179,14 +20580,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:20190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20591: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20203,7 +20604,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}:20207: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:20608: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -20214,6 +20615,8 @@ echo "${as_me:-configure}:20207: testing else break fi + else + break fi done done @@ -20225,61 +20628,61 @@ fi if test -d $cf_searchpath/lib; then if test -n "$cf_searchpath/lib" ; then - for cf_add_libdir in $cf_searchpath/lib - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_searchpath/lib + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:20247: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20650: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi elif test -d $cf_searchpath ; then if test -n "$cf_searchpath" ; then - for cf_add_libdir in $cf_searchpath - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_searchpath + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:20277: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:20680: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi else @@ -20287,15 +20690,15 @@ fi fi done - ;; - esac + ;; +esac fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:20299: checking for iconv" >&5 +echo "configure:20702: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -20308,13 +20711,13 @@ cf_cv_header_path_iconv= cf_cv_library_path_iconv= -echo "${as_me:-configure}:20312: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 +echo "${as_me:-configure}:20715: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5 cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -20328,7 +20731,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_iconv=yes @@ -20344,7 +20747,7 @@ else LIBS="-liconv $cf_save_LIBS" cat > conftest.$ac_ext < @@ -20358,7 +20761,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_iconv=yes @@ -20374,19 +20777,19 @@ else cf_cv_find_linkage_iconv=no LIBS="$cf_save_LIBS" - test -n "$verbose" && echo " find linkage for iconv library" 1>&6 + test -n "$verbose" && echo " find linkage for iconv library" 1>&6 -echo "${as_me:-configure}:20380: testing find linkage for iconv library ..." 1>&5 +echo "${as_me:-configure}:20783: testing find linkage for iconv library ..." 1>&5 - -echo "${as_me:-configure}:20384: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 + +echo "${as_me:-configure}:20787: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5 - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" - + cf_search= # collect the current set of include-directories from compiler flags @@ -20394,8 +20797,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -20420,18 +20823,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/include/iconv/include && cf_search="$cf_search /usr/include/iconv/include" - test -d /usr/iconv/include && cf_search="$cf_search /usr/iconv/include" - test -d /usr/iconv/include/iconv && cf_search="$cf_search /usr/iconv/include/iconv" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -20444,41 +20835,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/include/iconv/include && cf_search="$cf_search /usr/local/include/iconv/include" - test -d /usr/local/iconv/include && cf_search="$cf_search /usr/local/iconv/include" - test -d /usr/local/iconv/include/iconv && cf_search="$cf_search /usr/local/iconv/include/iconv" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/include/iconv/include && cf_search="$cf_search /opt/include/iconv/include" - test -d /opt/iconv/include && cf_search="$cf_search /opt/iconv/include" - test -d /opt/iconv/include/iconv && cf_search="$cf_search /opt/iconv/include/iconv" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/include/iconv/include && cf_search="$cf_search $HOME/include/iconv/include" - test -d $HOME/iconv/include && cf_search="$cf_search $HOME/iconv/include" - test -d $HOME/iconv/include/iconv && cf_search="$cf_search $HOME/iconv/include/iconv" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/iconv && cf_search="$cf_search $cf_subdir_prefix/include/iconv" + test -d $cf_subdir_prefix/include/iconv/include && cf_search="$cf_search $cf_subdir_prefix/include/iconv/include" + test -d $cf_subdir_prefix/iconv/include && cf_search="$cf_search $cf_subdir_prefix/iconv/include" + test -d $cf_subdir_prefix/iconv/include/iconv && cf_search="$cf_search $cf_subdir_prefix/iconv/include/iconv" } +done test "$includedir" != NONE && \ @@ -20497,17 +20874,17 @@ test -d "$oldincludedir" && { cf_search="$cf_search $cf_header_path_list" - for cf_cv_header_path_iconv in $cf_search - do - if test -d $cf_cv_header_path_iconv ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_iconv" 1>&6 + for cf_cv_header_path_iconv in $cf_search + do + 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}:20506: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:20883: testing ... testing $cf_cv_header_path_iconv ..." 1>&5 - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv" - cat > conftest.$ac_ext < conftest.$ac_ext < @@ -20521,49 +20898,49 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20902: \"$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 + test -n "$verbose" && echo " ... found iconv headers in $cf_cv_header_path_iconv" 1>&6 -echo "${as_me:-configure}:20530: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 +echo "${as_me:-configure}:20907: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5 - cf_cv_find_linkage_iconv=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + cf_cv_find_linkage_iconv=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" - + CPPFLAGS="$cf_save_CPPFLAGS" + fi rm -f conftest* - fi - done + fi + done - if test "$cf_cv_find_linkage_iconv" = maybe ; then + if test "$cf_cv_find_linkage_iconv" = maybe ; then - -echo "${as_me:-configure}:20551: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 + +echo "${as_me:-configure}:20928: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5 - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - + - if test "$cf_cv_find_linkage_iconv" != yes ; then - + if test "$cf_cv_find_linkage_iconv" != yes ; then + cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -20587,18 +20964,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/lib/iconv/lib && cf_search="$cf_search /usr/lib/iconv/lib" - test -d /usr/iconv/lib && cf_search="$cf_search /usr/iconv/lib" - test -d /usr/iconv/lib/iconv && cf_search="$cf_search /usr/iconv/lib/iconv" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -20611,58 +20976,44 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/lib/iconv/lib && cf_search="$cf_search /usr/local/lib/iconv/lib" - test -d /usr/local/iconv/lib && cf_search="$cf_search /usr/local/iconv/lib" - test -d /usr/local/iconv/lib/iconv && cf_search="$cf_search /usr/local/iconv/lib/iconv" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/lib/iconv/lib && cf_search="$cf_search /opt/lib/iconv/lib" - test -d /opt/iconv/lib && cf_search="$cf_search /opt/iconv/lib" - test -d /opt/iconv/lib/iconv && cf_search="$cf_search /opt/iconv/lib/iconv" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/lib/iconv/lib && cf_search="$cf_search $HOME/lib/iconv/lib" - test -d $HOME/iconv/lib && cf_search="$cf_search $HOME/iconv/lib" - test -d $HOME/iconv/lib/iconv && cf_search="$cf_search $HOME/iconv/lib/iconv" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/iconv && cf_search="$cf_search $cf_subdir_prefix/lib/iconv" + test -d $cf_subdir_prefix/lib/iconv/lib && cf_search="$cf_search $cf_subdir_prefix/lib/iconv/lib" + test -d $cf_subdir_prefix/iconv/lib && cf_search="$cf_search $cf_subdir_prefix/iconv/lib" + test -d $cf_subdir_prefix/iconv/lib/iconv && cf_search="$cf_search $cf_subdir_prefix/iconv/lib/iconv" } +done cf_search="$cf_library_path_list $cf_search" - for cf_cv_library_path_iconv in $cf_search - do - 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}:20659: testing ... testing $cf_cv_library_path_iconv ..." 1>&5 + for cf_cv_library_path_iconv in $cf_search + do + 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}:21010: 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 < conftest.$ac_ext < @@ -20676,38 +21027,38 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21031: \"$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 + test -n "$verbose" && echo " ... found iconv library in $cf_cv_library_path_iconv" 1>&6 -echo "${as_me:-configure}:20685: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 +echo "${as_me:-configure}:21036: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5 - cf_cv_find_linkage_iconv=yes - cf_cv_library_file_iconv="-liconv" - break + cf_cv_find_linkage_iconv=yes + cf_cv_library_file_iconv="-liconv" + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" + fi rm -rf conftest* - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi - else - cf_cv_find_linkage_iconv=no - fi - + else + cf_cv_find_linkage_iconv=no + fi + fi rm -rf conftest* @@ -20733,13 +21084,13 @@ EOF echo $ac_n "checking if the declaration of iconv() needs const.""... $ac_c" 1>&6 -echo "configure:20737: checking if the declaration of iconv() needs const." >&5 +echo "configure:21088: 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 < @@ -20759,7 +21110,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:20763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21114: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_const=no else @@ -20812,14 +21163,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:20823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -20836,7 +21187,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}:20840: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:21191: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -20847,6 +21198,8 @@ echo "${as_me:-configure}:20840: testing else break fi + else + break fi done done @@ -20856,31 +21209,31 @@ fi LIBICONV="-liconv" if test -n "$cf_cv_library_path_iconv" ; then - for cf_add_libdir in $cf_cv_library_path_iconv - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_cv_library_path_iconv + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:20878: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21231: testing adding $cf_add_libdir to library-path ..." 1>&5 - LDFLAGS="-L$cf_add_libdir $LDFLAGS" - fi - fi - done + LDFLAGS="-L$cf_add_libdir $LDFLAGS" + fi + fi + done fi fi @@ -20889,20 +21242,20 @@ fi - echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:20894: checking for nl_langinfo and CODESET" >&5 +echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 +echo "configure:21247: 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:20906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_langinfo_codeset=yes else @@ -20912,32 +21265,32 @@ else am_cv_langinfo_codeset=no fi rm -rf conftest* - + fi echo "$ac_t""$am_cv_langinfo_codeset" 1>&6 - if test $am_cv_langinfo_codeset = yes; then - cat >> confdefs.h <<\EOF + if test $am_cv_langinfo_codeset = yes; then + cat >> confdefs.h <<\EOF #define HAVE_LANGINFO_CODESET 1 EOF - fi + fi if test $ac_cv_header_locale_h = yes; then - echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:20929: checking for LC_MESSAGES" >&5 + echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 +echo "configure:21282: 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:20941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then am_cv_val_LC_MESSAGES=yes else @@ -20950,15 +21303,15 @@ rm -rf conftest* fi echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6 - if test $am_cv_val_LC_MESSAGES = yes; then - cat >> confdefs.h <<\EOF + if test $am_cv_val_LC_MESSAGES = yes; then + cat >> confdefs.h <<\EOF #define HAVE_LC_MESSAGES 1 EOF - fi - fi + fi +fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:20962: checking whether NLS is requested" >&5 +echo "configure:21315: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. @@ -20982,7 +21335,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:20986: checking whether included gettext is requested" >&5 +echo "configure:21339: 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 @@ -20999,9 +21352,25 @@ fi CATOBJEXT=NONE cf_save_LIBS_1="$LIBS" - LIBS="$LIBICONV $LIBS" + +cf_add_libs="$LIBICONV" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + echo $ac_n "checking for libintl.h and gettext()""... $ac_c" 1>&6 -echo "configure:21005: checking for libintl.h and gettext()" >&5 +echo "configure:21374: 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 @@ -21014,13 +21383,13 @@ cf_cv_header_path_intl= cf_cv_library_path_intl= -echo "${as_me:-configure}:21018: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 +echo "${as_me:-configure}:21387: testing Starting FIND_LINKAGE(intl,) ..." 1>&5 cf_save_LIBS="$LIBS" cat > conftest.$ac_ext < @@ -21028,14 +21397,14 @@ extern int _nl_msg_cat_cntr; int main() { - bindtextdomain ("", ""); - return (int) gettext ("") - - + _nl_msg_cat_cntr + bindtextdomain ("", ""); + return (int) gettext ("") + + + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:21039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_intl=yes @@ -21051,7 +21420,7 @@ else LIBS="-lintl $cf_save_LIBS" cat > conftest.$ac_ext < @@ -21059,14 +21428,14 @@ extern int _nl_msg_cat_cntr; int main() { - bindtextdomain ("", ""); - return (int) gettext ("") - - + _nl_msg_cat_cntr + bindtextdomain ("", ""); + return (int) gettext ("") + + + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:21070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_find_linkage_intl=yes @@ -21082,19 +21451,19 @@ else cf_cv_find_linkage_intl=no LIBS="$cf_save_LIBS" - test -n "$verbose" && echo " find linkage for intl library" 1>&6 + test -n "$verbose" && echo " find linkage for intl library" 1>&6 -echo "${as_me:-configure}:21088: testing find linkage for intl library ..." 1>&5 +echo "${as_me:-configure}:21457: testing find linkage for intl library ..." 1>&5 - -echo "${as_me:-configure}:21092: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 + +echo "${as_me:-configure}:21461: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5 - cf_save_CPPFLAGS="$CPPFLAGS" - cf_test_CPPFLAGS="$CPPFLAGS" + cf_save_CPPFLAGS="$CPPFLAGS" + cf_test_CPPFLAGS="$CPPFLAGS" - + cf_search= # collect the current set of include-directories from compiler flags @@ -21102,8 +21471,8 @@ cf_header_path_list="" if test -n "${CFLAGS}${CPPFLAGS}" ; then for cf_header_path in $CPPFLAGS $CFLAGS do - case $cf_header_path in #(vi - -I*) + case $cf_header_path in + (-I*) cf_header_path=`echo ".$cf_header_path" |sed -e 's/^...//' -e 's,/include$,,'` test "x$cf_header_path" != "xNONE" && \ @@ -21128,18 +21497,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/include/intl/include && cf_search="$cf_search /usr/include/intl/include" - test -d /usr/intl/include && cf_search="$cf_search /usr/intl/include" - test -d /usr/intl/include/intl && cf_search="$cf_search /usr/intl/include/intl" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -21152,41 +21509,27 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/include/intl/include && cf_search="$cf_search /usr/local/include/intl/include" - test -d /usr/local/intl/include && cf_search="$cf_search /usr/local/intl/include" - test -d /usr/local/intl/include/intl && cf_search="$cf_search /usr/local/intl/include/intl" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/include/intl/include && cf_search="$cf_search /opt/include/intl/include" - test -d /opt/intl/include && cf_search="$cf_search /opt/intl/include" - test -d /opt/intl/include/intl && cf_search="$cf_search /opt/intl/include/intl" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/include/intl/include && cf_search="$cf_search $HOME/include/intl/include" - test -d $HOME/intl/include && cf_search="$cf_search $HOME/intl/include" - test -d $HOME/intl/include/intl && cf_search="$cf_search $HOME/intl/include/intl" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for include-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/include && cf_search="$cf_search $cf_subdir_prefix/include" + test -d $cf_subdir_prefix/include/intl && cf_search="$cf_search $cf_subdir_prefix/include/intl" + test -d $cf_subdir_prefix/include/intl/include && cf_search="$cf_search $cf_subdir_prefix/include/intl/include" + test -d $cf_subdir_prefix/intl/include && cf_search="$cf_search $cf_subdir_prefix/intl/include" + test -d $cf_subdir_prefix/intl/include/intl && cf_search="$cf_search $cf_subdir_prefix/intl/include/intl" } +done test "$includedir" != NONE && \ @@ -21205,17 +21548,17 @@ test -d "$oldincludedir" && { cf_search="$cf_search $cf_header_path_list" - for cf_cv_header_path_intl in $cf_search - do - if test -d $cf_cv_header_path_intl ; then - test -n "$verbose" && echo " ... testing $cf_cv_header_path_intl" 1>&6 + for cf_cv_header_path_intl in $cf_search + do + 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}:21214: testing ... testing $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:21557: testing ... testing $cf_cv_header_path_intl ..." 1>&5 - CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl" - cat > conftest.$ac_ext < conftest.$ac_ext < @@ -21223,56 +21566,56 @@ extern int _nl_msg_cat_cntr; int main() { - bindtextdomain ("", ""); - return (int) gettext ("") - - + _nl_msg_cat_cntr + bindtextdomain ("", ""); + return (int) gettext ("") + + + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:21234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21577: \"$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 + test -n "$verbose" && echo " ... found intl headers in $cf_cv_header_path_intl" 1>&6 -echo "${as_me:-configure}:21239: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 +echo "${as_me:-configure}:21582: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5 - cf_cv_find_linkage_intl=maybe - cf_test_CPPFLAGS="$CPPFLAGS" - break + cf_cv_find_linkage_intl=maybe + cf_test_CPPFLAGS="$CPPFLAGS" + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 rm -rf conftest* - CPPFLAGS="$cf_save_CPPFLAGS" - + CPPFLAGS="$cf_save_CPPFLAGS" + fi rm -f conftest* - fi - done + fi + done - if test "$cf_cv_find_linkage_intl" = maybe ; then + if test "$cf_cv_find_linkage_intl" = maybe ; then - -echo "${as_me:-configure}:21260: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 + +echo "${as_me:-configure}:21603: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5 - cf_save_LIBS="$LIBS" - cf_save_LDFLAGS="$LDFLAGS" + cf_save_LIBS="$LIBS" + cf_save_LDFLAGS="$LDFLAGS" - + - if test "$cf_cv_find_linkage_intl" != yes ; then - + if test "$cf_cv_find_linkage_intl" != yes ; then + cf_search= cf_library_path_list="" if test -n "${LDFLAGS}${LIBS}" ; then for cf_library_path in $LDFLAGS $LIBS do - case $cf_library_path in #(vi - -L*) + case $cf_library_path in + (-L*) cf_library_path=`echo ".$cf_library_path" |sed -e 's/^...//' -e 's,/lib$,,'` test "x$cf_library_path" != "xNONE" && \ @@ -21296,18 +21639,6 @@ fi cf_search= -test "x/usr" != "x$prefix" && \ -test -d "/usr" && \ -(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" - test -d /usr/lib/intl/lib && cf_search="$cf_search /usr/lib/intl/lib" - test -d /usr/intl/lib && cf_search="$cf_search /usr/intl/lib" - test -d /usr/intl/lib/intl && cf_search="$cf_search /usr/intl/lib/intl" -} - - test "x$prefix" != "xNONE" && \ test -d "$prefix" && \ { @@ -21320,58 +21651,44 @@ test -d "$prefix" && \ } -test "x/usr/local" != "x$prefix" && \ -test -d "/usr/local" && \ -(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" - test -d /usr/local/lib/intl/lib && cf_search="$cf_search /usr/local/lib/intl/lib" - test -d /usr/local/intl/lib && cf_search="$cf_search /usr/local/intl/lib" - test -d /usr/local/intl/lib/intl && cf_search="$cf_search /usr/local/intl/lib/intl" -} - - -test "x/opt" != "x$prefix" && \ -test -d "/opt" && \ -(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" - test -d /opt/lib/intl/lib && cf_search="$cf_search /opt/lib/intl/lib" - test -d /opt/intl/lib && cf_search="$cf_search /opt/intl/lib" - test -d /opt/intl/lib/intl && cf_search="$cf_search /opt/intl/lib/intl" -} - - -test "x$HOME" != "x$prefix" && \ -test -d "$HOME" && \ -(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" - test -d $HOME/lib/intl/lib && cf_search="$cf_search $HOME/lib/intl/lib" - test -d $HOME/intl/lib && cf_search="$cf_search $HOME/intl/lib" - test -d $HOME/intl/lib/intl && cf_search="$cf_search $HOME/intl/lib/intl" +for cf_subdir_prefix in \ + /usr \ + /usr/local \ + /usr/pkg \ + /opt \ + /opt/local \ + $HOME +do + +test "x$cf_subdir_prefix" != "x$prefix" && \ +test -d "$cf_subdir_prefix" && \ +(test -z "$prefix" || test x$prefix = xNONE || test "x$cf_subdir_prefix" != "x$prefix") && { + test -n "$verbose" && echo " ... testing for lib-directories under $cf_subdir_prefix" + test -d $cf_subdir_prefix/lib && cf_search="$cf_search $cf_subdir_prefix/lib" + test -d $cf_subdir_prefix/lib/intl && cf_search="$cf_search $cf_subdir_prefix/lib/intl" + test -d $cf_subdir_prefix/lib/intl/lib && cf_search="$cf_search $cf_subdir_prefix/lib/intl/lib" + test -d $cf_subdir_prefix/intl/lib && cf_search="$cf_search $cf_subdir_prefix/intl/lib" + test -d $cf_subdir_prefix/intl/lib/intl && cf_search="$cf_search $cf_subdir_prefix/intl/lib/intl" } +done cf_search="$cf_library_path_list $cf_search" - for cf_cv_library_path_intl in $cf_search - do - 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}:21368: testing ... testing $cf_cv_library_path_intl ..." 1>&5 + for cf_cv_library_path_intl in $cf_search + do + 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}:21685: 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 < conftest.$ac_ext < @@ -21379,45 +21696,45 @@ extern int _nl_msg_cat_cntr; int main() { - bindtextdomain ("", ""); - return (int) gettext ("") - - + _nl_msg_cat_cntr + bindtextdomain ("", ""); + return (int) gettext ("") + + + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:21390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21707: \"$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 + test -n "$verbose" && echo " ... found intl library in $cf_cv_library_path_intl" 1>&6 -echo "${as_me:-configure}:21395: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 +echo "${as_me:-configure}:21712: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5 - cf_cv_find_linkage_intl=yes - cf_cv_library_file_intl="-lintl" - break + cf_cv_find_linkage_intl=yes + cf_cv_library_file_intl="-lintl" + break else echo "configure: failed program was:" >&5 cat conftest.$ac_ext >&5 - CPPFLAGS="$cf_save_CPPFLAGS" - LIBS="$cf_save_LIBS" - LDFLAGS="$cf_save_LDFLAGS" - + CPPFLAGS="$cf_save_CPPFLAGS" + LIBS="$cf_save_LIBS" + LDFLAGS="$cf_save_LDFLAGS" + fi rm -rf conftest* - fi - done - CPPFLAGS="$cf_save_CPPFLAGS" - LDFLAGS="$cf_save_LDFLAGS" - fi + fi + done + CPPFLAGS="$cf_save_CPPFLAGS" + LDFLAGS="$cf_save_LDFLAGS" + fi - else - cf_cv_find_linkage_intl=no - fi - + else + cf_cv_find_linkage_intl=no + fi + fi rm -rf conftest* @@ -21475,14 +21792,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:21486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -21499,7 +21816,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}:21503: testing adding $cf_add_incdir to include-path ..." 1>&5 +echo "${as_me:-configure}:21820: testing adding $cf_add_incdir to include-path ..." 1>&5 CPPFLAGS="$CPPFLAGS -I$cf_add_incdir" @@ -21510,6 +21827,8 @@ echo "${as_me:-configure}:21503: testing else break fi + else + break fi done done @@ -21520,31 +21839,31 @@ fi INTLLIBS="$cf_cv_library_file_intl $LIBICONV" if test -n "$cf_cv_library_path_intl" ; then - for cf_add_libdir in $cf_cv_library_path_intl - do - if test $cf_add_libdir = /usr/lib ; then - : - elif test -d $cf_add_libdir - then - cf_have_libdir=no - if test -n "$LDFLAGS$LIBS" ; then - # a loop is needed to ensure we can add subdirs of existing dirs - for cf_test_libdir in $LDFLAGS $LIBS ; do - if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then - cf_have_libdir=yes; break - fi - done - fi - if test "$cf_have_libdir" = no ; then - test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 + for cf_add_libdir in $cf_cv_library_path_intl + do + if test $cf_add_libdir = /usr/lib ; then + : + elif test -d $cf_add_libdir + then + cf_have_libdir=no + if test -n "$LDFLAGS$LIBS" ; then + # a loop is needed to ensure we can add subdirs of existing dirs + for cf_test_libdir in $LDFLAGS $LIBS ; do + if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then + cf_have_libdir=yes; break + fi + done + fi + if test "$cf_have_libdir" = no ; then + test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6 -echo "${as_me:-configure}:21542: testing adding $cf_add_libdir to library-path ..." 1>&5 +echo "${as_me:-configure}:21861: testing adding $cf_add_libdir to library-path ..." 1>&5 - INTLLIBS="-L$cf_add_libdir $INTLLIBS" - fi - fi - done + INTLLIBS="-L$cf_add_libdir $INTLLIBS" + fi + fi + done fi fi @@ -21554,12 +21873,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21558: checking for $ac_func" >&5 +echo "configure:21877: 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:21905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -21612,15 +21931,15 @@ done set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21616: checking for $ac_word" >&5 +echo "configure:21935: 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 case "$MSGFMT" in - [\\/]*|?:[\\/]*) + ([\\/]*|?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; - *) + (*) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -21646,7 +21965,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:21650: checking for $ac_word" >&5 +echo "configure:21969: 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 @@ -21684,15 +22003,15 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21688: checking for $ac_word" >&5 +echo "configure:22007: 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 case "$XGETTEXT" in - [\\/]*|?:[\\/]*) + ([\\/]*|?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; - *) + (*) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -21734,15 +22053,15 @@ fi set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21738: checking for $ac_word" >&5 +echo "configure:22057: 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 case "$MSGFMT" in - [\\/]*|?:[\\/]*) + ([\\/]*|?:[\\/]*) ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. ;; - *) + (*) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -21768,7 +22087,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:21772: checking for $ac_word" >&5 +echo "configure:22091: 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 @@ -21805,15 +22124,15 @@ fi set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:21809: checking for $ac_word" >&5 +echo "configure:22128: 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 case "$XGETTEXT" in - [\\/]*|?:[\\/]*) + ([\\/]*|?:[\\/]*) ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. ;; - *) + (*) IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}" for ac_dir in $PATH; do test -z "$ac_dir" && ac_dir=. @@ -21877,7 +22196,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:21881: checking for $ac_word" >&5 +echo "configure:22200: 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 @@ -21910,13 +22229,13 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:21914: checking version of bison" >&5 +echo "configure:22233: 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;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) + ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*) ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; esac echo "$ac_t""$ac_prog_version" 1>&6 fi @@ -21958,7 +22277,7 @@ echo "configure:21914: checking version LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:21962: checking for catalogs to be installed" >&5 +echo "configure:22281: checking for catalogs to be installed" >&5 NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do useit=no @@ -21969,7 +22288,7 @@ echo "configure:21962: checking for cata # presentlang can be used as a fallback for messages # which are not translated in the desiredlang catalog). case "$desiredlang" in - "$presentlang"*) useit=yes;; + ("$presentlang"*) useit=yes;; esac done if test $useit = yes; then @@ -22017,7 +22336,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:22021: checking if we should use included message-library" >&5 +echo "configure:22340: 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 @@ -22043,7 +22362,7 @@ fi if test "$USE_INCLUDED_LIBINTL" = yes ; then - if test "$nls_cv_force_use_gnu_gettext" = yes ; then + if test "$nls_cv_force_use_gnu_gettext" = yes ; then : elif test "$nls_cv_use_gnu_gettext" = yes ; then : @@ -22072,17 +22391,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:22076: checking for $ac_hdr" >&5 +echo "configure:22395: 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:22086: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22405: \"$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* @@ -22166,19 +22485,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:22170: checking for working alloca.h" >&5 +echo "configure:22489: 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:22182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_header_alloca_h=yes else @@ -22199,12 +22518,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:22203: checking for alloca" >&5 +echo "configure:22522: 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:22555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_func_alloca_works=yes else @@ -22264,12 +22583,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:22268: checking whether alloca needs Cray hooks" >&5 +echo "configure:22587: 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:22298: checking for $ac_func" >&5 +echo "configure:22617: 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:22645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -22349,7 +22668,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:22353: checking stack direction for C alloca" >&5 +echo "configure:22672: 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 @@ -22357,7 +22676,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:22699: \"$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 @@ -22421,9 +22740,9 @@ fi for cf_hdr in iconv.h do echo $ac_n "checking for $cf_hdr""... $ac_c" 1>&6 -echo "configure:22425: checking for $cf_hdr" >&5 +echo "configure:22744: checking for $cf_hdr" >&5 cat > conftest.$ac_ext < @@ -22431,7 +22750,7 @@ echo "configure:22425: checking for $cf_ EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:22435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22754: \"$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* @@ -22457,13 +22776,13 @@ fi done echo $ac_n "checking for iconv_open() //TRANSLIT extension""... $ac_c" 1>&6 -echo "configure:22461: checking for iconv_open() //TRANSLIT extension" >&5 +echo "configure:22780: 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:22803: \"$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 @@ -22499,31 +22818,84 @@ fi # FIXME / TESTME # locale is broken on cygwin < 1.7.0 # group/other bits don't work on cygwin < 1.7.0 -# locking doesn't work on cygwin -# link(2) is detected but doesn't work on cygwin +# locking doesn't work on cygwin < 2.0 as link(2) is detected but doesn't work case "$host_os" in *cygwin*) case `uname -r | sed 's,(.*,,'` in - 1.7.*) + B*|1.0-6].*) + # multiple defects + cat >> confdefs.h <<\EOF +#define NO_LOCALE 1 +EOF + cat >> confdefs.h <<\EOF #define NO_LOCKING 1 EOF - ;; - *) - # link does not work cat >> confdefs.h <<\EOF -#define NO_LOCALE 1 +#define FILE_MODE_BROKEN 1 EOF + ;; + 1.7.*) + # link does not work cat >> confdefs.h <<\EOF #define NO_LOCKING 1 EOF - cat >> confdefs.h <<\EOF -#define FILE_MODE_BROKEN 1 + ;; + *) + echo $ac_n "checking for link""... $ac_c" 1>&6 +echo "configure:22850: 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 < +/* 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 link(); + +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_link) || defined (__stub___link) +choke me +#else +link(); +#endif + +; return 0; } +EOF +if { (eval echo configure:22878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + eval "ac_cv_func_link=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + + eval "ac_cv_func_link=no" +fi +rm -rf conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'link`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_LINK 1 EOF +else + echo "$ac_t""no" 1>&6 +fi + ;; esac ;; @@ -22536,12 +22908,12 @@ EOF ;; *) echo $ac_n "checking for link""... $ac_c" 1>&6 -echo "configure:22540: checking for link" >&5 +echo "configure:22912: 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:22940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_link=yes" else @@ -22594,7 +22966,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:22598: checking for X" >&5 +echo "configure:22970: checking for X" >&5 # Check whether --with-x or --without-x was given. @@ -22657,12 +23029,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:22666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:23038: \"$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* @@ -22731,14 +23103,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:23114: \"$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. @@ -22824,104 +23196,6 @@ else echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 fi - -echo $ac_n "checking if you want to use pkg-config""... $ac_c" 1>&6 -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 - withval="$with_pkg_config" - cf_pkg_config=$withval -else - cf_pkg_config=yes -fi - -echo "$ac_t""$cf_pkg_config" 1>&6 - -case $cf_pkg_config in #(vi -no) #(vi - PKG_CONFIG=none - ;; -yes) #(vi - -# 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: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 - case "$PKG_CONFIG" in - /*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; - *) - 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_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none" - ;; -esac -fi -PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - ;; -*) - PKG_CONFIG=$withval - ;; -esac - -test -z "$PKG_CONFIG" && PKG_CONFIG=none -if test "$PKG_CONFIG" != none ; then - -if test "x$prefix" != xNONE; then - cf_path_syntax="$prefix" -else - cf_path_syntax="$ac_default_prefix" -fi - -case ".$PKG_CONFIG" in #(vi -.\$\(*\)*|.\'*\'*) #(vi - ;; -..|./*|.\\*) #(vi - ;; -.[a-zA-Z]:[\\/]*) #(vi OS/2 EMX - ;; -.\${*prefix}*|.\${*dir}*) #(vi - eval PKG_CONFIG="$PKG_CONFIG" - case ".$PKG_CONFIG" in #(vi - .NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` - ;; - esac - ;; #(vi -.no|.NONE/*) - PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%` - ;; -*) - { echo "configure: error: expected a pathname, not \"$PKG_CONFIG\"" 1>&2; exit 1; } - ;; -esac - -fi - - - if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. cat >> confdefs.h <<\EOF @@ -22942,17 +23216,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:22946: checking whether -R must be followed by a space" >&5 +echo "configure:23220: 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:23230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_R_nospace=yes else @@ -22968,14 +23242,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:23253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_R_space=yes else @@ -23007,7 +23281,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:23011: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:23285: 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 @@ -23015,7 +23289,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:23304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23048,7 +23322,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:23052: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:23326: 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 @@ -23056,7 +23330,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:23345: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23096,12 +23370,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:23100: checking for gethostbyname" >&5 +echo "configure:23374: 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:23402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_gethostbyname=yes" else @@ -23145,7 +23419,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:23149: checking for gethostbyname in -lnsl" >&5 +echo "configure:23423: 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 @@ -23153,7 +23427,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:23442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23194,12 +23468,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:23198: checking for connect" >&5 +echo "configure:23472: 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:23500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_connect=yes" else @@ -23243,7 +23517,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:23247: checking for connect in -lsocket" >&5 +echo "configure:23521: 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 @@ -23251,7 +23525,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:23540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23286,12 +23560,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:23290: checking for remove" >&5 +echo "configure:23564: 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:23592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_remove=yes" else @@ -23335,7 +23609,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:23339: checking for remove in -lposix" >&5 +echo "configure:23613: 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 @@ -23343,7 +23617,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:23632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23378,12 +23652,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:23382: checking for shmat" >&5 +echo "configure:23656: 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:23684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_shmat=yes" else @@ -23427,7 +23701,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:23431: checking for shmat in -lipc" >&5 +echo "configure:23705: 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 @@ -23435,7 +23709,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:23724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23479,7 +23753,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:23483: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:23757: 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 @@ -23487,7 +23761,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:23776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -23526,7 +23800,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:23530: checking if you want to link with Xaw 3d library" >&5 +echo "configure:23804: checking if you want to link with Xaw 3d library" >&5 withval= # Check whether --with-Xaw3d or --without-Xaw3d was given. @@ -23542,8 +23816,25 @@ else echo "$ac_t""no" 1>&6 fi +echo $ac_n "checking if you want to link with Xaw 3d xft library""... $ac_c" 1>&6 +echo "configure:23821: checking if you want to link with Xaw 3d xft library" >&5 +withval= + +# Check whether --with-Xaw3dxft or --without-Xaw3dxft was given. +if test "${with_Xaw3dxft+set}" = set; then + withval="$with_Xaw3dxft" + : +fi + +if test "$withval" = yes ; then + cf_x_athena=Xaw3dxft + echo "$ac_t""yes" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6 -echo "configure:23547: checking if you want to link with neXT Athena library" >&5 +echo "configure:23838: checking if you want to link with neXT Athena library" >&5 withval= # Check whether --with-neXtaw or --without-neXtaw was given. @@ -23560,7 +23851,7 @@ else fi echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6 -echo "configure:23564: checking if you want to link with Athena-Plus library" >&5 +echo "configure:23855: checking if you want to link with Athena-Plus library" >&5 withval= # Check whether --with-XawPlus or --without-XawPlus was given. @@ -23594,19 +23885,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}:23598: testing found package $cf_athena_pkg ..." 1>&5 +echo "${as_me:-configure}:23889: 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}:23605: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:23896: 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}:23610: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:23901: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -23618,14 +23909,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -23639,11 +23930,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -23656,17 +23947,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -23691,7 +23982,23 @@ fi - LIBS="$cf_pkgconfig_libs $LIBS" + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_x_athena_lib="$cf_pkgconfig_libs" @@ -23706,11 +24013,11 @@ EOF for cf_trim_lib in Xmu Xt X11 do case "$LIBS" in - *-l$cf_trim_lib\ *-l$cf_trim_lib*) + (*-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 +echo "${as_me:-configure}:24021: testing ..trimmed $LIBS ..." 1>&5 ;; @@ -23719,13 +24026,13 @@ echo "${as_me:-configure}:23714: testing echo $ac_n "checking for usable $cf_x_athena/Xmu package""... $ac_c" 1>&6 -echo "configure:23723: checking for usable $cf_x_athena/Xmu package" >&5 +echo "configure:24030: 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 < @@ -23736,7 +24043,7 @@ int check = XmuCompareISOLatin1("big", " ; return 0; } EOF -if { (eval echo configure:23740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:24047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_xaw_compat=yes else @@ -23753,36 +24060,673 @@ echo "$ac_t""$cf_cv_xaw_compat" 1>&6 if test "$cf_cv_xaw_compat" = no then # workaround for broken ".pc" files... - case "$cf_x_athena_lib" in #(vi - *-lXmu*) #(vi + case "$cf_x_athena_lib" in + (*-lXmu*) ;; - *) + (*) test -n "$verbose" && echo " work around broken package" 1>&6 -echo "${as_me:-configure}:23763: testing work around broken package ..." 1>&5 +echo "${as_me:-configure}:24070: 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}:24081: 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}:24088: 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}:24093: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${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) + ;; + (*) + case $cf_add_cflags in + (-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 "x${cf_add_cflags}" != "x${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 + + + + + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + + LIBS="$cf_save_xmu" + +test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +echo "${as_me:-configure}:24200: 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}:24206: testing ...after $LIBS ..." 1>&5 + + + + +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + + +test -n "$verbose" && echo " ...before $LIBS" 1>&6 + +echo "${as_me:-configure}:24218: testing ...before $LIBS ..." 1>&5 + + +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}:24224: 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}:24239: testing ..trimmed $LIBS ..." 1>&5 + + + ;; + esac + done + + ;; + esac + fi + + break +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + : +fi + + done +fi + +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}:24268: 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}:24275: 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}:24280: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${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) + ;; + (*) + case $cf_add_cflags in + (-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 "x${cf_add_cflags}" != "x${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 + + + + + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + : +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + + echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 +echo "configure:24388: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lXext $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_add_libs="-lXext" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + +else + echo "$ac_t""no" 1>&6 +fi + +fi + + + + + + +# OSX is schizoid about who owns /usr/X11 (old) versus /opt/X11 (new), and (and +# in some cases has installed dummy files in the former, other cases replaced +# it with a link to the new location). This complicates the configure script. +# Check for that pitfall, and recover using pkg-config +# +# If none of these are set, the configuration is almost certainly broken. +if test -z "${X_CFLAGS}${X_PRE_LIBS}${X_LIBS}${X_EXTRA_LIBS}" +then + + + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then + test -n "$verbose" && echo " found package x11" 1>&6 + +echo "${as_me:-configure}:24464: 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}:24471: 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}:24476: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${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) + ;; + (*) + case $cf_add_cflags in + (-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 "x${cf_add_cflags}" != "x${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 + + + + + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + + : +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + echo "configure: warning: unable to find X11 library" 1>&2 +fi + + + + +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then + test -n "$verbose" && echo " found package ice" 1>&6 + +echo "${as_me:-configure}:24591: 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}:24598: 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}:24603: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 + + + +cf_fix_cppflags=no +cf_new_cflags= +cf_new_cppflags= +cf_new_extra_cppflags= + +for cf_add_cflags in $cf_pkgconfig_incs +do +case $cf_fix_cppflags in +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) + case $cf_add_cflags in + (-D*) + cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` + + test "x${cf_add_cflags}" != "x${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) + ;; + (*) + case $cf_add_cflags in + (-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 "x${cf_add_cflags}" != "x${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 + + + + + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + : +else + cf_pkgconfig_incs= + cf_pkgconfig_libs= + echo "configure: warning: unable to find ICE library" 1>&2 +fi - 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 +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then + test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:23774: testing found package xmu ..." 1>&5 +echo "${as_me:-configure}:24718: testing found package sm ..." 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 + 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}:23781: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24725: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - test -n "$verbose" && echo " package xmu LIBS: $cf_pkgconfig_libs" 1>&6 + test -n "$verbose" && echo " package sm LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:23786: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24730: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -23794,14 +24738,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -23815,11 +24759,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -23832,17 +24776,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -23867,93 +24811,49 @@ 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}:23895: testing ...before $LIBS ..." 1>&5 - - -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}:23901: testing ...after $LIBS ..." 1>&5 - - - - -fi - - - for cf_trim_lib in Xmu Xt X11 +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs 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 + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" - ;; - esac - fi - - break + : else cf_pkgconfig_incs= cf_pkgconfig_libs= - : -fi - - done + echo "configure: warning: unable to find SM library" 1>&2 fi -if test -z "$cf_x_athena_lib" ; then +if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then + test -n "$verbose" && echo " found package xt" 1>&6 -if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then - test -n "$verbose" && echo " found package Xext" 1>&6 - -echo "${as_me:-configure}:23945: testing found package Xext ..." 1>&5 +echo "${as_me:-configure}:24845: testing found package xt ..." 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 + 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}:23952: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24852: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 - test -n "$verbose" && echo " package Xext LIBS: $cf_pkgconfig_libs" 1>&6 + test -n "$verbose" && echo " package xt LIBS: $cf_pkgconfig_libs" 1>&6 -echo "${as_me:-configure}:23957: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24857: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -23965,14 +24865,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -23986,11 +24886,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -24003,17 +24903,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -24038,59 +24938,32 @@ fi - LIBS="$cf_pkgconfig_libs $LIBS" + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + : else cf_pkgconfig_incs= cf_pkgconfig_libs= - - echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6 -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 -else - ac_save_LIBS="$LIBS" -LIBS="-lXext $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="-lXext $LIBS" -else - echo "$ac_t""no" 1>&6 + echo "configure: warning: unable to find Xt library" 1>&2 fi fi - - - - - cf_have_X_LIBS=no @@ -24099,19 +24972,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}:24103: testing found package xt ..." 1>&5 +echo "${as_me:-configure}:24976: 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}:24110: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:24983: 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}:24115: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:24988: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -24123,14 +24996,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -24144,11 +25017,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -24161,17 +25034,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -24196,22 +25069,38 @@ fi - LIBS="$cf_pkgconfig_libs $LIBS" + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + - case "x$LIBS" in #(vi - *-lX11*) #(vi + case "x$LIBS" in + (*-lX11*) ;; - *) + (*) # 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:24209: checking for usable X dependency" >&5 +echo "configure:25098: 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 < @@ -24225,7 +25114,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:24229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_xt_x11_compat=yes else @@ -24242,7 +25131,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}:24246: testing work around broken X11 dependency ..." 1>&5 +echo "${as_me:-configure}:25135: testing work around broken X11 dependency ..." 1>&5 # 2010/11/19 - good enough until a working Xt on Xcb is delivered. @@ -24252,19 +25141,19 @@ echo "${as_me:-configure}:24246: testing if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then test -n "$verbose" && echo " found package x11" 1>&6 -echo "${as_me:-configure}:24256: testing found package x11 ..." 1>&5 +echo "${as_me:-configure}:25145: 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}:24263: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:25152: 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}:24268: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:25157: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -24276,14 +25165,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -24297,11 +25186,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -24314,17 +25203,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -24349,7 +25238,23 @@ fi - LIBS="$cf_pkgconfig_libs $LIBS" + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + : else cf_pkgconfig_incs= @@ -24357,13 +25262,13 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:24361: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:25266: testing ...before $LIBS ..." 1>&5 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}:24367: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:25272: testing ...after $LIBS ..." 1>&5 @@ -24374,13 +25279,13 @@ fi esac echo $ac_n "checking for usable X Toolkit package""... $ac_c" 1>&6 -echo "configure:24378: checking for usable X Toolkit package" >&5 +echo "configure:25283: 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 < @@ -24390,7 +25295,7 @@ int num = IceConnectionNumber(0) ; return 0; } EOF -if { (eval echo configure:24394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_xt_ice_compat=yes else @@ -24407,15 +25312,15 @@ echo "$ac_t""$cf_cv_xt_ice_compat" 1>&6 if test "$cf_cv_xt_ice_compat" = no then # workaround for broken ".pc" files used for X Toolkit. - case "x$X_PRE_LIBS" in #(vi - *-lICE*) - case "x$LIBS" in #(vi - *-lICE*) #(vi + case "x$X_PRE_LIBS" in + (*-lICE*) + case "x$LIBS" in + (*-lICE*) ;; - *) + (*) test -n "$verbose" && echo " work around broken ICE dependency" 1>&6 -echo "${as_me:-configure}:24419: testing work around broken ICE dependency ..." 1>&5 +echo "${as_me:-configure}:25324: testing work around broken ICE dependency ..." 1>&5 @@ -24424,19 +25329,19 @@ echo "${as_me:-configure}:24419: testing if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then test -n "$verbose" && echo " found package ice" 1>&6 -echo "${as_me:-configure}:24428: testing found package ice ..." 1>&5 +echo "${as_me:-configure}:25333: 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}:24435: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:25340: 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}:24440: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:25345: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -24448,14 +25353,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -24469,11 +25374,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -24486,17 +25391,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -24521,26 +25426,42 @@ fi - LIBS="$cf_pkgconfig_libs $LIBS" + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then test -n "$verbose" && echo " found package sm" 1>&6 -echo "${as_me:-configure}:24532: testing found package sm ..." 1>&5 +echo "${as_me:-configure}:25453: 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}:24539: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5 +echo "${as_me:-configure}:25460: 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}:24544: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 +echo "${as_me:-configure}:25465: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5 @@ -24552,14 +25473,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $cf_pkgconfig_incs do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -24573,11 +25494,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -24590,17 +25511,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -24625,7 +25546,23 @@ fi - LIBS="$cf_pkgconfig_libs $LIBS" + +cf_add_libs="$cf_pkgconfig_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + : else cf_pkgconfig_incs= @@ -24639,13 +25576,13 @@ else test -n "$verbose" && echo " ...before $LIBS" 1>&6 -echo "${as_me:-configure}:24643: testing ...before $LIBS ..." 1>&5 +echo "${as_me:-configure}:25580: testing ...before $LIBS ..." 1>&5 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}:24649: testing ...after $LIBS ..." 1>&5 +echo "${as_me:-configure}:25586: testing ...after $LIBS ..." 1>&5 @@ -24668,7 +25605,7 @@ else test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:24672: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:25609: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" @@ -24682,14 +25619,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $X_CFLAGS do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -24703,11 +25640,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -24720,17 +25657,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -24740,7 +25677,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}:24744: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:25681: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" @@ -24749,7 +25686,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}:24753: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:25690: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" @@ -24758,7 +25695,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}:24762: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:25699: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" @@ -24767,16 +25704,16 @@ fi -if test "$cf_check_cflags" != "$CFLAGS" ; then +if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:24780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:25717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -24784,13 +25721,13 @@ else test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:24788: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:25725: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:24794: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:25731: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi @@ -24801,12 +25738,12 @@ fi echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6 -echo "configure:24805: checking for XOpenDisplay" >&5 +echo "configure:25742: 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:25770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_XOpenDisplay=yes" else @@ -24848,7 +25785,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:24852: checking for XOpenDisplay in -lX11" >&5 +echo "configure:25789: 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 @@ -24856,7 +25793,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:25808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -24882,7 +25819,23 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lX11 $LIBS" + +cf_add_libs="-lX11" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else echo "$ac_t""no" 1>&6 fi @@ -24891,12 +25844,12 @@ fi echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6 -echo "configure:24895: checking for XtAppInitialize" >&5 +echo "configure:25848: 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:25876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_XtAppInitialize=yes" else @@ -24938,7 +25891,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6 -echo "configure:24942: checking for XtAppInitialize in -lXt" >&5 +echo "configure:25895: 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 @@ -24946,7 +25899,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:25914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -25010,13 +25963,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:25014: checking for $cf_test in $cf_path" >&5 +echo "configure:25967: checking for $cf_test in $cf_path" >&5 else echo $ac_n "checking for $cf_test""... $ac_c" 1>&6 -echo "configure:25017: checking for $cf_test" >&5 +echo "configure:25970: checking for $cf_test" >&5 fi cat > conftest.$ac_ext < @@ -25025,7 +25978,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:25029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:25982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cf_result=yes else @@ -25075,16 +26028,48 @@ do cf_save="$LIBS" cf_test=XawSimpleMenuAddGlobalActions if test $cf_path != default ; then - LIBS="-L$cf_path/lib $cf_libs $LIBS" + +cf_add_libs="-L$cf_path/lib $cf_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_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 +echo "configure:26050: checking for $cf_libs in $cf_path" >&5 else - LIBS="$cf_libs $LIBS" + +cf_add_libs="$cf_libs" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_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 +echo "configure:26070: checking for $cf_test in $cf_libs" >&5 fi cat > conftest.$ac_ext < @@ -25095,7 +26080,7 @@ int main() { $cf_test((XtAppContext) 0) ; return 0; } EOF -if { (eval echo configure:25099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:26084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_result=yes else @@ -25140,7 +26125,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:25144: checking for $ac_word" >&5 +echo "configure:26129: 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 @@ -25180,7 +26165,23 @@ test -n "$XCURSES_CONFIG" || XCURSES_CON if test "$XCURSES_CONFIG" != none ; then CPPFLAGS="$CPPFLAGS `$XCURSES_CONFIG --cflags`" -LIBS="`$XCURSES_CONFIG --libs` $LIBS" + +cf_add_libs="`$XCURSES_CONFIG --libs`" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cf_cv_lib_XCurses=yes @@ -25190,7 +26191,7 @@ LDFLAGS="$LDFLAGS $X_LIBS" test -n "$verbose" && echo " checking additions to CFLAGS" 1>&6 -echo "${as_me:-configure}:25194: testing checking additions to CFLAGS ..." 1>&5 +echo "${as_me:-configure}:26195: testing checking additions to CFLAGS ..." 1>&5 cf_check_cflags="$CFLAGS" @@ -25204,14 +26205,14 @@ cf_new_extra_cppflags= for cf_add_cflags in $X_CFLAGS do case $cf_fix_cppflags in -no) - case $cf_add_cflags in #(vi - -undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi +(no) + case $cf_add_cflags in + (-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) case $cf_add_cflags in - -D*) + (-D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -25225,11 +26226,11 @@ no) ;; esac case "$CPPFLAGS" in - *$cf_add_cflags) #(vi + (*$cf_add_cflags) ;; - *) #(vi - case $cf_add_cflags in #(vi - -D*) + (*) + case $cf_add_cflags in + (-D*) cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'` CPPFLAGS=`echo "$CPPFLAGS" | \ @@ -25242,17 +26243,17 @@ CPPFLAGS=`echo "$CPPFLAGS" | \ ;; esac ;; - *) + (*) cf_new_cflags="$cf_new_cflags $cf_add_cflags" ;; esac ;; -yes) +(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 "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -25262,7 +26263,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}:25266: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 +echo "${as_me:-configure}:26267: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5 CFLAGS="$CFLAGS $cf_new_cflags" @@ -25271,7 +26272,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}:25275: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 +echo "${as_me:-configure}:26276: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5 CPPFLAGS="$CPPFLAGS $cf_new_cppflags" @@ -25280,7 +26281,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}:25284: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 +echo "${as_me:-configure}:26285: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5 EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS" @@ -25289,16 +26290,16 @@ fi -if test "$cf_check_cflags" != "$CFLAGS" ; then +if test "x$cf_check_cflags" != "x$CFLAGS" ; then cat > conftest.$ac_ext < int main() { printf("Hello world"); ; return 0; } EOF -if { (eval echo configure:25302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:26303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then : else echo "configure: failed program was:" >&5 @@ -25306,13 +26307,13 @@ else test -n "$verbose" && echo " test-compile failed. Undoing change to \$CFLAGS" 1>&6 -echo "${as_me:-configure}:25310: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 +echo "${as_me:-configure}:26311: testing test-compile failed. Undoing change to \$CFLAGS ..." 1>&5 - if test "$cf_check_cppflags" != "$CPPFLAGS" ; then + if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then test -n "$verbose" && echo " but keeping change to \$CPPFLAGS" 1>&6 -echo "${as_me:-configure}:25316: testing but keeping change to \$CPPFLAGS ..." 1>&5 +echo "${as_me:-configure}:26317: testing but keeping change to \$CPPFLAGS ..." 1>&5 fi @@ -25322,7 +26323,7 @@ rm -rf conftest* fi echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:25326: checking for XOpenDisplay in -lX11" >&5 +echo "configure:26327: 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 @@ -25330,7 +26331,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:26346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_lib_$ac_lib_var=yes" else @@ -25356,20 +26357,52 @@ LIBS="$ac_save_LIBS" fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 - LIBS="-lX11 $LIBS" + +cf_add_libs="-lX11" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for XCurses library""... $ac_c" 1>&6 -echo "configure:25366: checking for XCurses library" >&5 +echo "configure:26383: 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" + +cf_add_libs="-lXCurses" +# Filter out duplicates - this happens with badly-designed ".pc" files... +for cf_add_1lib in $LIBS +do + for cf_add_2lib in $cf_add_libs + do + if test "x$cf_add_1lib" = "x$cf_add_2lib" + then + cf_add_1lib= + break + fi + done + test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" +done +LIBS="$cf_add_libs" + cat > conftest.$ac_ext < @@ -25379,7 +26412,7 @@ int main() { XCursesExit(); ; return 0; } EOF -if { (eval echo configure:25383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:26416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then cf_cv_lib_XCurses=yes else @@ -25407,17 +26440,17 @@ EOF ac_safe=`echo "xcurses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for xcurses.h""... $ac_c" 1>&6 -echo "configure:25411: checking for xcurses.h" >&5 +echo "configure:26444: 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:25421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:26454: \"$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* @@ -25449,12 +26482,12 @@ 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 +echo "configure:26486: 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:26514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then eval "ac_cv_func_$ac_func=yes" else @@ -25768,6 +26801,7 @@ s%@SPOOLDIR@%$SPOOLDIR%g s%@NOVROOTDIR@%$NOVROOTDIR%g s%@INEWSDIR@%$INEWSDIR%g s%@INEWS@%$INEWS%g +s%@PKG_CONFIG@%$PKG_CONFIG%g s%@NCURSES_CONFIG@%$NCURSES_CONFIG%g s%@PCRE_MAJOR@%$PCRE_MAJOR%g s%@PCRE_MINOR@%$PCRE_MINOR%g @@ -25812,7 +26846,6 @@ s%@SUB_MAKEFILE@%$SUB_MAKEFILE%g s%@INTLDIR_MAKE@%$INTLDIR_MAKE%g s%@GT_YES@%$GT_YES%g s%@GT_NO@%$GT_NO%g -s%@PKG_CONFIG@%$PKG_CONFIG%g s%@X_CFLAGS@%$X_CFLAGS%g s%@X_PRE_LIBS@%$X_PRE_LIBS%g s%@X_LIBS@%$X_LIBS%g @@ -26042,11 +27075,12 @@ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; esac # PO directories have a Makefile.in generated from Makefile.inn. - case "$ac_file" in */[Mm]akefile.in) + case "$ac_file" in + (*/[Mm]akefile.in) # Adjust a relative srcdir. ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" @@ -26057,9 +27091,9 @@ for ac_file in $CONFIG_FILES; do test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + (.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + (/*) top_srcdir="$ac_given_srcdir" ;; + (*) top_srcdir="$ac_dots$ac_given_srcdir" ;; esac if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then diff -Nurp '--exclude=.bzr*' tin-2.3.1/configure.in tin-2.3.2/configure.in --- tin-2.3.1/configure.in 2014-12-24 10:39:34.000000000 +0100 +++ tin-2.3.2/configure.in 2015-12-24 08:48:36.603209051 +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 : 2013-12-06 +dnl Updated : 2015-11-03 dnl Notes : dnl -dnl Copyright (c) 1995-2015 Thomas E. Dickey +dnl Copyright (c) 1995-2016 Thomas E. Dickey dnl All rights reserved. dnl dnl Redistribution and use in source and binary forms, with or without @@ -41,7 +41,7 @@ AC_PREFIX_DEFAULT(/usr/local) dnl PACKAGE is required for GNU gettext PACKAGE=tin -VERSION=2.3.1 +VERSION=2.3.2 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PACKAGE) @@ -81,7 +81,7 @@ case "$host_os" in esac ### Native Language Support -ALL_LINGUAS="da de en_GB et fr ru sv tr zh_TW" +ALL_LINGUAS="da de en_GB et fr ru sv tr zh_CN zh_TW" ### Checks for programs save_CFLAGS="$CFLAGS" @@ -123,10 +123,10 @@ 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]) +CF_ARG_DISABLE(heapsort, + [ --disable-heapsort disable heapsort() as alternative to qsort], + [cf_use_heapsort=no], + [cf_use_heapsort=yes]) AC_MSG_RESULT($cf_use_heapsort) if test "x$cf_use_heapsort" = xyes; then AC_CHECK_FUNCS(heapsort) @@ -318,14 +318,14 @@ fi ### are used in a lot of places. AC_CACHE_CHECK(if you want socks library,cf_cv_use_libsocks,[ AC_ARG_WITH(socks, - [ --with-socks[=path] link with socks library if available], + [ --with-socks[=path] link with socks library if available], [cf_cv_use_libsocks=$withval], [cf_cv_use_libsocks=no]) ]) AC_CACHE_CHECK(if you want socks5 library,cf_cv_use_libsocks5,[ AC_ARG_WITH(socks5, - [ --with-socks5[=path] link with socks5 library if available], + [ --with-socks5[=path] link with socks5 library if available], [cf_cv_use_libsocks5=$withval], [cf_cv_use_libsocks5=no]) ]) @@ -696,9 +696,10 @@ AC_DEFINE_UNQUOTED(TIN_DEFAULTS_DIR,"$TI ### check for ipv6 support AC_MSG_CHECKING([whether to enable IPv6]) -CF_ARG_ENABLE(ipv6, - [ --enable-ipv6 enable IPv6 (with IPv4) support (default: disabled)], -[AC_DEFINE(ENABLE_IPV6)]) +CF_ARG_DISABLE(ipv6, + [ --disable-ipv6 disable IPv6 support (default: enabled)], + , + [AC_DEFINE(ENABLE_IPV6)]) AC_MSG_RESULT($enableval) if test "$enableval" = "yes"; then CF_CHECK_IPV6 @@ -913,6 +914,9 @@ AC_CHECK_LIB(uu, UUInitialize, # - unorm_normalize() # - uidna_IDNToUnicode() # - ubidi_open() +# and for IDNA2008 +# - uidna_openUTS46() +# - uidna_nameToUnicode() cf_try_icuuc="no" AC_CHECK_HEADER(unicode/unorm.h,[ AC_CHECK_HEADER(unicode/ustring.h, [ @@ -964,6 +968,7 @@ if test $cf_try_icuuc = no ; then fi # without icuuc try libidn for Internationalized Domain Names / IDN 2003 +# TODO: check for libidn2 if test $cf_try_icuuc = no ; then AC_CHECK_LIB(idn, stringprep_check_version, [AC_CHECK_HEADER(stringprep.h,[ @@ -1409,19 +1414,22 @@ int main() { # FIXME / TESTME # locale is broken on cygwin < 1.7.0 # group/other bits don't work on cygwin < 1.7.0 -# locking doesn't work on cygwin -# link(2) is detected but doesn't work on cygwin +# locking doesn't work on cygwin < 2.0 as link(2) is detected but doesn't work case "$host_os" in *cygwin*) case `uname -r | sed 's,(.*,,'` in - 1.7.*) + B*|1.0-6].*) + # multiple defects + AC_DEFINE(NO_LOCALE) AC_DEFINE(NO_LOCKING) + AC_DEFINE(FILE_MODE_BROKEN) ;; - *) + 1.7.*) # link does not work - AC_DEFINE(NO_LOCALE) AC_DEFINE(NO_LOCKING) - AC_DEFINE(FILE_MODE_BROKEN) + ;; + *) + AC_CHECK_FUNC(link, AC_DEFINE(HAVE_LINK)) ;; esac ;; diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/CHANGES tin-2.3.2/doc/CHANGES --- tin-2.3.1/doc/CHANGES 2014-12-24 09:58:01.000000000 +0100 +++ tin-2.3.2/doc/CHANGES 2015-12-24 00:04:41.643206119 +0100 @@ -1,3 +1,81 @@ +-- 2.3.2 release 20151224 "Glenavullen" -- + +U015) Stefan Assmann + BUG. format string vulnerability with -Sv + FIX. save.c, select.c + +U014) Wei-Lun Chao + ADD. update traditional chinese translation + FIX. zh_TW.po + +U013) Mingye Wang + ADD. simplified chinese translation + FIX. zh_CN.po + +U012) Thomas E. Dickey + ADD. update configure macros + FIX. aclocal.m4 + +U011) Dennis Preiser + BUG. uue parts in mime articles were not mime decoded before uue + decoding + BUG. used freed fp if cooking of article fails + BUG. Cygwin >= 2.0 was treated as Cygwin < 1.7 + BUG. ncurses >= 6.0 wasn't recognized + BUG. possible crash on initial reconnect loop when network is down + BUG. socket not closed on early exit + BUG. memory leak when aborting index_group() from select level + BUG. memory leak when reading mailgroup articles without Message-ID + BUG. memory leak in makecfg + BUG. in thread level space calculation for %F was wrong with + S'ubject or 'P'ercent threading active + BUG. in thread level show_author was ignored with S'ubject or 'P'ercent + threading active + BUG. thread level didn't show subject with 'P'ercent or 'M'ultibyte + threading active and '%T' present in thread_format + ADD. AttachSelect and AttachPipe now perform charset translation for + text/*-parts + ADD. handle CRLF spread over two lines in base64 decoding + ADD. options to color external quotes (extquote_handling, + extquote_regex, col_extquote) + ADD. skip over RFC 2231 language parameter in encoded words + ADD. RFC 2231 parameter value continuation + ADD. allow comments in Content-* headers + REM. groupname_max_length tinrc option (replaced by select_format) + FIX. extern.h, rfc2046.h, tcurses.h, tin.h, tinrc.h, version.h, art.c + attrib.c, color.c, config.c, cook.c, group.c, init.c, lang.c + main.c, makecfg.c, memory.c, misc.c, nntplib.c, options_menu.c + page.c, rfc2045.c, rfc2046.c, rfc2047.c, save.c, select.c, string.c + thread.c, tincfg.tbl, tin.[15], configure[.in] + +U010) Joe Hansen + ADD. updated danish translation + FIX. da.po + +U009) Urs Janssen + ADD. updated german translation + ADD. config.guess, config.sub update + ADD. fix hypothetic null pointer dereference + ADD. allow hand supplied Sender header with external news + ADD. avoid useless strdup()/free() + ADD. onion TLD to disallowed TLDs + ADD. removed redundant conditions in auth code + ADD. --enable-heapsort is now default + ADD. --enable-ipv6 is now default + REM. dead code + BUG. wrong format string in CLOSEDIR macro used + BUG. uncontrolled format string in nntp error messages. + BUG. tin_errno wasn't always cleared when aborting index_group() + BUG. in batch mode rebindable keys were malloed but not freed + FIX. auth.c, cook.c, group.c, lang.c, main.c, misc.c, nntplib.c + page.c, post.c, prompt.c, rfc2047.c, search.c, thread.c, policy.h + tin.h, de.po, config.guess, config.sub, configure[.in] + Makefile[.in] + +U008) Toomas Soome + ADD. updated estonian translation + FIX. et.po + -- 2.3.1 release 20141224 "Tallant" -- U007) Dennis Preiser @@ -12,7 +90,7 @@ U005) Urs Janssen ADD. fix hypothetic null pointer dereference ADD. config.guess, config.sub update ADD. updated german translation - FIX. proto.h, filter.c, post.c, save.c, tin.1, config.guess, config.sub, + FIX. proto.h, filter.c, post.c, save.c, tin.1, config.guess, config.sub de.po -- 2.3.0 release 20141003 "Glenfoyle" -- @@ -34,7 +112,7 @@ U003) Urs Janssen U002) Dennis Preiser BUG. in base64 encoding multibyte chars could have been broken into multiple encoded words which is prohibited by RFC 2047 - FIX. RFC2047.c + FIX. rfc2047.c U001) Matt Anton ADD. updated french translation diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/CHANGES.old tin-2.3.2/doc/CHANGES.old --- tin-2.3.1/doc/CHANGES.old 2013-12-24 01:03:15.000000000 +0100 +++ tin-2.3.2/doc/CHANGES.old 2015-06-27 09:32:58.655209001 +0200 @@ -2315,7 +2315,7 @@ U071) Urs Janssen ADD. config.guess, config.sub update ADD. start BeOS port (networking missing) ADD. renamed some vars to avoid shadowing on QNX - ADD. new quad_t check to avoid waring with autoconf >= 2.5 + ADD. new quad_t check to avoid warning with autoconf >= 2.5 ADD. w2r.pl and opt-case.pl man-pages BUG. nls didn't work BUG. shell detection failed in some cases diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/CREDITS tin-2.3.2/doc/CREDITS --- tin-2.3.1/doc/CREDITS 2013-08-28 19:09:38.000000000 +0200 +++ tin-2.3.2/doc/CREDITS 2015-11-02 00:50:56.903208005 +0100 @@ -1,71 +1,72 @@ I wish to thank the following people for supplying patches: -David Abbott, Earle Ake, Deniz Akkus, Russ Allbery, Matt Anton, Orbby S. -Arka, Joachim Astel, Anton Aylward, Mark Ayzenshteyn, Jens Chr. Bachem, -George Baltz, Dieter Baron, Volker Barthelmann, Kirk Bauer, Paul Bauwens, -Dieter Becker, Wolfgang Behrens, Fabrice Bellet, Greg Berigan, Enrik -Berkhan, Juergen Bernau, Dan Berry, Michael Bienia, David Binderman, Thomas -Bliem, Andrey Blochintsev, Chris Blum, Fokke de Boer, Andreas Borchert, -Volker Borchert, Sebastian Bork, Mark Boucher, Robert Brady, Peter -Breitenlohner, Jessica Brennan, Frederic Briere, Bill Brolik, Travis Brown, -Herman ten Brugge, Martin Buck, Matthias Buelow, Jeremy Buhler, Leila -Burrell-Davis, Sean Casey, Peter Castro, Troy Cauble, Andrey A. Chernov, -Albert Chin-A-Young, Park Chong-Dae, Tan Kwee Chuan, Boleslaw Ciesielski, -Robert Claeson, Steven Cogswell, Don Costello, Joshua Crawford, Bryan -Curnutt, Ned Danieley, Lars Dannenberg, Chris Davies, John Davis, Borislav -Deianov, Thomas E. Dickey, Martin Dickopp, Olaf Dietrich, Herbert Martin -Dietze, Theo Van Dinter, Ralf Doeblitz, Bryan Dongray, Michael Douglass, -Nickolay Dudorov, Craig Durland, Bernd Eckenfels, Phil Edge, Kirk Edson, -Nick Efthymiou, Stefan Elf, Nigel Ellis, Andrei Emeltchenko, L. Scott -Emmons, Rob Engle, Olle Eriksson, Brent Ermlick, Bernd Ernesti, Ragnar -Hojland Espinosa, Jason Faultless, Michael Faurot, Werner Fleck, John M. -Flinchbaugh, Andy Gabor, Christian Garbs, Torsten Gesang, Ruediger Geys, -Callum Gibson, Mike Glendinning, Igor Goryachev, Philippe Goujard, Dan -Greenspan, Andrew Greer, Dennis Grevenstein, Karlo Gross, Carl Hage, Piers -Haken, Paul Halsema, Joe Hansen, Ed Hanway, Scott Hauck, Christian Haul, -James Hawtin, Per Headland, Arnold Hendriks, Daniel Hermans, Jose Herrero, -Dave Hill, Tom Hite, Torsten Homeyer, Ulli Horlacher, Keith Howell, Tommy -Hsieh, Shih-Kun Huang, Steve Hunt, Jeff Hurwitt, Jeon Hyoung-Jo, Ali -Ibraimi, Pieter Immelman, Jarkko Isokungas, Marco d'Itri, Patrick St. Jean, -Hal Jespersen, Park Sang Jin, Robbin Johnson, Jarkko Jormanainen, Yury July, -Nelson Kading, Geoffrey Keating, Karsten Keil, Charles S. Kerr, Fritz -Kleeman, Andreas Kies, Janne Kiviluoto, Tomasz Kloczko, Dwarven Knight, -Thomas Koenig, Karl-Koenig Koenigsson, Sebnem Korkmaz, Martin Kraemer, -Gerald Krause, Thomas Kroener, Piotr Kucharski, Florian Kuehnert, Bernd -Kuemmerlen, Kris Kugel, Stephan Kulow, Manoj Kumar, Dawid Kuroczko, Yuri -Kuzmenko, Olivier Lacroix, Geoff Lane, Alex Lange, Alain Lasserre, Stanislav -Latishko, Hannu Laurila, Yen-Ming Lee, Vincent Lefevre, Alexander Lehmann, -Marty Leisner, Thomas Leitner, Hakan Lennestal, Kevin Lentin, Chua Choon -Leong, Chris Lewis, Andreas Ley, David-Michael Lincke, Otto Lind, Richard -Lloyd, Florian Lohoff, Reinhard Luebke, Clifford Luke, Michael Lupp, David -MacKenzie, Hugh Mahon, Giuseppe De Marco, Scott Marovich, Dmitri A. -Martynoff, Kazushi Marukawa, Timur Maryin, William McBrine, Geoff McCaughan, -Owen Medd, Philipp Mergenthaler, Andreas Metzler, Arkadiusz Miskiewicz, -Soren Moller, Bruce Momjian, Sergio Morales, Michael Morrell, Klaus Mueller, -Mike Muise, Udo Munk, Steven Michael Murphy, John R. Myers, Daniel Naber, -Torsten Neumann, Dirk Nimmich, James Nugen, Daniel Nylander, David E. -O'Brien, Michael O'Reilly, Oleg Ohotnikov, Ronald Orr, Julien Oster, Guido -Ostkamp, Philip Paeps, Jeb Palmer, Neil Parker, Joseph Parmelee, Tom Parry, -Jim Patterson, Sven Paulus, Walter Pelissero, Cameron Perkins, Colin -Perkins, Eric Peterson, Tim Pierce, Bill Poitras, Scott W. Powers, Wolfgang -Prediger, Dennis Preiser, Marc Prud'hommeaux, GianPiero Puccioni, Antonio -Querubin, Thomas Quinot, Stefan Rapp, Martin Reising, Kyle Rhorer, Ted -Richards, Steve Robbins, Ollivier Robert, Branden Robinson, Jim Robinson, -Thomas Roessler, Erik van Roode, Meelis Roos, Stephen Roseman, Roland -Rosenfeld, Peter Van Rossem, Clifton Royston, Rado S., Juergen Salk, Aleksey -Salow, Rich Salz, Gary Sanders, Nickolay Saukh, John Sauter, Christopher -Sawtell, Holger Schif, Volker Schmidt, John Schmitz, Torsten Schneider, -Stefan Scholl, Rainer Scholz, Juergen Schroeder, Larry Schwimmer, Randy -Scott, Bart Sears, Karl-Olav Serrander, Ozge Sevinc, Doug Sewell, -Chung-chieh Shan Philip Shearer, Jungshik Shin, Sergey Shkonda, Andreas -Siegert, Andrey Simonenko, Mark Smith, Toomas Soome, Steve Spearman, Helmut -Springer, Cliff Stanford, Steve Starck, Jason Steiner, Ralf Stephan, Michael -Stenns, Helmrich Streitmatter, Hans Werner Strube, Dieter Stueken, Ed -Sznyter, Lech Szychowski, Dean Takemori, Darrell Tangman, Derek Terveer, -Carsten Theis, Julian Thompson, David Tiller, Andry Timonin, Elmar W. -Tischhauser, Mark Tomlin, Mark Tomlinson, Michael Traub, Martin Treusch von -Buttlar, Mark Trumbull, Alex Vasylenko, Michael Velten, Adri Verhoef, Paul -Vickers, Corinna Vinschen, Oliver B. Warzecha, Christian Weisgerber, Jason -Wessel, Cary Whitney, Henrik Wist, Greg Woods, Andreas Wrede, Lloyd Wright, -Jens Wuepper, Herbert Xu, Billy Y., Hideaki Yoshfuji, Nickolai Zeldovich, -Zbigniew Zych +David Abbott, Earle Ake, Deniz Akkus, Russ Allbery, Matt Anton, +Orbby S. Arka, Stefan Assmann, Joachim Astel, Anton Aylward, Mark Ayzenshteyn, +Jens Chr. Bachem, George Baltz, Dieter Baron, Volker Barthelmann, Kirk Bauer, +Paul Bauwens, Dieter Becker, Wolfgang Behrens, Fabrice Bellet, Greg Berigan, +Enrik Berkhan, Juergen Bernau, Dan Berry, Michael Bienia, David Binderman, +Thomas Bliem, Andrey Blochintsev, Chris Blum, Fokke de Boer, +Andreas Borchert, Volker Borchert, Sebastian Bork, Mark Boucher, Robert Brady, +Peter Breitenlohner, Jessica Brennan, Frederic Briere, Bill Brolik, +Travis Brown, Herman ten Brugge, Martin Buck, Matthias Buelow, Jeremy Buhler, +Leila Burrell-Davis, Sean Casey, Peter Castro, Troy Cauble, Wei-Lun Chao, +Andrey A. Chernov, Albert Chin-A-Young, Park Chong-Dae, Tan Kwee Chuan, +Boleslaw Ciesielski, Robert Claeson, Steven Cogswell, Don Costello, +Joshua Crawford, Bryan Curnutt, Ned Danieley, Lars Dannenberg, Chris Davies, +John Davis, Borislav Deianov, Thomas E. Dickey, Martin Dickopp, Olaf Dietrich, +Herbert Martin Dietze, Theo Van Dinter, Ralf Doeblitz, Bryan Dongray, +Michael Douglass, Nickolay Dudorov, Craig Durland, Bernd Eckenfels, Phil Edge, +Kirk Edson, Nick Efthymiou, Stefan Elf, Nigel Ellis, Andrei Emeltchenko, +L. Scott Emmons, Rob Engle, Olle Eriksson, Brent Ermlick, Bernd Ernesti, +Ragnar Hojland Espinosa, Jason Faultless, Michael Faurot, Werner Fleck, +John M. Flinchbaugh, Andy Gabor, Christian Garbs, Torsten Gesang, +Ruediger Geys, Callum Gibson, Mike Glendinning, Igor Goryachev, +Philippe Goujard, Dan Greenspan, Andrew Greer, Dennis Grevenstein, Karlo Gross, +Carl Hage, Piers Haken, Paul Halsema, Joe Hansen, Ed Hanway, Scott Hauck, +Christian Haul, James Hawtin, Per Headland, Arnold Hendriks, Daniel Hermans, +Jose Herrero, Dave Hill, Tom Hite, Torsten Homeyer, Ulli Horlacher, +Keith Howell, Tommy Hsieh, Shih-Kun Huang, Steve Hunt, Jeff Hurwitt, +Jeon Hyoung-Jo, Ali Ibraimi, Pieter Immelman, Jarkko Isokungas, Marco d'Itri, +Patrick St. Jean, Hal Jespersen, Park Sang Jin, Robbin Johnson, +Jarkko Jormanainen, Yury July, Nelson Kading, Geoffrey Keating, Karsten Keil, +Charles S. Kerr, Fritz Kleeman, Andreas Kies, Janne Kiviluoto, Tomasz Kloczko, +Dwarven Knight, Thomas Koenig, Karl-Koenig Koenigsson, Sebnem Korkmaz, +Martin Kraemer, Gerald Krause, Thomas Kroener, Piotr Kucharski, +Florian Kuehnert, Bernd Kuemmerlen, Kris Kugel, Stephan Kulow, Manoj Kumar, +Dawid Kuroczko, Yuri Kuzmenko, Olivier Lacroix, Geoff Lane, Alex Lange, +Alain Lasserre, Stanislav Latishko, Hannu Laurila, Yen-Ming Lee, +Vincent Lefevre, Alexander Lehmann, Marty Leisner, Thomas Leitner, +Hakan Lennestal, Kevin Lentin, Chua Choon Leong, Chris Lewis, Andreas Ley, +David-Michael Lincke, Otto Lind, Richard Lloyd, Florian Lohoff, +Reinhard Luebke, Clifford Luke, Michael Lupp, David MacKenzie, Hugh Mahon, +Giuseppe De Marco, Scott Marovich, Dmitri A. Martynoff, Kazushi Marukawa, +Timur Maryin, William McBrine, Geoff McCaughan, Owen Medd, +Philipp Mergenthaler, Andreas Metzler, Arkadiusz Miskiewicz, Soren Moller, +Bruce Momjian, Sergio Morales, Michael Morrell, Klaus Mueller, Mike Muise, +Udo Munk, Steven Michael Murphy, John R. Myers, Daniel Naber, Torsten Neumann, +Dirk Nimmich, James Nugen, Daniel Nylander, David E. O'Brien, Michael O'Reilly, +Oleg Ohotnikov, Ronald Orr, Julien Oster, Guido Ostkamp, Philip Paeps, +Jeb Palmer, Neil Parker, Joseph Parmelee, Tom Parry, Jim Patterson, +Sven Paulus, Walter Pelissero, Cameron Perkins, Colin Perkins, Eric Peterson, +Tim Pierce, Bill Poitras, Scott W. Powers, Wolfgang Prediger, Dennis Preiser, +Marc Prud'hommeaux, GianPiero Puccioni, Antonio Querubin, Thomas Quinot, +Stefan Rapp, Martin Reising, Kyle Rhorer, Ted Richards, Steve Robbins, +Ollivier Robert, Branden Robinson, Jim Robinson, Thomas Roessler, +Erik van Roode, Meelis Roos, Stephen Roseman, Roland Rosenfeld, +Peter Van Rossem, Clifton Royston, Rado S., Juergen Salk, Aleksey Salow, +Rich Salz, Gary Sanders, Nickolay Saukh, John Sauter, Christopher Sawtell, +Holger Schif, Volker Schmidt, John Schmitz, Torsten Schneider, Stefan Scholl, +Rainer Scholz, Juergen Schroeder, Larry Schwimmer, Randy Scott, Bart Sears, +Karl-Olav Serrander, Ozge Sevinc, Doug Sewell, Chung-chieh Shan, +Philip Shearer, Jungshik Shin, Sergey Shkonda, Andreas Siegert, +Andrey Simonenko, Mark Smith, Toomas Soome, Steve Spearman, Helmut Springer, +Cliff Stanford, Steve Starck, Jason Steiner, Ralf Stephan, Michael Stenns, +Helmrich Streitmatter, Hans Werner Strube, Dieter Stueken, Ed Sznyter, +Lech Szychowski, Dean Takemori, Darrell Tangman, Derek Terveer, Carsten Theis, +Julian Thompson, David Tiller, Andry Timonin, Elmar W. Tischhauser, +Mark Tomlin, Mark Tomlinson, Michael Traub, Martin Treusch von Buttlar, +Mark Trumbull, Alex Vasylenko, Michael Velten, Adri Verhoef, Paul Vickers, +Corinna Vinschen, Mingye Wang, Oliver B. Warzecha, Christian Weisgerber, +Jason Wessel, Cary Whitney, Henrik Wist, Greg Woods, Andreas Wrede, +Lloyd Wright, Jens Wuepper, Herbert Xu, Billy Y., Hideaki Yoshfuji, +Nickolai Zeldovich, Zbigniew Zych diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/INSTALL tin-2.3.2/doc/INSTALL --- tin-2.3.1/doc/INSTALL 2014-01-13 09:31:37.000000000 +0100 +++ tin-2.3.2/doc/INSTALL 2015-11-04 00:08:23.795207869 +0100 @@ -64,7 +64,7 @@ The following configure options and defi Not yet documented configure options and defines: ------------------------------------------------- TIN related: - --enable-ipv6 --with-socks5 + --disable-ipv6 --with-socks5 --with-socks --with-sum DEBUG MATCH_TAR_PATTERN @@ -521,10 +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 (default: on) 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. +the group is somewhat presorted. Use --disable-heapsort to deactivate +heapsort(3) inclusion. --enable-nls (default: on) The --enable-nls option enables Native Language Support (NLS), which allows @@ -562,7 +563,7 @@ Activated by tin -Dn where n is 1 = NNTP 32 = misc (-D 63 = debug all). Debug files written to $TMPDIR are ARTS, ACTIVE, BASE, NNTP, SAVE_COMP, BITMAP, MALLOC and FILTER. Depending on the debuglevel some files may not be generated. As the files written in -$TMPDIR are world readable and may contian uncryted password information +$TMPDIR are world readable and may contain uncryted password information (e.g. when using -D 1) don't run "-D n" on multiuser systems without setting $TMPDIR to a safe location, e.g. "TMPDIR=$HOME ./tin -D 1". diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/TODO tin-2.3.2/doc/TODO --- tin-2.3.1/doc/TODO 2014-12-11 23:03:46.000000000 +0100 +++ tin-2.3.2/doc/TODO 2015-12-22 00:22:27.911210421 +0100 @@ -4,6 +4,12 @@ not read only ,-). Bugs ---- +o replying via email to an article with + From: =?us-ascii?q?,?= + will result in + To: , + [20141230 Urs Janssen ] + o get_respcode() doesn't handle the 401 response code. as we have to evaluate the response text as well we have to fix every nntp_command(..., NULL, 0) call. @@ -86,7 +92,7 @@ o 8bit chars in some headers are RFC-20 [20090112 Urs Janssen ] o the mime encoder may create two adjacent encoed words in the same line - i.e. Subject: =?UTF-8?B?4oKs4oKs4oKs?= =?UTF-8?B?IOKCrOKCrOKCrA==?= + e.g. Subject: =?UTF-8?B?4oKs4oKs4oKs?= =?UTF-8?B?IOKCrOKCrOKCrA==?= instead of Subject: =?UTF-8?B?4oKs4oKs4oKsIOKCrOKCrOKCrA==?= [20140513 Urs Janssen ] @@ -122,7 +128,7 @@ o add support for %A (Address), %C (Fir 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 + or via calling drain_buffer() (might be slow if there is 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) @@ -150,7 +156,7 @@ 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 (i.e. posting +o add user defined screen layout at different levels (e.g. posting history screen) (done for selection, group and thread level) - what about groupname_max_length, still needed? @@ -440,10 +446,11 @@ 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, liblz4, liblrzip +o add check for liblzma/libbzip2/zlib (>=1.1.4)/[mini]lzo, lzlib, liblz4, + liblrzip, ... (, , , , - , + , , ) and add an option to write/read *zipped local overviews. the libs might also be used for post-processing articles. @@ -539,13 +546,6 @@ o do RFC 2231 decoding of non us-ascii (rfc2046.c:parse_params()) [20110428 Urs Janssen ] -o allow RFC 2231 parameter value continuations - [20110428 Urs Janssen ] - -o allow RFC 2231 language specification in encoded words - (rfc2047.c:rfc1522_decode()) - [20110428 Urs Janssen ] - o add Content-Language (RFC 3282) analysis o suppress hide_uue=2 checking unless first line in an article or following @@ -556,6 +556,11 @@ o add missing mailcap (RFC 1524) featur Internal Changes ---------------- +o in ENABLE_NLS case replace PLURAL() macro with proper use of + ngettext(3) (if found by configure) to support languages with + more than one plural form. + [20150113 Urs Janssen ] + o rename disable_gnksa_domain_check to enable_gnksa_domain_check and invert logic now the default changed [20131119 Urs Janssen ] @@ -575,7 +580,7 @@ o ditch MAX_MSG_HEADERS (post.c) [20110212 Urs Janssen ] o always display (also) the servers error response string to the user, - currently tin sometimes gives generic messages (i.e. when authentication + currently tin sometimes gives generic messages (e.g. when authentication fails), but the servers response may include additional infos (like bandwidth exceeded) [20101230 Urs Janssen ] @@ -716,8 +721,9 @@ o check code with Splint (LCLint) ), cppcheck (), AdLint (), clang-analyzer - () and Coverity - () + (), Coverity + () and zzuf + () 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 @@ -742,7 +748,7 @@ o mask inline PGP SIGNATURE/KEY BLOCK l [20090722 Urs Janssen ] o some non fixed width strings could be formatted nicer (warp on last space - before cCOLS), i.e. txt_warn_downgrade + before cCOLS), e.g. txt_warn_downgrade [20110325 Urs Janssen ] Unicode @@ -781,7 +787,8 @@ o make mm_network_charset an user confi o add IDNA 2003 (RFC 3490ff.) and IDNA 2008 (RFC 5890ff.) support, ( IDNA 2003, IDNA 2008, - IDNA (uidna_IDNToUnicode()), + IDNA (uidna_IDNToUnicode() + and/or with ICU >=4.6 uidna_nameToUnicode(uidna_openUTS46)), IDNA 2008) (added minimalistic IDNA decoding support if a recent libidn is found, urs) [20030917 Urs Janssen ] @@ -809,10 +816,10 @@ o the online help of GroupMarkUnselArtR say that the article are marked read [20090814 Urs Janssen ] -o document the different singnals/actions (i.e. SIGUSR2 writes newsrc) +o document the different singnals/actions (e.g. SIGUSR2 writes newsrc) [20080209 Urs Janssen ] -o exit staus documentation in the manpage isn't correct, we have more +o exit staus documentation in the man page isn't correct, we have more exit codes than just 0/1 (and 2 in the -Z case). [20080320 Urs Janssen ] @@ -832,14 +839,35 @@ o man page always needs work and proof e.g. 'U', 'V' in pager need better documentation, random organization feature isn't documented at all. -o tin.defaults could use more documentation in manpage (tin.5) +o tin.defaults could use more documentation in man page (tin.5) -o replace "\\" by "\e" in manpages (portable?) +o replace "\\" by "\e" in man pages (portable?) -o integrate doc/auth.txt into tin.1-manpage +o integrate doc/auth.txt into tin.1 man page Not yet classified ------------------ +o allow "begin-base64"/"====\n" as start/end marker for UUE-blocks besides + the traditional "begin"/"end\n"? + [20151204 Urs Janssen ] + +o cache_overview_files also affects $TIN_INDEX_MAILDIR and $TIN_INDEX_SAVEDIR + overviews, is this desired? + [20151112 Urs Janssen ] + +o articles without a Message-ID are skipped as the code currently depends + on Message-IDs, but they might show up in mailgroups - assign a pseudo + Message-ID to them? + [20151111 Urs Janssen ] + +o create missing dir(s) in path to newsrc, right now get_newsrcname() + usually comes up with + "No permissions to go into /home/$USER/.tin/${NNTPSERVER}" + if one uses something like + * ~/.tin/${NNTPSERVER-localhost}/.newsrc + in newsrctable + [20150121 Urs Janssen ] + o make --with-defaults-dir= default to $sysconfdir/tin (=/usr/local/etc/tin)? [20110809 Urs Janssen ] @@ -857,9 +885,6 @@ o what about !us-ascii chars in usernam o what is or was HIST_HELP_SEARCH good for? And what about cHelp? [20101008 Urs Janssen ] -o fix memleaks on early exits (i.e. host unreachable, auth failed, ...) - [20100517 Urs Janssen ] - o charset conversion fails when converting articles from multibyte charsets with 0 bytes (UCS2, UCS4, UTF-16[[LB]E], UTF-32[[LB]E], ...), currently we just skip over such parts instead of handling them properly @@ -868,7 +893,7 @@ o charset conversion fails when convert o add "COMPRESS DEFLATE" support once it's official? this would require a rewrite of the code which reads data from the network (which should be done anyway for TLS) as we must handle null-bytes in the stream. - + [20100122 Urs Janssen ] o the documentation suggests that novrootdir/$TIN_NOVROOTDIR defaults to @@ -996,8 +1021,10 @@ 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.36 - (maybe even pcre2?) +o clean up included pcre stuff and update to >= pcre-8.37 + +o and pcre2 support (new API) + o shows up cross-postings multiple times even if read once before getting a resync/reread active/newsrc-file @@ -1046,6 +1073,8 @@ o add check for libarchive ] +o add check for liblockfile and/or liblock and use if found? + o add check for heapsort(3) in libbsd? [20130305 Urs Janssen ] @@ -1055,3 +1084,6 @@ o add jump to selected article from Dis o add check for libtre and offer TRE as matching method for "wildcard"? , [20130706 Urs Janssen ] + +o eval $NEWSHOST if $NNTPSERVER is unset (like Net::NNTP(3perl)) + [20141225 Urs Janssen ] diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/WHATSNEW tin-2.3.2/doc/WHATSNEW --- tin-2.3.1/doc/WHATSNEW 2014-10-25 19:16:43.000000000 +0200 +++ tin-2.3.2/doc/WHATSNEW 2015-12-22 00:25:46.571216732 +0100 @@ -2,11 +2,22 @@ New features and changes since tin-2.2.0 New features ------------ +- simplified Chinese translation +- handle RFC 2231 parameter value continuation +- skip over RFC 2231 language parameters Changes ------- The gTLD list is no longer actively maintained (too many new gTLD recently), -disable_gnksa_domain_check=ON might result in false positives. +disable_gnksa_domain_check=OFF might result in false positives. + +--enable-heapsort is now default during configure (sort_function in tinrc +still needs to be set accordingly if you like to use heapsort insted of +qsort) + +--enable-ipv6 is now default during configure Retired Features ---------------- +. groupname_max_length, can now be set via user defined screen layout at select + level diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/l10n/de/tin.1 tin-2.3.2/doc/l10n/de/tin.1 --- tin-2.3.1/doc/l10n/de/tin.1 2014-12-24 09:37:32.000000000 +0100 +++ tin-2.3.2/doc/l10n/de/tin.1 2015-12-22 11:27:24.279208947 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2014-12-24 +.\" Updated : 2015-12-01 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature @@ -14,7 +14,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 1 "24. Dezember 2014" 2.3.1 "Usenet Newsreader" +.TH tin 1 "24. Dezember 2015" 2.3.2 "Usenet Newsreader" .\" .\" .SH NAME @@ -47,7 +47,7 @@ Am Anfang zeigt \fBtin\fP eine Liste der \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 +('\fBj\fP') und \fBUp\fP ('\fBk\fP') benutzt werden. Mit Bildrauf/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. @@ -90,7 +90,7 @@ Verbindung via IPv4 zum NNTP Server erzw Verbindung via IPv6 zum NNTP Server erzwingen. .TP \fB\-a\fP -ANSI\-Farben ein/\-ausschalten (Standard ist aus). +ANSI\-Farben ein/\-ausschalten (Voreinstellung ist aus). .TP \fB\-A\fP Erzwinge Authentifikation beim Verbindungsaufbau. @@ -144,7 +144,7 @@ command (\fBRFC\%3977\fP ) \*(rq\fB\-ln\ article counts. .TP \fB\-m\fP\fI Verzeichnis\fP -Zu benutzendes Mailbox\-Verzeichnis. Standard ist +Zu benutzendes Mailbox\-Verzeichnis. Voreinstellung ist \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. .TP \fB\-M\fP\fI Benutzer\fP @@ -165,11 +165,11 @@ weitere Informationen siehe den Abschnit SPEICHERN VON UNGELESENEN ARTIKELN". .TP \fB\-o\fP -Quick post all postponed articles and exit. In order for this to be really -quick, it should be used with \*(rq\fB\-n\fP\*(rq if possible. +Schnell\-Modus um alle zurückgestellten Artikel zu posten und danach tin +wieder beenden. Nach Möglichkeit mit \*(rq\fB\-n\fP\*(rq kombinieren. .TP \fB\-p\fP\fI Port\fP -Zu benutzende Portnummer falls per NNTP gelesen wird (Standard ist +Zu benutzende Portnummer falls per NNTP gelesen wird (Voreinstellung ist 119). Übersteuert die Umgebungsvariable $\fBNNTPPORT\fP. .TP \fB\-q\fP @@ -222,15 +222,17 @@ No overwrite mode. \fI${TIN_HOMEDIR:\-"$ if they don't exist. .TP \fB\-z\fP -Only start \fBtin\fP if there is any new/unread news. If there is news \fBtin\fP -will position cursor at first group with unread news. Useful for putting in -login file. +\fBtin\fP nur starten wenn es neue/ungelesene Artikel gibt. Falls das der Fall +ist wird der Cursor auf die erste Gruppe mit ungelesenen Artikeln +positioniert. Nützlich um \fBtin\fP in login\-Dateien aufzurufen. .TP \fB\-Z\fP -Check if there is any new/unread news and exit with appropriate status. If -\&\*(rq\fB\-v\fP\*(rq option is specified the number of unread articles in each group -is printed. An exit code 0 indicates no news, 1 that an error occurred and 2 -that new/unread news exists. Useful for writing scripts. +Prüft ob es neue/ungelesene Artikel gibt und beendet sich mit dem +entsprechenden Rückgabewert. Falls mit der \&\*(rq\fB\-v\fP\*(rq Option kombiniert +wird die Zahl der ungelesenen Artikel in jeder Gruppe ausgegeben. Ein +Rückgabewert von 0 bedeutet keine ungelesene Artikel, 1 das ein Fehler +aufgetreten ist und 2 das ungelesene Artikel vorhanden sind. Nützlich in +Skripten. .PP \fBtin\fP can also dynamically change its options by the \fBOptionMenu\fP ('\fBM\fP') command. Any changes are written to @@ -284,17 +286,17 @@ directory (i.e., \fI${TIN_LIBDIR:\-NEWSL 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 (\fBRFC\%6048\fP ) and all modern servers should understand it. -.SS "SCREEN FORMAT" +.SS ANSICHTEN \fBtin\fP hat vier unterschiedliche Arbeitsebenen: Auswahlebene, Gruppenebene, Threadebene und Artikelebene. .PP -At the Selection level the title displays (the name of the news server and) -the number of subscribed groups (containing new unread articles). The -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. +In der Auswahlebene zeigt der Titel (der Name des News\-Server und) die +Anzahl der abonnierten Gruppen (mit neuen ungelesenen Artikel). Die +Newsgruppen werden in der Mitte des Bildschirms, in der Regel mit der Anzahl +der ungelesenen Artikel in der gleichen Zeile davor, abgebildet, aber das +kann mittels \fBselect_format\fP angepasst werden. .PP -.\" FIXME - make this autoscale +.\" FIXME - make this auto scale .nf \->M 1 2 comp.security.announce Announcements from the CERT abou M 2 1 news.admin.announce Announcements for news adminstra @@ -306,14 +308,14 @@ customized via \fBselect_format\fP. Eventuell steht am Anfang der Zeile noch eines der folgende Zeichen: .TP 10 \fBu\fP -This group is unsubscribed. To see only your subscribed groups use the -\fBSelectToggleReadDisplay\fP ('\fBr\fP') or \fBSelectYankActive\fP ('\fBy\fP') toggle -keys. +Diese Gruppe ist nicht abonniert. Um nur abonnierte Gruppen anzuzeigen kann +die \fBSelectToggleReadDisplay\fP ('\fBr\fP') oder \fBSelectYankActive\fP ('\fBy\fP') +Umschalttaste benutzt werden. .TP \fBM\fP -This is a moderated group. Any posts you make will have to be approved by -the group administrator before it will be made public. \fBtin\fP will ask for -confirmation before you post to a moderated group. +Diese Gruppe ist moderiert. Alle Postings müssen erst vom Gruppen\-Moderator +freigegeben werden bevor sie veröffentlicht werden. \fBtin\fP fragt vor dem +Posten in eine moderierte Gruppe nach einer Bestätigung. .TP \fBN\fP This is a new newsgroup which has been created since you last used @@ -370,7 +372,7 @@ the first (unread) article in the thread 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 +.\" FIXME - make this auto scale .nf de.admin.net\-abuse.announce (11B 13+ 1* 1o 0K) M @@ -384,7 +386,7 @@ be customized via \fBgroup_format\fP. At the Thread level the screen usually (depends on the threading method used) looks like this, but can be customized via \fBthread_format\fP: .PP -.\" FIXME - make this autoscale +.\" FIXME - make this auto scale .nf \-> 1 [ 7] What is this funny tree in the thr Robert F. Simmig 2 [ 12] +\-> Sephan Wagner '\fP -Read current group. +Lese die aktuelle Gruppe. .TP \fBSelectEnterNextUnreadGrp '' 'n'\fP Enter next group with unread news. Will wrap around to the beginning of the @@ -575,7 +577,7 @@ line. This will not be available if \fBt option. .TP \fBToggleInverseVideo 'I'\fP -Toggle inverse video. +(De)aktiviere inverse Darstellung. .TP \fBSelectMoveGrp 'm'\fP Move the current group within the group selection list. By entering '1' the @@ -591,8 +593,8 @@ OPTIONS MENU AND TINRC CONFIGURABLE VARI Setzt den Cursor auf die nächste Gruppe mit ungelesenen Artikeln. .TP \fBQuit 'q'\fP -Quit \fBtin\fP \- ask the user to confirm if \fBconfirm_choice\fP is set -accordingly. +\fBtin\fP beenden, falls \fBconfirm_choice\fP gesetzt ist wird nochmal +nachgefragt. .TP \fBQuitTin 'Q'\fP Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. @@ -679,7 +681,7 @@ Wählen Sie eine Reihe von Artikeln auf wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. .TP \fBLastViewed '\-'\fP -Re\-enter the last message that was viewed. +Zur zuletzt angezeigte Nachricht springen. .TP \fBSearchRepeat '\e'\fP Vorherige Suche wiederholen. @@ -691,7 +693,7 @@ Vorwärts nach dem angegebenem Subject s Rückwärts nach dem angegebenem Subject suchen. .TP \fBGroupSelThd '*'\fP -Select current thread for later processing. +Wähle aktuellen Thread für die spätere Verarbeitung aus. .TP \fBGroupDoAutoSel '+'\fP Selects all threads in current group. It is a shortcut for calling @@ -714,7 +716,7 @@ subjects. Entering just '\fB\fP' wil was entered. .TP \fBGroupReverseSel '@'\fP -Reverse all selections on all articles. +Markierung für alle Artikel umkehren. .TP \fBGroupUndoSel '~'\fP Undo all selections on all articles. It clears the toggle effect of @@ -746,17 +748,17 @@ explanation of these variables and "FILT on filtering. .TP \fBGroupReadBasenote '^J' ''\fP -Read current article. +Lese den aktuelle Artikel. .TP \fBGroupNextUnreadArtOrGrp ''\fP -View next unread article or group. +Zeige nächsten den ungelesenen Artikel oder die nächste Gruppe. .TP \fBSearchAuthF 'a'\fP -Author forward search. This searches for articles with a specific \*(rqFrom:\*(rq -line. +Autoren\-Suche vorwärts. Sucht nach Artikeln mit einem bestimmtem +\&\*(rqFrom:\*(rq\-Header. .TP \fBSearchAuthB 'A'\fP -Author backward search. Otherwise, see \fBSearchAuthF\fP ('\fBa\fP') above. +Autoren\-Suche rückwärts. Siehe auch \fBSearchAuthF\fP ('\fBa\fP') oben. .TP \fBSearchBody 'B'\fP Search the body of all articles in group (can be slow). You can abort the @@ -794,7 +796,7 @@ Display the subject of the first article line. .TP \fBToggleInverseVideo 'I'\fP -Toggle inverse video. +(De)aktiviere inverse Darstellung. .TP \fBGroupMarkThdRead 'K'\fP Mark article/thread as read and move onto the next unread article/thread. If @@ -803,7 +805,7 @@ of the current article/thread. When tagg prompt asks how to proceed. .TP \fBGroupListThd 'l'\fP -Open the thread under the current cursor position. +Öffnet den Thread unter der aktuellen Cursorposition. .TP \fBLookupMessage 'L'\fP Artikel anhand der \*(rqMessage\-ID:\*(rq nachschlagen. @@ -818,10 +820,10 @@ User configurable options menu (for more OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES"). .TP \fBGroupNextGroup 'n'\fP -Go to next group. +Zur nächsten Newsgruppe springen. .TP \fBGroupNextUnreadArt 'N'\fP -Go to next unread article. +Zum nächsten ungelesenen Artikel springen. .TP \fBPrint 'o'\fP Send current article / thread / auto\-selected (hot) articles / articles @@ -829,19 +831,19 @@ matching pattern / tagged articles to pr PIPING PRINTING REPOSTING AND SAVING ARTICLES" for more information. .TP \fBGroupPrevGroup 'p'\fP -Go to previous group. +Zur vorherigen Gruppe springen. .TP \fBGroupPrevUnreadArt 'P'\fP -Go to previous unread article. +Zum vorherigen ungelesenen Artikel gehen. .TP \fBQuit 'q'\fP -Return to previous level. +Kehre zur vorherigen Ebene zurück. .TP \fBQuitTin 'Q'\fP Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. .TP \fBGroupToggleReadUnread 'r'\fP -Toggle the display between all articles and unread articles. +Wechselt zwischen der Anzeige aller und nur ungelesener Artikel. .TP \fBBugReport 'R'\fP Einen Fehlerbericht oder Kommentar an @@ -870,18 +872,18 @@ threading by references, threading on bo multipart articles into a thread (\*(rqSubject:\*(rq based). .TP \fBGroupUntag 'U'\fP -Untag all articles that were tagged. +Markierung aller markierten Artikel entfernen. .TP \fBPost 'w'\fP -Post an article to current group. If posting fails for some reason, you'll -get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), postpone -it via \fBPostPostpone\fP ('\fBo\fP') for later processing (see also \*(rq\fB\-o\fP\*(rq -command\-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). +Post an article to the current group. If posting fails for some reason, +you'll get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), +postpone it for later processing via \fBPostPostpone\fP ('\fBo\fP') (see also +\&\*(rq\fB\-o\fP\*(rq command\-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). .TP \fBGroupRepost 'x'\fP Repost an already posted article / thread / auto\-selected (hot) articles / articles matching pattern / tagged articles to another newsgroup(s). Useful -for reposting from global to local newsgroups. Do not use this to cross\-post +for reposting from global to local newsgroups. Do not use this to crosspost your own articles. .TP \fBGroupMarkUnselArtRead 'X'\fP @@ -930,19 +932,19 @@ Wählen Sie eine Reihe von Artikeln auf wird. Siehe Abschnitt "BEREICHE" für weitere Informationen. .TP \fBLastViewed '\-'\fP -Re\-enter the last message that was viewed. +Zur zuletzt angezeigte Nachricht springen. .TP \fBSearchRepeat '\e'\fP Vorherige Suche wiederholen. .TP \fBSearchSubjF '/'\fP -Search forward for a specified subject. +Vorwärts nach dem angegebenem Subject suchen. .TP \fBSearchSubjB '?'\fP -Search backwards for a specified subject. +Rückwärts nach dem angegebenem Subject suchen. .TP \fBThreadSelArt '*'\fP -Select the current thread for later processing. +Wähle aktuellen Thread für die spätere Verarbeitung aus. .TP \fBThreadToggleArtSel '.'\fP Toggle selection of current article. @@ -970,7 +972,7 @@ line. The search will wrap over into the the current one. .TP \fBSearchAuthB 'A'\fP -Author backward search. Otherwise, see \fBSearchAuthF\fP ('\fBa\fP') above. +Autoren\-Suche rückwärts. Siehe auch \fBSearchAuthF\fP ('\fBa\fP') oben. .TP \fBSearchBody 'B'\fP Search the body of all articles in group (can be slow). You can abort the @@ -1000,7 +1002,7 @@ Filter\-Datei bearbeiten und danach anwe Subject des geöffneten Artikels in der untersten Zeile anzeigen. .TP \fBToggleInverseVideo 'I'\fP -Toggle inverse video. +(De)aktiviere inverse Darstellung. .TP \fBThreadMarkArtRead 'K'\fP Mark article as read and move onto the next unread article. If a range of @@ -1021,7 +1023,7 @@ matching pattern / tagged articles to pr PIPING PRINTING REPOSTING AND SAVING ARTICLES" for more information. .TP \fBQuit 'q'\fP -Return to previous level. +Kehre zur vorherigen Ebene zurück. .TP \fBQuitTin 'Q'\fP Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. @@ -1044,13 +1046,13 @@ Toggle tag status of current article for or reposting. .TP \fBThreadUntag 'U'\fP -Untag all tagged threads. +Markierung aller markierten Threads entfernen. .TP \fBPost 'w'\fP -Post an article to current group. If posting fails for some reason, you'll -get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), postpone -it for later processing via \fBPostPostpone\fP ('\fBo\fP') (see also \*(rq\fB\-o\fP\*(rq -command\-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). +Post an article to the current group. If posting fails for some reason, +you'll get the chance to edit the article again via \fBPostEdit\fP ('\fBe\fP'), +postpone it for later processing via \fBPostPostpone\fP ('\fBo\fP') (see also +\&\*(rq\fB\-o\fP\*(rq command\-line switch) or discard it via \fBQuit\fP ('\fBq\fP'). .TP \fBMarkArtUnread 'z'\fP Mark current article in thread as unread. If a range of articles is set, the @@ -1079,7 +1081,7 @@ Reply through mail to the author of the article with all headers included. .TP \fBPagePGPCheckArticle '^G'\fP -Perform \fB\%pgp\fP(1) operations on article. +\fB\%pgp\fP(1) Operation auf den Artikel an anwenden. .TP \fBPageToggleRaw '^H'\fP Toggles the display mode (raw including all headers vs. cooked). @@ -1118,7 +1120,7 @@ the hidden text back on. Scrolling down up will hide it again. .TP \fBLastViewed '\-'\fP -Re\-enter the last message that was viewed. +Zur zuletzt angezeigte Nachricht springen. .TP \fBSearchRepeat '\e'\fP Vorherige Suche wiederholen. @@ -1135,13 +1137,13 @@ is everything which matches \fBquote_reg \fBquote_regex3\fP. .TP \fBPageTopThd '<'\fP -Go to the first article in the current thread. +Gehe zum ersten Artikel im aktuellen Thread. .TP \fBPageBotThd '>'\fP -Go to the last article in the current thread. +Gehe zum letzten Artikel im aktuellen Thread. .TP \fBPageToggleHighlight '_'\fP -Toggle word highlighting on/off. +Wort\-Hervorheben ein\-/ausschalten. .TP \fBPipe '|'\fP Pipe current article / thread / auto\-selected (hot) articles / articles @@ -1219,10 +1221,11 @@ Zum Ende des Artikels springen. Subject des geöffneten Artikels in der untersten Zeile anzeigen. .TP \fBToggleInverseVideo 'I'\fP -Toggle inverse video. +(De)aktiviere inverse Darstellung. .TP \fBPageKillThd 'K'\fP -Mark rest of thread as read and move onto the next unread thread. +Markiere den Rest des Threads als gelesen und springe zu nächstem +ungelesenen Thread. .TP \fBPageListThd 'l'\fP Show the thread menu that the current article is a part of. @@ -1240,10 +1243,10 @@ User configurable options menu (for more OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES"). .TP \fBPageNextArt 'n'\fP -Go to the next article. +Gehe zum nächsten Artikel. .TP \fBPageNextUnreadArt 'N'\fP -Go to the next unread article. +Zum nächsten ungelesenen Artikel springen. .TP \fBPrint 'o'\fP Send current article / thread / auto\-selected (hot) articles / articles @@ -1251,13 +1254,13 @@ matching pattern / tagged articles to pr PIPING PRINTING REPOSTING AND SAVING ARTICLES" for more information. .TP \fBPagePrevArt 'p'\fP -Go to the previous article. +Gehe zum vorherigen Artikel. .TP \fBPagePrevUnreadArt 'P'\fP Go to the previous unread article. .TP \fBQuit 'q'\fP -Return to the previous level. +Kehrt zur vorherigen Ebene zurück. .TP \fBQuitTin 'Q'\fP Beendet \fBtin\fP sofort, ohne Bestätigungsnachfrage. @@ -1283,7 +1286,7 @@ Toggle tag status of current article for or reposting. .TP \fBPageGroupSel 'T'\fP -Return to group selection level. +Kehrt zur Auswahlebene zurück. .TP \fBPageGotoParent 'u'\fP Go to parent article. @@ -1335,13 +1338,13 @@ Suche nach URL (rückwärts). Vorherige Suche wiederholen. .TP \fBShellEscape '!'\fP -Shell escape. +Ausgang zur Shell. .TP \fBToggleInfoLastLine 'i'\fP -Toggle the display of the current URL in the last line. +Anzeige der aktuellen URL in der letzten Zeile (de)aktivieren. .TP \fBHelp 'h'\fP -Help screen of commands available. +Hilfeseite der verfügbaren Befehle. .TP \fBToggleHelpDisplay 'H'\fP Mini\-Hilfe am unterem Bildschirmrand ein\-/ausschalten. @@ -1355,7 +1358,7 @@ available: .RS 4 .TP 10 \fBAttachPipe 'p'\fP -Pipe attachment into command. +Anhang an Befehl weiterleiten. .TP \fBAttachSave 's'\fP Save current attachment / tagged attachments to disk. @@ -1371,10 +1374,10 @@ Prompts for a pattern to match. All atta content type/transfer encoding match the pattern will be tagged. .TP \fBAttachToggleTagged '@'\fP -Reverse tagging of all attachments. +Markierung der Anhänge umkehren. .TP \fBAttachUntag 'U'\fP -Untag all tagged attachments. +Markierung der markierten Anhängen aufheben. .TP \fBSearchSubjF '/'\fP Attachment forward search. @@ -1389,13 +1392,13 @@ Vorherige Suche wiederholen. Pipe attachment into command. Uses the raw attachment, no decoding is done. .TP \fBShellEscape '!'\fP -Shell escape. +Ausgang zur Shell. .TP \fBToggleInfoLastLine 'i'\fP Name oder Beschreibung des Anhangs in der untersten Zeile anzeigen. .TP \fBHelp 'h'\fP -Help screen of commands available. +Hilfeseite der verfügbaren Befehle. .TP \fBToggleHelpDisplay 'H'\fP Mini\-Hilfe am unterem Bildschirmrand ein\-/ausschalten. @@ -1404,14 +1407,14 @@ Mini\-Hilfe am unterem Bildschirmrand ei .\" .SS "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" .\" FIXME - add missing descriptions -.\" - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used +.\" - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used .\" in the !TIN_DEFAULTS_DIR config case 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/etc/tin/tinrc\fP is read. After that, the user's own configuration file is -read from \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP. The global file is useful -for distributing system\-wide defaults to new users who have no private tinrc +\fBtin\fP works. If it exists, the global configuration file, \fI/etc/tin/tinrc\fP +is read. After that, the user's own configuration file is read from +\fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP. The global file is useful for +distributing system\-wide defaults to new users who have no private tinrc yet. .PP The variables are user configurable by editing @@ -1447,22 +1450,24 @@ the name of the corresponding setting in \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/tinrc\fP. .TP 4 \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. +Falls On werden, sofern nötig, lange Newsgruppennamen in der Auswahl\- und +Artikelebene wie folgt abgekürzt: news.software.readers \-> +n.software.readers \-> n.s.readers \-> n.s.r. Voreinstellung ist OFF. .TP \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. +Falls ON füge gepostete Artikel die einen neuen Thread einleiten zum Filter +hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON. .TP -\fBFüge 'User\-Agent:'\-header ein (advertising)\fP -Turn ON advertising in header (\*(rqUser\-Agent:\*(rq). Default is ON. +\fBFüge 'User\-Agent:'\-Header ein (advertising)\fP +Falls ON füge 'User\-Agent:'\-Header ein. Voreinstellung ist ON. .TP \fBÜbersp. multipart/alternative\-Teile (alternative_handling)\fP -If ON strip multipart/alternative messages automatically. Default is ON. +Falls ON entsorge multipart/alternative Teile des Artikels +automatisch. Voreinstellung ist ON. .TP \fBZeichen für gelöschte Artikel (art_marked_deleted)\fP -Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Standard is 'D'. +Zeichen das anzeigt, dass ein Artikel gelöscht wurde. Voreinstellung ist +\&'D'. .TP \fBZeichen für Artikel im Bereich (art_marked_inrange)\fP The character used to show that an article is in a range. Default is '#'. @@ -1480,15 +1485,16 @@ The character used to show that an artic X days). See also \fBrecent_time\fP. Default is 'o'. .TP \fBZeichen für ungelesene Artikel (art_marked_unread)\fP -The character used to show that an article has not been read. Default is -\&'+'. +Zeichen das anzeigt, dass ein Artikel noch nicht gelesen +wurde. Voreinstellung ist '+'. .TP \fBZeichen für gelesene Artikel (art_marked_read)\fP -The character used to show that an article was read. Default is ' '. +Zeichen das anzeigt, dass ein Artikel schon gelesen wurde. Voreinstellung +ist ' '. .TP \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. +Zeichen das anzeigt, dass ein Artikel gekillt wurde. Voreinstellung ist +\&'K'). \fBkill_level\fP muss passend gesetzt sein. .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. @@ -1504,11 +1510,11 @@ 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. -Default is ON. +Falls ON: Thread beim Betreten mit der rechten Cursortaste automatisch +anzeigen? Voreinstellung ist ON. .TP \fBAutom. Wiederverbindung zum Server (auto_reconnect)\fP -Standard ist OFF. +Voreinstellung ist OFF. .TP \fBNutze Archive\-name: zum Speichern (auto_save)\fP If ON articles/threads with \*(rqArchive\-name:\*(rq in header will be @@ -1517,8 +1523,9 @@ if \fBpost_process_type\fP is set to som OFF. .TP \fBSpeicher Artikel im Batchmode (\-S) (batch_save)\fP -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. +Falls ON werden Artikel/Threads im Batchmode gespeichert wenn \*(rq\fB\-S\fP oder +gemailt, wenn \*(rq\fB\-M\fP\*(rq bzw. \*(rq\fB\-N\fP\*(rq in der Kommandozeile angegeben +wurde. Voreinstellung ist ON. .TP \fBZeigt Minimenü & Posting etiquette (beginner_level)\fP If set ON a mini menu of the most useful commands will be displayed at the @@ -1539,6 +1546,9 @@ current session should be marked read. D \fBStandard Hintergrundfarbe (col_back)\fP Standard Hintergrundfarbe .TP +\fBFarbe des Fremdzitat\-Textes (col_extquote)\fP +Farbe des Fremdzitat\-Textes +.TP \fBFarbe des Autors (From:) (col_from)\fP Farbe des Autors (From:) .TP @@ -1611,7 +1621,7 @@ Farbe der Textzeilen Farbe des Hilfe/Mail\-Zeichens .TP \fBBestätigung erforderlich für (confirm_choice)\fP -Ask for manual confirmation to protect the user. +Vorsichtshalber um Bestätigung bitten. .RS +.5i .IP \(bu 3 .\" TODO: check if all affected commands are marked [after confirmation] @@ -1643,7 +1653,7 @@ fallback code. Default is "%a, %d %b %Y The last article/author/config option that was searched for. .TP \fB(default_filter_days)\fP -Standard ist 28. +Voreinstellung ist 28. .TP \fB(default_filter_kill_case)\fP Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF @@ -1658,7 +1668,7 @@ Default for quick (1 key) kill filter gl OFF=apply to current group. Default is ON. .TP \fB(default_filter_kill_header)\fP -Default for quick (1 key) kill filter header. +Voreinstellung für Schnell (1 Tasten) Killfilter Header. .RS +.5i .IP 0 4 \*(rqSubject:\*(rq (Groß/Kleinschreibung beachten) @@ -1671,7 +1681,7 @@ Default for quick (1 key) kill filter he .IP 4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge .IP 5 -\&\*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag + \*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag .IP 6 \*(rqMessage\-ID:\*(rq allein .IP 7 @@ -1688,7 +1698,7 @@ Default for quick (1 key) auto\-selectio .TP \fB(default_filter_select_global)\fP Default for quick (1 key) auto\-selection filter global. ON=apply to all -groups OFF=apply to current group. Default is ON. +groups, OFF=apply to current group. Default is ON. .TP \fB(default_filter_select_header)\fP Default for quick (1 key) auto\-selection filter header. @@ -1704,7 +1714,7 @@ Default for quick (1 key) auto\-selectio .IP 4 \*(rqMessage\-ID:\*(rq & alle \*(rqReferences:\*(rq Einträge .IP 5 -\&\*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag + \*(rqMessage\-ID:\*(rq & letzter \*(rqReferences:\*(rq Eintrag .IP 6 \*(rqMessage\-ID:\*(rq allein .IP 7 @@ -1751,7 +1761,15 @@ an highlighted bar if set OFF. Default i .TP \fBAufruf Ihres Editors (editor_format)\fP The format string used to create the editor start command with parameters. -Default is "%E +%N %F" (i.e., /bin/vi +7 .article). +Default is "%E +%N %F" (e.g., /bin/vi +7 .article). +.TP +\fBFremdzitate erkennen (extquote_handling)\fP +Falls ON werden Fremdzitate in Artikeln erkannt. Voreinstellung ist ON. +.TP +\fBRegulärer Ausd. für Zeilen mit Fremdzitaten (extquote_regex)\fP +A regular expression that will be applied when reading articles. All +matching lines are shown in \fBcol_extquote\fP. If \fBextquote_regex\fP is blank, +then \fBtin\fP uses a built\-in default. .TP \fBAnzeigeauffrischung nach Kommandos (force_screen_redraw)\fP Specifies whether a screen redraw should always be done after certain @@ -1764,7 +1782,8 @@ fetching articles from your first unread \fBgetart_limit\fP. Default is 0, which means no limit. .TP \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. +Falls ON: Catchup (als gelesen markieren) der Gruppe beim Verlassen mit der +linken Cursortaste. Voreinstellung ist ON. .TP \fBFormatanweisung für die Gruppenebene (group_format)\fP Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Gruppenebene @@ -1779,22 +1798,18 @@ current one. When \fBPageNextUnread\fP i next article when \fBPageNextUnread\fP ('\fB\fP') is pressed. Default is \fBPageNextUnread\fP. .TP -\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 \fBZeige uue\-Teile als Anhang (hide_uue)\fP 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 -size and filename (much the same as a MIME attachment). If set to 'Hide all' -then any line that looks like uuencoded data will be folded into a tag -line. This is useful when uuencoded data is split across more than one +size and filename (much the same as a MIME attachment). If set to 'Hide +all' then any line that looks like uuencoded data will be folded into a tag +line. This is useful when uuencoded data is split across more than one article but can also lead to false positives. This setting can also be -toggled in the article viewer. Default is 'No'. +toggled in the article viewer. Default is 'No'. .TP \fBExternes inews\-Programm (inews_prog)\fP 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 +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 @@ -1850,7 +1865,7 @@ 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 (\fBRFC\%5322\fP and \fBRFC\%2047\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 @@ -1878,13 +1893,30 @@ program. It allows the user to save arti \&'=' 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 ... The format string used to create the mailer command with parameters that is used for mailing articles to other people. Default is '%M "%T" < %F' (e.g., /bin/mail "iain" < .article). The flexible format allows other -mailers with different command\-line parameters to be used such as 'elm \-s -"%S" "%T" < "%F"' (e.g., elm \-s "subject" "iain" < .article) or -\&'sendmail \-oi \-oem \-t < %F' (e.g. sendmail \-oi \-oem \-t < .article). +mailers with different command line parameters to be used such as +.in +.3i +.nf +sendmail \-oem \-t < %F +elm \-s "%S" "%T" < "%F" +claws\-mail \-\-compose "mailto:%T?subject=%S&insert=%F" +.fi +.in -.3i +\fBinteractive_mailer\fP muss passend dazu gesetzt sein. Folgende Ersetzungen +werden unterstützt: +.in +.3i +.nf +.ta \w'%S'u +\w'default_mailer'u +%F Dateiname +%M default_mailer +%S Subject\-Feld +%T To\-Feld +%U Benutzername +%% % +.fi +.in -.3i .TP \&\fB'Art. (un)gelesen markieren' ignorie... (mark_ignore_tags)\fP When this is ON, the \fBGroupMarkThdRead\fP ('\fBK\fP'), \fBThreadMarkArtRead\fP @@ -1903,7 +1935,7 @@ non\-textual parts of articles. To use \-\-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. +any attachments. See also \fBask_for_metamail\fP. .TP \fBMM_CHARSET (mm_charset)\fP Charset supported locally, which is also used for MIME header (charset @@ -1957,19 +1989,20 @@ These are internal timers used by \fBtin Do not change them unless you understand what they are for. .TP \fBor *) (news_headers_to_display\fP -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 -you enter 'X\-' as the value, you will see all headers beginning with 'X\-' -(like X\-Alan or X\-Pape). You can list more than one by delimiting with -spaces. Not defining anything turns off this option. +Welche Header wollen Sie sehen. Wenn Sie _alle_ sehen wollen, setzen Sie ein +\&'*' als Wert ein. Dies ist die einzige Möglichkeit, um Platzhalter +(Wildcards) zu nutzen. Wenn Sie als Wert 'X\-' angeben, sehen Sie alle Header +die mit 'X\-' beginnen (wie X\-Alan oder X\-Pape). Sie können mehrere durch +Leerzeichen getrennte Werte angeben. Wenn Sie hier nichts definieren wird +diese Option deaktiviert. .TP \fBZeige folgende Header nicht an (news_headers_to_not_display)\fP -Same as \fBnews_headers_to_display\fP except it denotes the opposite. An -example of using both options might be if you thought X\- headers were A Good -Thing(tm), but thought Alan and Pape were miscreants... well then you would -do something like this: \fInews_headers_to_display=X\-\fP -\fInews_headers_to_not_display=X\-Alan X\-Pape\fP. Not defining anything turns -off this option. +Genau das gleiche wie 'news_headers_to_display', mit der Ausnahme, das es +das Gegenteil bewirkt. Wenn Sie dachten, das die X\- Header eine tolle Sachen +waren, nun aber festgestellt haben, das dort einiges überflüssiges steht, +dann könnten Sie wie folgt vorgehen: \fBnews_headers_to_display=X\-\fP +\fBnews_headers_to_not_display=X\-Alan X\-Pape\fP Wenn Sie hier nichts angeben, +wird diese Option deaktiviert. .TP \fBEinleitungszeile beim Antworten (news_quote_format)\fP Format der Einleitungszeile für Newsartikel (%A=Mailadresse, %D=Datum, @@ -2015,8 +2048,8 @@ local hierarchy of your interest to dete .TP \fBMIME\-Kodierung in Newsartikeln (post_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. base64 -and quoted\-printable are usually undesired on usenet. +quoted\-printable, 7bit). Default is 8bit, which leads to no encoding. +base64 and quoted\-printable are usually undesired on usenet. .TP \fBNachbearbeitete Artikel anzeigen (post_process_view)\fP If ON, then \fBtin\fP will start an appropriate viewer program to display any @@ -2051,12 +2084,11 @@ machines. Printing from \fBtin\fP may ha Administrator. .TP \fBBearbeite nur ungelesene Artikel (process_only_unread)\fP -If ON only save/print/pipe/mail unread articles (tagged articles excepted). -Default is OFF. +Falls ON speichere/drucke/pipe/maile nur ungelesene Artikel (markierte +Artikel ausgenommen). Voreinstellung ist OFF. .TP \fBLeeres Fup'2 im Editor anzeigen (prompt_followupto)\fP -If ON show empty \*(rqFollowup\-To:\*(rq header when editing an article. Default is -OFF. +Falls ON zeige leeren Followup\-To:\-Header im Editor. Voreinstellung ist OFF. .TP \fBZitatzeichen (quote_chars)\fP The character used in quoting included text to article followups and mail @@ -2129,14 +2161,14 @@ using cursor\-up/down. The default is 1 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. This setting supersedes show_last_line_prev_page=ON. Set to \-2 to get -half\-page scrolling. This setting supersedes full_page_scroll=OFF. +half\-page scrolling. This setting supersedes \fBfull_page_scroll\fP=OFF. .TP \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 +\fBIm Gruppen\- und Threadlevel, zeige Autor an mit (show_author)\fP Which information about the author should be shown. Default is 2, authors full name. .RS +.5i @@ -2162,7 +2194,7 @@ and turn descriptions off. The text used \fI${TIN_HOMEDIR:\-"$HOME"}/.tin/mailgroups\fP for mailgroups. Default is ON. .TP \fBSortierfunktion (sort_function)\fP -Sortierfunktion für Artikel. Standard ist 0. +Sortierfunktion für Artikel. Voreinstellung ist 0. .RS +.5i .IP 0 3 Mit \fB\%qsort\fP(3) sortieren. @@ -2194,11 +2226,11 @@ If ON show only new/unread articles othe ON. .TP \fBZeige nur Gruppen mit ungel. Art. (show_only_unread_groups)\fP -If ON show only subscribed groups that contain unread articles. Default is -OFF. +Falls ON zeige nur abonnierte Gruppen mit ungelesen Artikeln. Voreinstellung +ist OFF. .TP \fBZeige Signaturen an (show_signatures)\fP -If OFF don't show signatures when displaying articles. Default is ON. +Falls OFF zeige keine Signaturen an. Voreinstellung ist ON. .TP \fBTrenne Sig mit '\en\-\- \en' ab (sigdashes)\fP If ON prepend the signature with sigdashes. Default is ON. @@ -2213,7 +2245,8 @@ current newsgroup as argument to the pro signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. .TP \fBSignatur beim Reposten anhängen (signature_repost)\fP -If ON add signature to reposted articles. Default is ON. +Falls ON wird die Signatur auch an repostete Artikel +angehängt. Voreinstellung ist ON. .TP \fBReg. für /Schrägst./ Hervorhebungen (slashes_regex)\fP A regular expression that will be applied when reading articles. All @@ -2253,11 +2286,11 @@ This specifies how threads will be sorte the default. The following sort types are allowed: .RS +.5i .IP 0 3 -\fBNothing\fP, don't sort threads. +\fBNichts\fP, keine Sortierung der Threads. .IP 1 -\fBScore (descending)\fP, sort threads by filtering score descending (default). +\fBScore (absteigend)\fP, Threads absteigend nach Score sortieren. .IP 2 -\fBScore (ascending)\fP, sort threads by filtering score ascending. +\fBScore (aufsteigend)\fP, Threads aufsteigend nach Score sortieren. .IP 3 \fBLast posting date (descending)\fP, sort threads by date of last posting descending. @@ -2330,8 +2363,8 @@ The default is Both Subject and Referenc .IP 2 \fBReferences\fP, Diskussionsfaden nur anhand von \*(rqReferences:\*(rq aufbauen. .IP 3 -\fBBoth Subject and References\fP, Diskussionsfaden anhand von -\&\*(rqReferences:\*(rqund \*(rqSubject:\*(rq aufbauen. (Voreinstellung). +\fBBoth Subject and References\fP, Diskussionsfaden anhand von \*(rqReferences:\*(rq +und \*(rqSubject:\*(rq aufbauen (Voreinstellung). .IP 4 \fBMultipart Subject\fP, thread multipart articles on \*(rqSubject:\*(rq. .IP 5 @@ -2340,8 +2373,8 @@ The default is Both Subject and Referenc .RE .TP \fBCatchup mit der linken Cursort. (thread_catchup_on_exit)\fP -If ON catchup group/thread when leaving with the left arrow key. Default is -ON. +Falls ON: Catchup (als gelesen markieren) der Gruppe/des Threads beim +Verlassen mit der linken Cursortaste. Voreinstellung ist ON. .TP \fBFormatanweisung für die Threadebene (thread_format)\fP Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Threadebene @@ -2401,21 +2434,21 @@ matching words are shown in \fBcol_markd \fBunderscores_regex\fP is blank, then \fBtin\fP uses a built\-in default. .TP \fBEntferne ~/.article nach dem posten (unlink_article)\fP -If ON remove \fI~/.article\fP after posting. Default is ON. +Falls ON entferne ~/.article nach dem posten. Voreinstellung ist ON. .TP \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. -Default is \fBurl_handler.pl %s\fP. +The program that will be run when launching URLs in the article viewer 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 Enable highlighting URLs in message body. Default is ON. .TP \fBBenutze ANSI\-Farben (use_color)\fP -If enabled \fBtin\fP uses ANSI\-colors. Default is OFF. +AMSI\-Farben in \fBtin\fP benutzen. Voreinstellung ist OFF. .TP \fBScrollt. vom Nummernblock nutzen (use_keypad)\fP -Standard ist OFF. +Voreinstellung ist OFF. .TP \fBMaus in xterm nutzen (use_mouse)\fP Allows the mouse button support in a \fB\%xterm\fP(1x) to be @@ -2423,25 +2456,27 @@ enabled/disabled. Default is OFF. .TP \&\fB\*(rqX\-Face:\*(rqs mit slrnface Anzeigen (use_slrnface)\fP 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 +header. For this option to have any effect, \fBtin\fP must be running in a \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 +\fBUTF\-8\-Grafik benutzten (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 -A regular expression that tin will use to find the begin of a verbatim -block. +Ein regulärer Ausdruck, der den Beginn eines wortgetreu wiederzugebenden +Absatzes findet. .TP \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. +Ein regulärer Ausdruck, der das Ende eines wortgetreu wiederzugebenden +Absatzes findet. .TP \fBWortgetreue Textblöcke erkennen (verbatim_handling)\fP -If ON verbatim blocks will be detected. Default is ON. +Falls ON werden wortgetreue Textblöcke in Artikeln erkannt. Voreinstellung +ist ON. .TP -\fBWildcardprüfung (wildcard)\fP +\fBPlatzhalter\-Übereinstimmung (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 \fB\%perl\fP(1) compatible regular @@ -2496,7 +2531,7 @@ no private attributes file yet. Note that the \fIscope=\fP 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 +to change (e.g., \fBsavedir\fP). All toggle attributes are set by specifying ON/OFF. Otherwise, these function exactly the same as their global equivalents. For more details see \fB\%tin\fP(5). .PP @@ -2505,7 +2540,7 @@ accessed by \fBConfigToggleAttrib\fP ('\ or \fBScopeSelect\fP ('\fB^J\fP' or '\fB\fP') from the scopes menu. The attributes menu looks and behaves very similar to the options menu. The title shows the current scope. Attributes set in the current scope are -marked with '\+' to the left of the attributes number. +marked with '+' to the left of the attributes number. .PP .\" .\" @@ -2570,7 +2605,7 @@ user. The user entered string can be app 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" +.SS "ARTIKEL POSTEN" \fBtin\fP allows posting of articles, follow\-up to already posted articles and replying direct through mail to the author of an article. .PP @@ -2662,18 +2697,18 @@ according to the default save parameters attributes set for the current group. .PP 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. +hot (auto\-selected), regular expression pattern, tagged articles you wish to +mail, pipe etc. .PP 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 -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 -News"). Any articles that match the entered expression will be mailed, piped -etc. See also the \fBwildcard\fP tinrc variable for advanced pattern matching -options. +If a regular expression pattern is selected you are asked to enter a pattern +(e.g., to match all articles subject lines containing 'net News' you enter +"net News"). Any articles that match the entered expression will be mailed, +piped etc. See also the \fBwildcard\fP tinrc variable for advanced pattern +matching options. .PP Various expansion characters are recognized when entering the directory and file to save to. Environment variables (prefixed with '$') and user home @@ -2701,8 +2736,8 @@ that expire has removed a whole load of \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 +structure under your \fBsavedir\fP 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 When using \*(rq\fB\-S\fP\*(rq together with a given directory to save to (\*(rq\fB\-s\fP\*(rq @@ -2870,25 +2905,30 @@ durchgeschaltet werden. 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 +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: +Die Länge der einzelnen Elemente (außer '\fB%%\fP') kann mit einer positiven +Zahl nach dem '\fB%\fP' definiert werden. Das folgende Beispiel stellt den +Score in der Threadebene 10 Zeichen breit dar: '\fB%10S\fP'. +.PP +Wenn der Gruppenname zusammen mit der Guppeneschreibungen angezeigt wird, +kann die Breite des Gruppennamen über einen optionalen, durch Komma +getrennten, zweiten Wert gesteuert werden (z. B. '\fB%60,20G\fP'). Der erste +Wert kann weglassen werden (z. B. ('\fB%,20G\fP))'. Wenn kein zweiter Wert +angegeben ist verwendet \fBtin\fP ein Standardwert von 32. +.PP +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 +.ta \w'Platzhalter 'u +\w'Breite'u Platzhalter Breite \fB%I\fP 3 \fB%L\fP 4 @@ -2910,17 +2950,21 @@ werden soll, im Dezember gepostet wurde. die maximale Länge manuell zu ermitteln und in die Formatanweisung einzutragen. .PP +Falls der Formatstring enthält '\fB%G\fP' und '\fB%d\fP' enthält und keine Länge +gegeben ist, bestimmt der längste Gruppenname die Länge für '\fB%G\fP.' Der +verbleibende Platz wird für '\fB%d\fP' verwendet. +.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 +Weiterhin kann eine Mindestbildschirmbreite pro Element (außer '\fB%%\fP') +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 @@ -2931,7 +2975,7 @@ soll, muss zuerst die Länge und danach 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" +.SS "TIPPS 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. @@ -2940,8 +2984,8 @@ In den folgenden Newsgruppen finden sich Newssoftware: .in +.5i .ti -\w'\(em'u -\(emde.comm.software.newsreader (Informationen über Newsrader wie tin, slrn, -\&...) +\(emde.comm.software.newsreader (Informationen über Newsreader wie tin, +slrn, ...) .ti -\w'\(em'u \(emnews.software.nntp (Informationen über NNTP) .ti -\w'\(em'u @@ -2952,7 +2996,7 @@ Many prompts within \fBtin\fP offer a de 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 \fB\%xterm\fP(1x) it will resize itself each time the +When \fBtin\fP is run in a \fB\%xterm\fP(1x) it will resize itself each time the \fB\%xterm\fP(1x) is resized. .PP \fBtin\fP will reread the @@ -3275,7 +3319,7 @@ compiled into the \fBtin\fP binary, defa 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 +Define this variable if you want to override the \fBOVERVIEW_FILE\fP filename 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 @@ -3508,7 +3552,7 @@ The pathname of the user's login shell. \fBXDG_RUNTIME_DIR\fP .\" .\" -The pathname of the user's dir to put non\-essential runtime files into. +The pathname of the user's dir to put non\-essential run time files into. .SH SIGNALE .\" TODO: add missing, sort useful, document in detail \fBtin\fP verarbeitet folgende Signale: @@ -3520,7 +3564,7 @@ Terminate gracefully. Terminate gracefully. .TP \fBSIGUSR1\fP -Terminate gracefully but do not restore tty. +Beenden ohne das Terminal (tty) wiederherzustellen. .TP \fBSIGUSR2\fP .\" @@ -3531,7 +3575,7 @@ Terminate gracefully but do not restore .\" .\" .\" -Write out \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP\-file. +Speichern der \fI${TIN_HOMEDIR:\-"$HOME"}/.newsrc\fP\-Datei. .SH SICHERHEIT .\" .\" @@ -3567,7 +3611,7 @@ Before mailing a bug\-report to -n.software.readers \-> n.s.readers \-> n.s.r. Default is OFF. +Falls On werden, sofern nötig, lange Newsgruppennamen in der Auswahl\- und +Artikelebene wie folgt abgekürzt: news.software.readers \-> +n.software.readers \-> n.s.readers \-> n.s.r. Voreinstellung ist OFF. .TP \fBadd_posted_to_filter\fP -If ON add posted articles which start a new thread to filter for -highlighting follow\-ups. Default is ON. +Falls ON füge gepostete Artikel die einen neuen Thread einleiten zum Filter +hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON. .TP \fBadvertising\fP -Turn ON advertising in header (\*(rqUser\-Agent:\*(rq). Default is ON. +Falls ON füge 'User\-Agent:'\-Header ein. Voreinstellung ist ON. .TP \fBalternative_handling\fP -If ON strip multipart/alternative messages automatically. Default is ON. +Falls ON entsorge multipart/alternative Teile des Artikels +automatisch. Voreinstellung ist 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. Voreinstellung ist +\&'D'. .TP \fBart_marked_inrange\fP The character used to show that an article is in a range. Default is '#'. @@ -1196,15 +1202,16 @@ The character used to show that an artic X days). See also \fBrecent_time\fP. Default is 'o'. .TP \fBart_marked_unread\fP -The character used to show that an article has not been read. Default is -\&'+'. +Zeichen das anzeigt, dass ein Artikel noch nicht gelesen +wurde. Voreinstellung ist '+'. .TP \fBart_marked_read\fP -The character used to show that an article was read. Default is ' '. +Zeichen das anzeigt, dass ein Artikel schon gelesen wurde. Voreinstellung +ist ' '. .TP \fBart_marked_killed\fP -The character used to show that an article was killed. Default is 'K'. -\fBkill_level\fP must be set accordingly. +Zeichen das anzeigt, dass ein Artikel gekillt wurde. Voreinstellung ist +\&'K'). \fBkill_level\fP muss passend gesetzt sein. .TP \fBart_marked_read_selected\fP The character used to show that an article was hot before it was read. @@ -1220,8 +1227,8 @@ 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. -Default is ON. +Falls ON: Thread beim Betreten mit der rechten Cursortaste automatisch +anzeigen? Voreinstellung ist ON. .TP \fBauto_reconnect\fP Reconnect to server automatically. Default is OFF. @@ -1233,8 +1240,9 @@ if \fBpost_process_type\fP is set to som OFF. .TP \fBbatch_save\fP -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. +Falls ON werden Artikel/Threads im Batchmode gespeichert wenn \*(rq\fB\-S\fP oder +gemailt, wenn \*(rq\fB\-M\fP\*(rq bzw. \*(rq\fB\-N\fP\*(rq in der Kommandozeile angegeben +wurde. Voreinstellung ist ON. .TP \fBbeginner_level\fP If set ON a mini menu of the most useful commands will be displayed at the @@ -1253,6 +1261,9 @@ current session should be marked read. D \fBcol_back\fP Standard Hintergrundfarbe .TP +\fBcol_extquote\fP +Farbe des Fremdzitat\-Textes +.TP \fBcol_from\fP Farbe des Autors (From:) .TP @@ -1303,7 +1314,7 @@ Farbe von zweifach zitierten Zeilen Farbe von =>3\-fach zitierten Zeilen .TP \fBcol_response\fP -Color of response counter. This is the text that says 'Response x of y' in +Color of response counter. This is the text that says "Response x of y" in the article viewer. .TP \fBcol_signature\fP @@ -1329,17 +1340,17 @@ Farbe des Hilfe/Mail\-Zeichens choices: .in +.5i .\" TODO: check if all affected commands are marked [after confirmation] -\fBcommands:\fP Ask for confirmation before executing certain dangerous +\fBcommands\fP: Ask for confirmation before executing certain dangerous 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 \fB\%tin\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 +\fBselect\fP: Ask for confirmation before marking all not selected (with \fBGroupMarkUnselArtRead\fP ('\fBX\fP') command) articles as read. .in -.5i -Default is commands & quit. +Voreinstellung ist Kommandos & Ende. .TP \fBdate_format\fP Format string used for date representation. A description of the different @@ -1355,22 +1366,22 @@ fallback code. Default is "%a, %d %b %Y The last article/author/config option that was searched for. .TP \fBdefault_filter_days\fP -Standard ist 28. +Voreinstellung ist 28. .TP \fBdefault_filter_kill_case\fP -Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF +Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF = ignore case. Default is OFF. .TP \fBdefault_filter_kill_expire\fP -Default for quick (1 key) kill filter expire. ON = limit to -\&'\fBdefault_filter_days\fP', OFF = don't ever expire. Default is OFF. +Default for quick (1 key) kill filter expire. ON = limit to +\fBdefault_filter_days\fP, OFF = don't ever expire. Default is OFF. .TP \fBdefault_filter_kill_global\fP -Default for quick (1 key) kill filter global. ON=apply to all groups, +Default for quick (1 key) kill filter global. ON=apply to all groups, OFF=apply to current group. Default is ON. .TP \fBdefault_filter_kill_header\fP -Default for quick (1 key) kill filter header. +Voreinstellung für Schnell (1 Tasten) Killfilter Header. .in +.3i .nf .ta \w'0,1 'u +\w'\'\'Message\-ID:\'\' & letzter \'\'References:\'\' Eintrag'u @@ -1390,11 +1401,11 @@ Default for quick (1 key) auto\-selectio sensitive, OFF=ignore case. Default is OFF. .TP \fBdefault_filter_select_expire\fP -Default for quick (1 key) auto\-selection filter expire. ON = limit to -\&'\fBdefault_filter_days\fP', OFF = don't ever expire. Default is OFF. +Default for quick (1 key) auto\-selection filter expire. ON = limit to +\fBdefault_filter_days\fP, OFF = don't ever expire. Default is OFF. .TP \fBdefault_filter_select_global\fP -Default for quick (1 key) auto\-selection filter global. ON=apply to all +Default for quick (1 key) auto\-selection filter global. ON=apply to all groups, OFF=apply to current group. Default is ON. .TP \fBdefault_filter_select_header\fP @@ -1449,13 +1460,21 @@ Default for quick (1 key) auto\-selectio .TP \fBdraw_arrow\fP Allows groups/articles to be selected by an arrow '\->' if set ON or by -an highlighted bar if set OFF. +an highlighted bar if set OFF. Default is OFF. .TP \fBeditor_format\fP 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 +\fBextquote_handling\fP +Falls ON werden Fremdzitate in Artikeln erkannt. Voreinstellung ist ON. +.TP +\fBextquote_regex\fP +A regular expression that will be applied when reading articles. All +matching lines are shown in \fBcol_extquote\fP. If \fBextquote_regex\fP is blank, +then \fBtin\fP uses a built\-in default. +.TP \fBforce_screen_redraw\fP Specifies whether a screen redraw should always be done after certain external commands. Default is OFF. @@ -1475,7 +1494,8 @@ next article when \fBPageNextUnread\fP ( 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. +Falls ON: Catchup (als gelesen markieren) der Gruppe beim Verlassen mit der +linken Cursortaste. Voreinstellung ist ON. .TP \fBgroup_format\fP Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Gruppenebene @@ -1498,10 +1518,6 @@ Ersetzungen werden unterstützt: .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. -.TP \fBhide_uue\fP 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 @@ -1519,8 +1535,8 @@ article'. .TP \fBinfo_in_last_line\fP If ON, show current group description or article subject in the last line -(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP' toggles -setting). This facility is useful as the full width of the screen is +(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP') toggles +setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP \fBinteractive_mailer\fP @@ -1588,7 +1604,7 @@ details on MBOXO and MBOXRD and \fB\%mmd 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. +\&'=' 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 @@ -1606,12 +1622,12 @@ claws\-mail \-\-compose "mailto:%T?subje werden unterstützt: .in +.3i .nf -.ta \w'%S'u +\w'Subject\-Feld'u +.ta \w'%S'u +\w'default_mailer'u %F Dateiname %M default_mailer %S Subject\-Feld %T To\-Feld -%U Username +%U Benutzername %% % .fi .in -.3i @@ -1638,7 +1654,7 @@ any attachments. See also \fBask_for_met \fBmm_charset\fP Charset supported locally, which is also used for MIME header (charset parameter and charset name in header encoding) in mail and news postings. If -\fBMIME_STRICT_CHARSET\fP is defined at the compile time, text in charset other +\fBMIME_STRICT_CHARSET\fP is defined at compile time, text in charset other than the value of this parameter is considered not displayable and represented as '?'. Otherwise, all character sets are regarded as compatible with the display. If it's not set, the value of the environment variable @@ -1651,7 +1667,7 @@ Charset used for posting and MIME header Conversion between \fBmm_network_charset\fP and local charset (determined via \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 +\fBmm_charset\fP instead. \fBmm_network_charset\fP is limited to one of the following charsets: .in +.3i US\-ASCII, ISO\-8859\-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8\-{R,U,RU} @@ -1663,22 +1679,22 @@ $\fBMM_CHARSET\fP is used. US\-ASCII or neither of them is defined. .TP \fBmono_markdash\fP -Character attribute of words emphasized like _this_. It is depending on your +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. .TP \fBmono_markslash\fP -Character attribute of words emphasized like /this/. It is depending on your +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. .TP \fBmono_markstar\fP -Character attribute of words emphasized like *this*. It is depending on your +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. .TP \fBmono_markstroke\fP -Character attribute of words emphasized like \-this\-. It is depending on your +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. .TP @@ -1687,19 +1703,20 @@ These are internal timers used by \fB\%t newsgroups. Do not change them unless you understand what they are for. .TP \fBnews_headers_to_display\fP -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 -you enter 'X\-' as the value, you will see all headers beginning with 'X\-' -(like X\-Alan or X\-Pape). You can list more than one by delimiting with -spaces. Not defining anything turns off this option. +Welche Header wollen Sie sehen. Wenn Sie _alle_ sehen wollen, setzen Sie ein +\&'*' als Wert ein. Dies ist die einzige Möglichkeit, um Platzhalter +(Wildcards) zu nutzen. Wenn Sie als Wert 'X\-' angeben, sehen Sie alle Header +die mit 'X\-' beginnen (wie X\-Alan oder X\-Pape). Sie können mehrere durch +Leerzeichen getrennte Werte angeben. Wenn Sie hier nichts definieren wird +diese Option deaktiviert. .TP \fBnews_headers_to_not_display\fP -Same as \fBnews_headers_to_display\fP except it denotes the opposite. An -example of using both options might be if you thought 'X\-' headers were A -Good Thing(tm), but thought Alan and Pape were miscreants... well then you -would do something like this: \fBnews_headers_to_display=X\-\fP -\fBnews_headers_to_not_display=X\-Alan X\-Pape\fP Not defining anything turns off -this option. +Genau das gleiche wie 'news_headers_to_display', mit der Ausnahme, das es +das Gegenteil bewirkt. Wenn Sie dachten, das die X\- Header eine tolle Sachen +waren, nun aber festgestellt haben, das dort einiges überflüssiges steht, +dann könnten Sie wie folgt vorgehen: \fBnews_headers_to_display=X\-\fP +\fBnews_headers_to_not_display=X\-Alan X\-Pape\fP Wenn Sie hier nichts angeben, +wird diese Option deaktiviert. .TP \fBnews_quote_format\fP Format der Einleitungszeile für Newsartikel (%A=Mailadresse, %D=Datum, @@ -1708,7 +1725,8 @@ Format der Einleitungszeile für Newsart wrote:". .TP \fBnntp_read_timeout_secs\fP -Time in seconds to wait for a response from the server. Default is 120. +Maximal n Sekunden auf eine Antwort vom Server warten (0 = kein +Zeitlimit). Voreinstellung ist 120. .TP \fBnormalization_form\fP The normalization form which should be used to normalize unicode input. The @@ -1731,7 +1749,7 @@ possible. .TP \fBpos_first_unread\fP If ON put cursor at first unread article in group otherwise at last -article. Default is ON. +article. Default is ON. .TP \fBpost_8bit_header\fP Allows 8bit characters unencoded in the header of a news article, if set @@ -1785,12 +1803,12 @@ machines. Printing from \fB\%tin\fP(1) Administrator. .TP \fBprocess_only_unread\fP -If ON only save/print/pipe/mail unread articles (tagged articles excepted). -Default is OFF. +Falls ON speichere/drucke/pipe/maile nur ungelesene Artikel (markierte +Artikel ausgenommen). Voreinstellung ist OFF. .TP \fBprompt_followupto\fP -If ON show empty \*(rqFollowup\-To:\*(rq header when editing an article. Default -is OFF. +Falls ON zeige leeren \*(rqFollowup\-To:\*(rq\-Header im Editor. Voreinstellung ist +OFF. .TP \fBquote_chars\fP .\" TODO: document %s @@ -1868,10 +1886,10 @@ Score of an article which should be mark \fBscroll_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 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. This setting -supersedes show_last_line_prev_page=ON. Set to \-2 to get half\-page -scrolling. This setting supersedes full_page_scroll=OFF. +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. +This setting supersedes show_last_line_prev_page=ON. Set to \-2 to get +half\-page scrolling. This setting supersedes \fBfull_page_scroll\fP=OFF. .TP \fBselect_format\fP Diese Formatanweisung wird von \fBtin\fP zur Darstellung der Auswahlebene @@ -1890,7 +1908,7 @@ werden unterstützt: .in -.3i .TP \fBsort_function\fP -Sortierfunktion für Artikel. Standard ist 0. +Sortierfunktion für Artikel. Voreinstellung ist 0. .RS +.5i .IP 0 3 Mit \fB\%qsort\fP(3) sortieren. @@ -1932,7 +1950,7 @@ show only the line count. \fBNichts\fP. Keine weiteren Informationen werden angezeigt. .IP 1 \fBLines\fP, 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 +and in thread listing the line count of first (unread) article will be displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed and @@ -1943,15 +1961,15 @@ in thread listing the score of the threa .RE .TP \fBshow_only_unread_arts\fP -If ON show only new/unread articles otherwise show all articles. Default is +If ON show only new/unread articles otherwise show all articles. Default is ON. .TP \fBshow_only_unread_groups\fP -If ON show only subscribed groups that contain unread articles. Default is -OFF. +Falls ON zeige nur abonnierte Gruppen mit ungelesen Artikeln. Voreinstellung +ist OFF. .TP \fBshow_signatures\fP -If OFF don't show signatures when displaying articles. Default is ON. +Falls OFF zeige keine Signaturen an. Voreinstellung ist ON. .TP \fBsigdashes\fP If ON prepend the signature with sigdashes. Default is ON. @@ -1966,7 +1984,8 @@ current newsgroup as argument to the pro signature. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/.Sig\fP. .TP \fBsignature_repost\fP -If ON add signature to reposted articles. Default is ON. +Falls ON wird die Signatur auch an repostete Artikel +angehängt. Voreinstellung ist ON. .TP \fBslashes_regex\fP A regular expression that will be applied when reading articles. All @@ -2006,11 +2025,11 @@ This specifies how threads will be sorte the default. The following sort types are allowed: .RS +1i .IP 0 3 -\fBNothing\fP, don't sort threads. +\fBNichts\fP, keine Sortierung der Threads. .IP 1 -\fBScore (descending)\fP, sort threads by filtering score descending (default). +\fBScore (absteigend)\fP, Threads absteigend nach Score sortieren. .IP 2 -\fBScore (ascending)\fP, sort threads by filtering score ascending. +\fBScore (aufsteigend)\fP, Threads aufsteigend nach Score sortieren. .IP 3 \fBLast posting date (descending)\fP, sort threads by date of last posting descending. @@ -2022,7 +2041,9 @@ ascending. \fBspamtrap_warning_addresses\fP 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. +these strings. The matching is case\-insensitive. Example: +.sp +\fIspam,delete,remove\fP .TP \fBstars_regex\fP A regular expression that will be applied when reading articles. All @@ -2096,8 +2117,8 @@ Match for threads to be considered part the range 0 to 100. The default is 75. .TP \fBthread_catchup_on_exit\fP -If ON catchup group/thread when leaving with the left arrow key. Default is -ON. +Falls ON: Catchup (als gelesen markieren) der Gruppe/des Threads beim +Verlassen mit der linken Cursortaste. Voreinstellung ist ON. .TP \fBthread_score\fP How the total score of a thread is computed. Default is 0, the maximum score @@ -2148,8 +2169,8 @@ matching words are shown in \fBcol_markd \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 -ON. +Falls ON entferne \fI${TIN_HOMEDIR:\-"$HOME"}/.article\fP nach dem +posten. Voreinstellung ist ON. .TP \fBurl_handler\fP The program that will be run when launching URLs in the article viewer using @@ -2172,8 +2193,8 @@ enabled/disabled. Default is OFF. \fBuse_slrnface\fP 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. +a \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 @@ -2188,16 +2209,17 @@ Ein regulärer Ausdruck, der das Ende ei Absatzes findet. Voreinstellung ist #v\- .TP \fBverbatim_handling\fP -Falls ON werden wortgetreue Textblöcke in Artiklen erkannt. Voreinstellung +Falls ON werden wortgetreue Textblöcke in Artikeln erkannt. Voreinstellung ist ON. .TP -\fBwildcard\fP +\fBPlatzhalter\fP 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 \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. +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 \fBword_h_display_marks\fP Should the leading and ending stars, slashes, strokes and dashes also be @@ -2217,7 +2239,7 @@ available. If \fBuse_color\fP is enabled \fBcol_markdash\fP, \fBcol_markslash\fP, \fBcol_markstar\fP and \fBcol_markstroke\fP are used for word highlighting else the character attributes specified in \fBmono_markdash\fP, \fBmono_markslash\fP, \fBmono_markstar\fP and \fBmono_markstroke\fP -are used. +are used. Default is ON. .TP \fBwrap_column\fP Sets the column at which a displayed article body should be wrapped. If @@ -2275,16 +2297,17 @@ Default charset to be used in MIME's \*( header. $\fBMM_CHARSET\fP overrides any specified value. .TP \fBpost_mime_encoding\fP -Default encoding scheme used in MIME articles. 8bit might be the best value. +Voreingestellte Zeichenkodierung in MIME\-Artikeln. 8bit ist wahrscheinlich +die beste Wahl. .TP \fBmail_mime_encoding\fP -Default encoding scheme used in MIME letters. quoted\-printable is a good -choice here. +Voreingestellte Zeichenkodierung in MIME\-Mails. Quoted\-Printable ist hier +eine gute Wahl. .TP \fBdisable_gnksa_domain_check\fP Unregistrierte Top\-Level\-Domains zulassen. Da die Liste der gültigen TLDs nicht mehr aktiv gepflegt wird wurde ab \fB\%tin\fP(1) Version 2.1.5 die -Voreinstellung auf ON gändert. +Voreinstellung auf ON geändert. .TP \fBdisable_sender\fP Keinen \*(rqSender:\*(rq Header erzeugen. Falls \fBinews_prog\fP nicht auf \-\-internal @@ -2361,37 +2384,38 @@ is rejected. Each line consists of four space\-separated fields "\fIname\fP \fIhighmark\fP \fIlowmark\fP \fIflags\fP". .TP -\fBname\fP +\fBName\fP ist der Name der Newsgruppe .TP \fBhighmark\fP 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 than the highest article number, then there -are no articles in the newsgroup. +ist die niedrigste Artikelnummer in der Gruppe; es ist nicht gewährleistet, +dass diese Zahl genau ist und sie sollte nur als Hinweis angesehen +werden. Beachten Sie, dass es aufgrund von Artikel Stornierungen, zu Lücken +in der Nummerierung Sequenz kommen kann. Falls die niedrigste Artikelnummer +größer als die höchste Artikelnummer ist, dann gibt es keine Artikel in der +Newsgroup. .TP \fBflags\fP -can be one of those +kann eines der folgenden sein .RS .TP \fBy\fP -local postings are allowed +lokale Postings sind erlaubt .TP \fBn\fP -no local postings are allowed, only remote ones +lokale Postings sind nicht erlaubt, Artikel kommen nur über andere Server .TP \fBm\fP 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 +Artikel in dieser Gruppe werden nicht gespeichert sondern nur durchgereicht .TP \fBx\fP -in diese Gruppe darf nicht geposted werden +in diese Gruppe darf nicht gepostet werden .TP \fB=foo.bar\fP Artikel werden auf dem Server in der Gruppe \*(rqfoo.bar\*(rq abgelegt @@ -2412,14 +2436,14 @@ is normally updated by the local news se a new group is created. Each line consist of three space\-separated fields "\fIname\fP \fItime\fP \fIcreator\fP". .TP -\fBname\fP +\fBName\fP ist der Name der Newsgruppe .TP \fBtime\fP -is the time when the group was created, expressed as the number of seconds -since the epoch. +Zeit wann die Gruppe erzeugt wurde, ausgedrückt als Anzahl von Sekunden seit +Beginn der Epoche. .TP -\fBcreator\fP +\fBErsteller\fP die Mailadresse der Person die die Gruppe angelegt hat. .TP \fB\%tin\fP(1) @@ -2453,7 +2477,7 @@ command instead. \fI${TIN_LIBDIR:\-NEWSLIBDIR}/organization\fP .sp .RS -This file specifies might hold a default organization to be used in the +This file might hold a default organization to be used in the \&\*(rqOrganization:\*(rq header. $\fBORGANIZATION\fP has a higher priority if set. .RE .PP @@ -2485,12 +2509,12 @@ the LIST SUBSCRIPTIONS (\fBRFC\%6048\fP) .SH "SIEHE AUCH" \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 +\fB\%metamail\fP(1), \fB\%perl\fP(1), \fB\%perlre\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\%pcrepattern\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.3.1/doc/l10n/de.po tin-2.3.2/doc/l10n/de.po --- tin-2.3.1/doc/l10n/de.po 2014-12-24 09:37:02.000000000 +0100 +++ tin-2.3.2/doc/l10n/de.po 2015-12-22 11:27:20.483209143 +0100 @@ -1,13 +1,13 @@ -# German translations for the tin manpages. +# German translations for the tin man pages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2008-2014. +# Urs Janssen , 2008-2016. # msgid "" msgstr "" "Project-Id-Version: tin-man 2.3.0\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2014-12-24 09:36+0100\n" -"PO-Revision-Date: 2013-12-25 14:15+0100\n" +"POT-Creation-Date: 2015-12-22 11:26+0100\n" +"PO-Revision-Date: 2015-12-01 15:50+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: German \n" "Language: de\n" @@ -24,14 +24,14 @@ msgstr "tin" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "December 24th, 2014" -msgstr "24. Dezember 2014" +msgid "December 24th, 2015" +msgstr "24. Dezember 2015" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.3.1" -msgstr "2.3.1" +msgid "2.3.2" +msgstr "2.3.2" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -95,8 +95,9 @@ msgstr "" "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<\\%newsoverview>" -"(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 #: doc/tin.1:64 @@ -124,7 +125,7 @@ msgstr "" "\"}/.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) " +"benutzt werden. Mit Bildrauf/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 " "'BCRE>' betreten." @@ -150,7 +151,7 @@ msgid "Interactive mode:" msgstr "Interaktiver-Modus:" #. type: TP -#: doc/tin.1:80 doc/tin.1:90 doc/tin.1:1080 doc/tin.1:3409 +#: doc/tin.1:80 doc/tin.1:90 doc/tin.1:1083 doc/tin.1:3448 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -161,7 +162,7 @@ msgid "Successful program execution." msgstr "Programm erfolgreich beendet." #. type: TP -#: doc/tin.1:83 doc/tin.1:93 doc/tin.1:3412 +#: doc/tin.1:83 doc/tin.1:93 doc/tin.1:3451 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -182,7 +183,7 @@ msgid "No unread news" msgstr "Keine ungelesenen Nachrichten vorhanden" #. type: TP -#: doc/tin.1:96 doc/tin.1:3415 +#: doc/tin.1:96 doc/tin.1:3454 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -229,7 +230,7 @@ msgstr "B<-a>" #. type: Plain text #: doc/tin.1:112 msgid "Toggle ANSI color (default is off)." -msgstr "ANSI-Farben ein/-ausschalten (Standard ist aus)." +msgstr "ANSI-Farben ein/-ausschalten (Voreinstellung ist aus)." #. type: TP #: doc/tin.1:112 @@ -398,8 +399,8 @@ msgstr "B<-m>I< Verzeichnis>" #: 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>." +"Zu benutzendes Mailbox-Verzeichnis. Voreinstellung ist I<${TIN_HOMEDIR:-" +"\"$HOME\"}/Mail>." #. type: TP #: doc/tin.1:166 @@ -461,6 +462,8 @@ 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 "" +"Schnell-Modus um alle zurückgestellten Artikel zu posten und danach tin " +"wieder beenden. Nach Möglichkeit mit ''B<-n>'' kombinieren." #. type: TP #: doc/tin.1:185 @@ -474,8 +477,8 @@ 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." +"Zu benutzende Portnummer falls per NNTP gelesen wird (Voreinstellung ist " +"119). Übersteuert die Umgebungsvariable $B." #. type: TP #: doc/tin.1:189 @@ -655,6 +658,9 @@ msgid "" "will position cursor at first group with unread news. Useful for putting in " "login file." msgstr "" +"B nur starten wenn es neue/ungelesene Artikel gibt. Falls das der Fall " +"ist wird der Cursor auf die erste Gruppe mit ungelesenen Artikeln " +"positioniert. Nützlich um B in login-Dateien aufzurufen." #. type: TP #: doc/tin.1:242 @@ -670,6 +676,12 @@ msgid "" "is printed. An exit code 0 indicates no news, 1 that an error occurred and 2 " "that new/unread news exists. Useful for writing scripts." msgstr "" +"Prüft ob es neue/ungelesene Artikel gibt und beendet sich mit dem " +"entsprechenden Rückgabewert. Falls mit der \\&''B<-v>'' Option kombiniert " +"wird die Zahl der ungelesenen Artikel in jeder Gruppe ausgegeben. Ein " +"Rückgabewert von 0 bedeutet keine ungelesene Artikel, 1 das ein Fehler " +"aufgetreten ist und 2 das ungelesene Artikel vorhanden sind. Nützlich in " +"Skripten." #. type: Plain text #: doc/tin.1:254 @@ -770,7 +782,7 @@ msgstr "" #: doc/tin.1:302 #, no-wrap msgid "SCREEN FORMAT" -msgstr "" +msgstr "ANSICHTEN" #. type: Plain text #: doc/tin.1:305 @@ -790,6 +802,11 @@ msgid "" "of unread articles displayed on the same line in front, but it can be " "customized via B." msgstr "" +"In der Auswahlebene zeigt der Titel (der Name des News-Server und) die " +"Anzahl der abonnierten Gruppen (mit neuen ungelesenen Artikel). Die " +"Newsgruppen werden in der Mitte des Bildschirms, in der Regel mit der Anzahl " +"der ungelesenen Artikel in der gleichen Zeile davor, abgebildet, aber das " +"kann mittels B angepasst werden." #. type: Plain text #: doc/tin.1:319 @@ -826,6 +843,9 @@ msgid "" "B ('B') or B ('B') toggle " "keys." msgstr "" +"Diese Gruppe ist nicht abonniert. Um nur abonnierte Gruppen anzuzeigen kann " +"die B ('B') oder B ('B') " +"Umschalttaste benutzt werden." #. type: TP #: doc/tin.1:327 @@ -840,6 +860,9 @@ msgid "" "the group administrator before it will be made public. B will ask for " "confirmation before you post to a moderated group." msgstr "" +"Diese Gruppe ist moderiert. Alle Postings müssen erst vom Gruppen-Moderator " +"freigegeben werden bevor sie veröffentlicht werden. B fragt vor dem " +"Posten in eine moderierte Gruppe nach einer Bestätigung." #. type: TP #: doc/tin.1:332 @@ -1025,7 +1048,7 @@ msgstr "" #: doc/tin.1:428 #, no-wrap msgid "COMMON MOVING KEYS" -msgstr "" +msgstr "GEMEINSAME BEWEGUNGSTASTEN" #. type: Plain text #: doc/tin.1:431 @@ -1033,6 +1056,8 @@ msgid "" "This table shows the common keys used for moving around all levels within " "B." msgstr "" +"Diese Tabelle zeigt Tasten welche in B in allen Ebenen zum Navigieren " +"verwendet werden." #. type: ta #: doc/tin.1:433 @@ -1057,128 +1082,128 @@ msgstr "" #: doc/tin.1:445 #, no-wrap msgid "COMMON EDITING COMMANDS" -msgstr "" +msgstr "GEMEINSAME BEARBEITUNGSBEFEHLE" #. type: Plain text -#: doc/tin.1:450 +#: doc/tin.1:452 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 " -"addition to the cursor keys, the following commands are available when " -"editing a string:" +"An B<\\%emacs>(1) style editing package allows the easy editing of input " +"strings. A history list allows the easy reuse of previously entered " +"strings. In addition to the cursor keys, the following commands are " +"available when editing a string:" msgstr "" #. type: TP -#: doc/tin.1:451 +#: doc/tin.1:453 #, no-wrap msgid "B<^A, ^E>" msgstr "B<^A, ^E>" #. type: Plain text -#: doc/tin.1:454 +#: doc/tin.1:456 msgid "move to beginning or end of line, respectively." -msgstr "An den Zeillenanfang bzw. das Zeilenende springen." +msgstr "An den Zeilenanfang bzw. das Zeilenende springen." #. type: TP -#: doc/tin.1:454 +#: doc/tin.1:456 #, no-wrap msgid "B<^F, ^B>" msgstr "B<^F, ^B>" #. type: Plain text -#: doc/tin.1:457 +#: doc/tin.1:459 msgid "non-destructive move forward or back one location, respectively." msgstr "" #. type: TP -#: doc/tin.1:457 +#: doc/tin.1:459 #, no-wrap msgid "B<^D>" msgstr "B<^D>" #. type: Plain text -#: doc/tin.1:461 +#: doc/tin.1:463 msgid "" "delete the character currently under the cursor, or send EOF if no " "characters in the buffer." msgstr "" #. type: TP -#: doc/tin.1:461 +#: doc/tin.1:463 #, no-wrap msgid "B<^H, EDELE>" msgstr "B<^H, EENTFE>" #. type: Plain text -#: doc/tin.1:464 +#: doc/tin.1:466 msgid "delete character left of the cursor." msgstr "Zeichen links vom Cursor löschen." #. type: TP -#: doc/tin.1:464 +#: doc/tin.1:466 #, no-wrap msgid "B<^K>" msgstr "B<^K>" #. type: Plain text -#: doc/tin.1:467 +#: doc/tin.1:469 msgid "delete from cursor to end of line." msgstr "Lösche vom Cursor bis zum Zeilenende." #. type: TP -#: doc/tin.1:467 +#: doc/tin.1:469 #, no-wrap msgid "B<^P, ^N>" msgstr "B<^P, ^N>" #. type: Plain text -#: doc/tin.1:470 +#: doc/tin.1:472 msgid "move through history, previous and next, respectively." msgstr "" #. type: TP -#: doc/tin.1:470 +#: doc/tin.1:472 #, no-wrap msgid "B<^L, ^R>" msgstr "B<^L, ^R>" #. type: Plain text -#: doc/tin.1:473 +#: doc/tin.1:475 msgid "redraw the current line." msgstr "Aktuelle Zeile neu aufbauen." #. type: TP -#: doc/tin.1:473 +#: doc/tin.1:475 #, no-wrap msgid "BCRE>" msgstr "BCRE>" #. type: Plain text -#: doc/tin.1:477 +#: doc/tin.1:479 msgid "" "places line on history list if non-blank, appends newline and returns to the " "caller." msgstr "" #. type: TP -#: doc/tin.1:477 +#: doc/tin.1:479 #, no-wrap msgid "BESCE>" msgstr "BESCE>" #. type: Plain text -#: doc/tin.1:482 +#: doc/tin.1:484 msgid "aborts the present editing operation." msgstr "bricht den gegenwärtigen Bearbeitungsvorgang ab." #. type: SS -#: doc/tin.1:482 +#: doc/tin.1:484 #, no-wrap msgid "GLOBAL COMMANDS" msgstr "ALLGEMEINE BEFEHLE" #. type: Plain text -#: doc/tin.1:485 +#: doc/tin.1:487 msgid "" "The following commands are available at all 4 menu levels and always have " "the same effect." @@ -1187,13 +1212,13 @@ msgstr "" "überall das Gleichen." #. type: TP -#: doc/tin.1:486 doc/tin.1:1352 doc/tin.1:1405 +#: doc/tin.1:488 doc/tin.1:1355 doc/tin.1:1408 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:491 +#: doc/tin.1:493 msgid "" "Shell escape. B by itself will launch a shell, B " "EcommandE will run an external EcommandE. This facility may " @@ -1201,57 +1226,57 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:491 +#: doc/tin.1:493 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:494 +#: doc/tin.1:496 msgid "Toggle use of ANSI color." msgstr "ANSI Farben ein-/ausschalten." #. type: TP -#: doc/tin.1:494 +#: doc/tin.1:496 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:497 +#: doc/tin.1:499 msgid "Redraw the current screen." msgstr "Bildschirminhalt neu aufbauen." #. type: TP -#: doc/tin.1:497 +#: doc/tin.1:499 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:500 +#: doc/tin.1:502 msgid "Scroll screen up by one line." msgstr "Eine Zeile nach oben blättern (scrollen)." #. type: TP -#: doc/tin.1:500 +#: doc/tin.1:502 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:503 +#: doc/tin.1:505 msgid "Scroll screen down by one line." msgstr "Eine Zeile nach unten blättern (scrollen)." #. type: TP -#: doc/tin.1:503 +#: doc/tin.1:505 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:517 +#: doc/tin.1:519 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 " @@ -1267,13 +1292,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:517 doc/tin.1:1358 doc/tin.1:1412 +#: doc/tin.1:519 doc/tin.1:1361 doc/tin.1:1415 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:523 +#: doc/tin.1:525 msgid "" "Help screen of commands available on the current menu. You can use " "B ('B'), B ('B') and B ('B<" @@ -1281,24 +1306,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:523 doc/tin.1:1361 doc/tin.1:1415 +#: doc/tin.1:525 doc/tin.1:1364 doc/tin.1:1418 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:526 doc/tin.1:1364 doc/tin.1:1418 +#: doc/tin.1:528 doc/tin.1:1367 doc/tin.1:1421 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "Mini-Hilfe am unterem Bildschirmrand ein-/ausschalten." #. type: TP -#: doc/tin.1:526 +#: doc/tin.1:528 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:532 +#: doc/tin.1:534 msgid "" "List articles posted by user. The date posted, the newsgroup and the subject " "are listed. You can use B ('B'), B ('B') and " @@ -1307,55 +1332,55 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:532 +#: doc/tin.1:534 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:537 +#: doc/tin.1:539 msgid "Print B version information." msgstr "Versions-Informationen ausgeben." #. type: SS -#: doc/tin.1:537 +#: doc/tin.1:539 #, no-wrap msgid "NEWSGROUP SELECTION COMMANDS" msgstr "BEFEHLE ZUR GRUPPENAUSWAHL" #. type: TP -#: doc/tin.1:538 doc/tin.1:669 doc/tin.1:919 doc/tin.1:1083 doc/tin.1:3421 +#: doc/tin.1:540 doc/tin.1:671 doc/tin.1:922 doc/tin.1:1086 doc/tin.1:3460 #, no-wrap msgid "B<4>" msgstr "B<4>" #. type: Plain text -#: doc/tin.1:541 +#: doc/tin.1:543 msgid "Select group 4." msgstr "Gruppe 4 auswählen." #. type: TP -#: doc/tin.1:541 +#: doc/tin.1:543 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:545 +#: doc/tin.1:547 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 -#: doc/tin.1:545 doc/tin.1:690 doc/tin.1:940 +#: doc/tin.1:547 doc/tin.1:692 doc/tin.1:943 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:549 doc/tin.1:694 doc/tin.1:944 +#: doc/tin.1:551 doc/tin.1:696 doc/tin.1:947 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1364,152 +1389,152 @@ msgstr "" "wird. Siehe Abschnitt \"BEREICHE\" für weitere Informationen." #. type: TP -#: doc/tin.1:549 +#: doc/tin.1:551 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:552 +#: doc/tin.1:554 msgid "Sort the list of newsgroups." -msgstr "Liste vorhandener Newsgroups sortieren." +msgstr "Liste vorhandener Newsgruppen sortieren." #. 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 +#: doc/tin.1:554 doc/tin.1:699 doc/tin.1:950 doc/tin.1:1140 doc/tin.1:1352 +#: doc/tin.1:1402 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:555 doc/tin.1:950 doc/tin.1:1140 doc/tin.1:1352 doc/tin.1:1402 +#: doc/tin.1:557 doc/tin.1:953 doc/tin.1:1143 doc/tin.1:1355 doc/tin.1:1405 msgid "Repeat the previous search." msgstr "Vorherige Suche wiederholen." #. 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 +#: doc/tin.1:557 doc/tin.1:702 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 -#: doc/tin.1:558 +#: doc/tin.1:560 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 -#: doc/tin.1:558 doc/tin.1:703 doc/tin.1:953 doc/tin.1:1143 doc/tin.1:1346 -#: doc/tin.1:1396 +#: doc/tin.1:560 doc/tin.1:705 doc/tin.1:956 doc/tin.1:1146 doc/tin.1:1349 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:561 +#: doc/tin.1:563 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 -#: doc/tin.1:561 +#: doc/tin.1:563 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:564 +#: doc/tin.1:566 msgid "Read current group." -msgstr "" +msgstr "Lese die aktuelle Gruppe." #. type: TP -#: doc/tin.1:564 +#: doc/tin.1:566 #, no-wrap msgid "BTABE' 'n'>" msgstr "BTABE' 'n'>" #. type: Plain text -#: doc/tin.1:568 +#: doc/tin.1:570 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 -#: doc/tin.1:568 doc/tin.1:778 doc/tin.1:991 doc/tin.1:1201 +#: doc/tin.1:570 doc/tin.1:780 doc/tin.1:994 doc/tin.1:1204 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:572 +#: doc/tin.1:574 msgid "" "Make current group as all read [after confirmation] and move to the next " "group in the group selection list." msgstr "" #. type: TP -#: doc/tin.1:572 doc/tin.1:782 doc/tin.1:995 doc/tin.1:1205 +#: doc/tin.1:574 doc/tin.1:784 doc/tin.1:998 doc/tin.1:1208 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:576 +#: doc/tin.1:578 msgid "" "Mark current group as all read [after confirmation] and enter the next " "unread group in the group selection list." msgstr "" #. type: TP -#: doc/tin.1:576 +#: doc/tin.1:578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:580 +#: doc/tin.1:582 msgid "" "Toggle display to show just the group name or the group name and the group " "descriptions." msgstr "" #. type: TP -#: doc/tin.1:580 doc/tin.1:795 doc/tin.1:1008 doc/tin.1:1217 +#: doc/tin.1:582 doc/tin.1:797 doc/tin.1:1011 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:583 doc/tin.1:798 doc/tin.1:1011 doc/tin.1:1220 +#: doc/tin.1:585 doc/tin.1:800 doc/tin.1:1014 doc/tin.1:1223 msgid "Edit the filter file and reload it afterwards." msgstr "Filter-Datei bearbeiten und danach anwenden." #. type: TP -#: doc/tin.1:583 +#: doc/tin.1:585 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:587 doc/tin.1:802 +#: doc/tin.1:589 doc/tin.1:804 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 -#: doc/tin.1:587 doc/tin.1:805 doc/tin.1:1011 doc/tin.1:1233 doc/tin.1:1355 -#: doc/tin.1:1408 +#: doc/tin.1:589 doc/tin.1:807 doc/tin.1:1014 doc/tin.1:1236 doc/tin.1:1358 +#: doc/tin.1:1411 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:592 +#: doc/tin.1:594 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>'' " @@ -1517,24 +1542,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:592 doc/tin.1:809 doc/tin.1:1014 doc/tin.1:1236 +#: doc/tin.1:594 doc/tin.1:811 doc/tin.1:1017 doc/tin.1:1239 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:595 doc/tin.1:812 doc/tin.1:1017 doc/tin.1:1239 +#: doc/tin.1:597 doc/tin.1:814 doc/tin.1:1020 doc/tin.1:1242 msgid "Toggle inverse video." -msgstr "" +msgstr "(De)aktiviere inverse Darstellung." #. type: TP -#: doc/tin.1:595 +#: doc/tin.1:597 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:601 +#: doc/tin.1:603 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 " @@ -1543,61 +1568,62 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:601 doc/tin.1:829 doc/tin.1:1253 +#: doc/tin.1:603 doc/tin.1:831 doc/tin.1:1256 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:605 doc/tin.1:833 doc/tin.1:1257 +#: doc/tin.1:607 doc/tin.1:835 doc/tin.1:1260 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." msgstr "" #. type: TP -#: doc/tin.1:605 +#: doc/tin.1:607 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:608 +#: doc/tin.1:610 msgid "Positions the cursor on the next group with unread articles in it." msgstr "Setzt den Cursor auf die nächste Gruppe mit ungelesenen Artikeln." #. type: TP -#: doc/tin.1:608 doc/tin.1:850 doc/tin.1:1036 doc/tin.1:1274 +#: doc/tin.1:610 doc/tin.1:852 doc/tin.1:1039 doc/tin.1:1277 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:612 +#: doc/tin.1:614 msgid "" "Quit B - ask the user to confirm if B is set " "accordingly." msgstr "" +"B beenden, falls B gesetzt ist wird nochmal nachgefragt." #. type: TP -#: doc/tin.1:612 doc/tin.1:853 doc/tin.1:1039 doc/tin.1:1277 +#: doc/tin.1:614 doc/tin.1:855 doc/tin.1:1042 doc/tin.1:1280 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:615 doc/tin.1:856 doc/tin.1:1042 doc/tin.1:1280 +#: doc/tin.1:617 doc/tin.1:858 doc/tin.1:1045 doc/tin.1:1283 msgid "Quit B - don't ask the user to confirm." msgstr "Beendet B sofort, ohne Bestätigungsnachfrage." #. type: TP -#: doc/tin.1:615 +#: doc/tin.1:617 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:620 +#: doc/tin.1:622 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 " @@ -1605,13 +1631,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:620 doc/tin.1:859 doc/tin.1:1042 +#: doc/tin.1:622 doc/tin.1:861 doc/tin.1:1045 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:624 doc/tin.1:863 doc/tin.1:1046 +#: doc/tin.1:626 doc/tin.1:865 doc/tin.1:1049 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." @@ -1621,24 +1647,24 @@ msgstr "" "bzw. nach neuen Funktionen zu fragen." #. type: TP -#: doc/tin.1:624 +#: doc/tin.1:626 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:627 +#: doc/tin.1:629 msgid "Subscribe to current group." msgstr "Ausgewählte Gruppe abonnieren." #. type: TP -#: doc/tin.1:627 +#: doc/tin.1:629 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:632 +#: doc/tin.1:634 msgid "" "Subscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1646,13 +1672,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:632 +#: doc/tin.1:634 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:637 +#: doc/tin.1:639 msgid "" "Unsubscribe to current group. This can be used to remove bogus groups. See " "B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -1660,13 +1686,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:637 +#: doc/tin.1:639 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:642 +#: doc/tin.1:644 msgid "" "Unsubscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1674,13 +1700,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:642 doc/tin.1:887 doc/tin.1:1061 doc/tin.1:1314 +#: doc/tin.1:644 doc/tin.1:889 doc/tin.1:1064 doc/tin.1:1317 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:648 +#: doc/tin.1:650 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 " @@ -1689,25 +1715,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:648 +#: doc/tin.1:650 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:651 +#: doc/tin.1:653 msgid "Quit B without saving any changes to the configuration." msgstr "" "B beenden ohne ggf. gemachte Änderungen an den Einstellung zu speichern." #. type: TP -#: doc/tin.1:651 +#: doc/tin.1:653 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:656 +#: doc/tin.1:658 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 " @@ -1715,38 +1741,38 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:656 +#: doc/tin.1:658 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:660 +#: doc/tin.1:662 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 -#: doc/tin.1:660 +#: doc/tin.1:662 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:665 +#: doc/tin.1:667 msgid "Mark all articles in the current group as unread." msgstr "Alle Artikel in der aktuellen Gruppe als ungelesen markieren." #. type: SS -#: doc/tin.1:665 +#: doc/tin.1:667 #, no-wrap msgid "GROUP INDEX COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:669 +#: doc/tin.1:671 msgid "" "All searches in this level are limited to unread articles if in " "B mode. B ('B') can be use " @@ -1754,44 +1780,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:672 +#: doc/tin.1:674 msgid "Select article 4." msgstr "Artikel 4 auswählen." #. type: TP -#: doc/tin.1:672 doc/tin.1:922 doc/tin.1:1086 +#: doc/tin.1:674 doc/tin.1:925 doc/tin.1:1089 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:676 doc/tin.1:926 doc/tin.1:1090 +#: doc/tin.1:678 doc/tin.1:929 doc/tin.1:1093 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." msgstr "" #. type: TP -#: doc/tin.1:676 doc/tin.1:926 doc/tin.1:1102 +#: doc/tin.1:678 doc/tin.1:929 doc/tin.1:1105 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:680 doc/tin.1:930 doc/tin.1:1106 +#: doc/tin.1:682 doc/tin.1:933 doc/tin.1:1109 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." msgstr "" #. type: TP -#: doc/tin.1:680 doc/tin.1:930 +#: doc/tin.1:682 doc/tin.1:933 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:685 doc/tin.1:935 +#: doc/tin.1:687 doc/tin.1:938 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -1799,13 +1825,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:685 doc/tin.1:935 +#: doc/tin.1:687 doc/tin.1:938 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:690 doc/tin.1:940 +#: doc/tin.1:692 doc/tin.1:943 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -1813,63 +1839,63 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:694 doc/tin.1:944 doc/tin.1:1134 +#: doc/tin.1:696 doc/tin.1:947 doc/tin.1:1137 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:697 doc/tin.1:947 doc/tin.1:1137 +#: doc/tin.1:699 doc/tin.1:950 doc/tin.1:1140 msgid "Re-enter the last message that was viewed." -msgstr "" +msgstr "Zur zuletzt angezeigte Nachricht springen." #. type: Plain text -#: doc/tin.1:700 +#: doc/tin.1:702 msgid "Repeat the previous search" msgstr "Vorherige Suche wiederholen." #. type: Plain text -#: doc/tin.1:703 +#: doc/tin.1:705 doc/tin.1:956 msgid "Search forward for specified subject." msgstr "Vorwärts nach dem angegebenem Subject suchen." #. type: Plain text -#: doc/tin.1:706 -msgid "Search backward for specified subject." +#: doc/tin.1:708 doc/tin.1:959 +msgid "Search backwards for specified subject." msgstr "Rückwärts nach dem angegebenem Subject suchen." #. type: TP -#: doc/tin.1:706 +#: doc/tin.1:708 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:709 +#: doc/tin.1:711 doc/tin.1:962 msgid "Select current thread for later processing." -msgstr "" +msgstr "Wähle aktuellen Thread für die spätere Verarbeitung aus." #. type: TP -#: doc/tin.1:709 +#: doc/tin.1:711 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:713 +#: doc/tin.1:715 msgid "" "Selects all threads in current group. It is a shortcut for calling " "B with a pattern of ''*''." msgstr "" #. type: TP -#: doc/tin.1:713 +#: doc/tin.1:715 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:718 +#: doc/tin.1:720 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 " @@ -1877,13 +1903,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:718 +#: doc/tin.1:720 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:723 +#: doc/tin.1:725 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-" @@ -1891,13 +1917,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:723 +#: doc/tin.1:725 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:729 +#: doc/tin.1:731 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 " @@ -1906,24 +1932,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:729 +#: doc/tin.1:731 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:732 +#: doc/tin.1:734 msgid "Reverse all selections on all articles." -msgstr "" +msgstr "Markierung für alle Artikel umkehren." #. type: TP -#: doc/tin.1:732 +#: doc/tin.1:734 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:738 +#: doc/tin.1:740 msgid "" "Undo all selections on all articles. It clears the toggle effect of " "B ('B') command. Thus after first doing a " @@ -1932,13 +1958,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:738 doc/tin.1:968 doc/tin.1:1160 +#: doc/tin.1:740 doc/tin.1:971 doc/tin.1:1163 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:743 doc/tin.1:973 doc/tin.1:1165 +#: doc/tin.1:745 doc/tin.1:976 doc/tin.1:1168 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -1946,13 +1972,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:743 doc/tin.1:1165 +#: doc/tin.1:745 doc/tin.1:1168 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:752 +#: doc/tin.1:754 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: " @@ -1964,13 +1990,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:752 doc/tin.1:1174 +#: doc/tin.1:754 doc/tin.1:1177 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:761 +#: doc/tin.1:763 msgid "" "Kill article(s) with a single key [after confirmation]. The defaults used " "for killing are based upon the following four tinrc config variables: " @@ -1982,99 +2008,101 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:761 +#: doc/tin.1:763 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:764 +#: doc/tin.1:766 msgid "Read current article." -msgstr "" +msgstr "Lese den aktuelle Artikel." #. type: TP -#: doc/tin.1:764 +#: doc/tin.1:766 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:767 +#: doc/tin.1:769 msgid "View next unread article or group." -msgstr "" +msgstr "Zeige nächsten den ungelesenen Artikel oder die nächste Gruppe." #. type: TP -#: doc/tin.1:767 doc/tin.1:979 doc/tin.1:1191 +#: doc/tin.1:769 doc/tin.1:982 doc/tin.1:1194 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:771 +#: doc/tin.1:773 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line." msgstr "" +"Autoren-Suche vorwärts. Sucht nach Artikeln mit einem bestimmtem ''From:''-" +"Header." #. type: TP -#: doc/tin.1:771 doc/tin.1:984 doc/tin.1:1194 +#: doc/tin.1:773 doc/tin.1:987 doc/tin.1:1197 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:774 doc/tin.1:987 +#: doc/tin.1:776 doc/tin.1:990 msgid "Author backward search. Otherwise, see B ('B') above." -msgstr "" +msgstr "Autoren-Suche rückwärts. Siehe auch B ('B') oben." #. type: TP -#: doc/tin.1:774 doc/tin.1:987 doc/tin.1:1197 +#: doc/tin.1:776 doc/tin.1:990 doc/tin.1:1200 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:778 doc/tin.1:991 doc/tin.1:1201 +#: doc/tin.1:780 doc/tin.1:994 doc/tin.1:1204 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." msgstr "" #. type: Plain text -#: doc/tin.1:782 +#: doc/tin.1:784 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." msgstr "" #. type: Plain text -#: doc/tin.1:786 +#: doc/tin.1:788 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." msgstr "" #. type: TP -#: doc/tin.1:786 +#: doc/tin.1:788 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:790 doc/tin.1:1003 +#: doc/tin.1:792 doc/tin.1:1006 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." msgstr "" #. type: TP -#: doc/tin.1:790 +#: doc/tin.1:792 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:795 doc/tin.1:1008 doc/tin.1:1214 +#: doc/tin.1:797 doc/tin.1:1011 doc/tin.1:1217 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 " @@ -2082,37 +2110,37 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:798 +#: doc/tin.1:800 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:802 +#: doc/tin.1:804 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:805 +#: doc/tin.1:807 msgid "Toggle article/group limit." msgstr "Artikel/Gruppe Beschränkungen ein-/ausschalten." #. type: Plain text -#: doc/tin.1:809 +#: doc/tin.1:811 msgid "" "Display the subject of the first article in the current thread in the last " "line." msgstr "" #. type: TP -#: doc/tin.1:812 +#: doc/tin.1:814 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:818 +#: doc/tin.1:820 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 " @@ -2121,35 +2149,35 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:818 +#: doc/tin.1:820 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:821 +#: doc/tin.1:823 msgid "Open the thread under the current cursor position." -msgstr "" +msgstr "Öffnet den Thread unter der aktuellen Cursorposition." #. type: TP -#: doc/tin.1:821 doc/tin.1:1023 doc/tin.1:1245 +#: doc/tin.1:823 doc/tin.1:1026 doc/tin.1:1248 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:824 doc/tin.1:1026 doc/tin.1:1248 +#: doc/tin.1:826 doc/tin.1:1029 doc/tin.1:1251 msgid "Look up article by ''Message-ID:''." msgstr "Artikel anhand der ''Message-ID:'' nachschlagen." #. type: TP -#: doc/tin.1:824 +#: doc/tin.1:826 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:829 doc/tin.1:1031 doc/tin.1:1253 +#: doc/tin.1:831 doc/tin.1:1034 doc/tin.1:1256 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2157,35 +2185,35 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:833 +#: doc/tin.1:835 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:836 +#: doc/tin.1:838 msgid "Go to next group." -msgstr "" +msgstr "Zur nächsten Newsgruppe springen." #. type: TP -#: doc/tin.1:836 +#: doc/tin.1:838 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:839 +#: doc/tin.1:841 msgid "Go to next unread article." -msgstr "" +msgstr "Zum nächsten ungelesenen Artikel springen." #. type: TP -#: doc/tin.1:839 doc/tin.1:1031 doc/tin.1:1263 +#: doc/tin.1:841 doc/tin.1:1034 doc/tin.1:1266 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:844 doc/tin.1:1036 doc/tin.1:1268 +#: doc/tin.1:846 doc/tin.1:1039 doc/tin.1:1271 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2193,51 +2221,51 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:844 +#: doc/tin.1:846 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:847 +#: doc/tin.1:849 msgid "Go to previous group." -msgstr "" +msgstr "Zur vorherigen Gruppe springen." #. type: TP -#: doc/tin.1:847 +#: doc/tin.1:849 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:850 +#: doc/tin.1:852 msgid "Go to previous unread article." -msgstr "" +msgstr "Zum vorherigen ungelesenen Artikel gehen." #. type: Plain text -#: doc/tin.1:853 doc/tin.1:1039 +#: doc/tin.1:855 doc/tin.1:1042 msgid "Return to previous level." -msgstr "" +msgstr "Kehre zur vorherigen Ebene zurück." #. type: TP -#: doc/tin.1:856 +#: doc/tin.1:858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:859 +#: doc/tin.1:861 msgid "Toggle the display between all articles and unread articles." -msgstr "" +msgstr "Wechselt zwischen der Anzeige aller und nur ungelesener Artikel." #. type: TP -#: doc/tin.1:863 +#: doc/tin.1:865 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:868 doc/tin.1:1051 doc/tin.1:1293 +#: doc/tin.1:870 doc/tin.1:1054 doc/tin.1:1296 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2245,24 +2273,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:868 +#: doc/tin.1:870 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:871 doc/tin.1:1054 doc/tin.1:1296 +#: doc/tin.1:873 doc/tin.1:1057 doc/tin.1:1299 msgid "Save marked articles automatically without further prompting." msgstr "Markierte Artikel automatisch ohne weiteres Nachfragen speichern." #. type: TP -#: doc/tin.1:871 +#: doc/tin.1:873 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:876 +#: doc/tin.1:878 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " @@ -2270,25 +2298,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:876 +#: doc/tin.1:878 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:879 +#: doc/tin.1:881 msgid "" "Automatically tag in order all the parts of the current multi-part message." msgstr "" #. type: TP -#: doc/tin.1:879 +#: doc/tin.1:881 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:884 +#: doc/tin.1:886 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2296,48 +2324,48 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:884 +#: doc/tin.1:886 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:887 +#: doc/tin.1:889 msgid "Untag all articles that were tagged." -msgstr "" +msgstr "Markierung aller markierten Artikel entfernen." #. type: Plain text -#: doc/tin.1:893 +#: doc/tin.1:896 doc/tin.1:1071 doc/tin.1:1324 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 " -"it via B ('B') for later processing (see also ''B<-o>'' " -"command-line switch) or discard it via B ('B')." +"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'), " +"postpone it for later processing via B ('B') (see also ''B<-" +"o>'' command-line switch) or discard it via B ('B')." msgstr "" #. type: TP -#: doc/tin.1:893 +#: doc/tin.1:896 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:899 +#: doc/tin.1:902 doc/tin.1:1330 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " -"for reposting from global to local newsgroups. Do not use this to cross-post " +"for reposting from global to local newsgroups. Do not use this to crosspost " "your own articles." msgstr "" #. type: TP -#: doc/tin.1:899 +#: doc/tin.1:902 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:907 +#: doc/tin.1:910 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. " @@ -2348,25 +2376,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:907 doc/tin.1:1068 doc/tin.1:1327 +#: doc/tin.1:910 doc/tin.1:1071 doc/tin.1:1330 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:910 +#: doc/tin.1:913 msgid "Mark current article as unread." msgstr "Aktuellen Artikel als ungelesen markieren." #. type: TP -#: doc/tin.1:910 doc/tin.1:1073 doc/tin.1:1330 +#: doc/tin.1:913 doc/tin.1:1076 doc/tin.1:1333 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:917 +#: doc/tin.1:920 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 " @@ -2374,94 +2402,79 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:917 +#: doc/tin.1:920 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:922 +#: doc/tin.1:925 msgid "Select article 4 within thread." msgstr "Artikel 4 aus dem Thread auswählen." -#. type: Plain text -#: doc/tin.1:953 -msgid "Search forward for a specified subject." -msgstr "" - -#. type: Plain text -#: doc/tin.1:956 -msgid "Search backwards for a specified subject." -msgstr "" - #. type: TP -#: doc/tin.1:956 +#: doc/tin.1:959 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.1:959 -msgid "Select the current thread for later processing." -msgstr "" - #. type: TP -#: doc/tin.1:959 +#: doc/tin.1:962 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:962 +#: doc/tin.1:965 msgid "Toggle selection of current article." msgstr "" #. type: TP -#: doc/tin.1:962 +#: doc/tin.1:965 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:965 +#: doc/tin.1:968 msgid "Reverse article selections." msgstr "Artikelauswahl invertieren." #. type: TP -#: doc/tin.1:965 +#: doc/tin.1:968 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:968 +#: doc/tin.1:971 msgid "Undo all selections on current thread." msgstr "" #. type: TP -#: doc/tin.1:973 +#: doc/tin.1:976 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:976 +#: doc/tin.1:979 msgid "Read current article within thread." msgstr "" #. type: TP -#: doc/tin.1:976 +#: doc/tin.1:979 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:979 +#: doc/tin.1:982 msgid "View next unread article within thread." msgstr "Nächsten ungelesenen Artikel im Thread anzeigen." #. type: Plain text -#: doc/tin.1:984 +#: doc/tin.1:987 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 " @@ -2469,44 +2482,44 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:995 +#: doc/tin.1:998 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." msgstr "" #. type: Plain text -#: doc/tin.1:999 +#: doc/tin.1:1002 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." msgstr "" #. type: TP -#: doc/tin.1:999 +#: doc/tin.1:1002 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1003 +#: doc/tin.1:1006 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1014 doc/tin.1:1236 +#: doc/tin.1:1017 doc/tin.1:1239 msgid "Display the subject of the current article in the last line." msgstr "Subject des geöffneten Artikels in der untersten Zeile anzeigen." #. type: TP -#: doc/tin.1:1017 +#: doc/tin.1:1020 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1023 +#: doc/tin.1:1026 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 " @@ -2514,58 +2527,49 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1026 +#: doc/tin.1:1029 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1046 +#: doc/tin.1:1049 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1051 +#: doc/tin.1:1054 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1054 +#: doc/tin.1:1057 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1058 doc/tin.1:1300 +#: doc/tin.1:1061 doc/tin.1:1303 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." msgstr "" #. type: TP -#: doc/tin.1:1058 +#: doc/tin.1:1061 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1061 +#: doc/tin.1:1064 msgid "Untag all tagged threads." -msgstr "" - -#. 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 " -"it for later processing via B ('B') (see also ''B<-o>'' " -"command-line switch) or discard it via B ('B')." -msgstr "" +msgstr "Markierung aller markierten Threads entfernen." #. type: Plain text -#: doc/tin.1:1073 +#: doc/tin.1:1076 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 " @@ -2574,142 +2578,142 @@ msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1078 +#: doc/tin.1:1081 msgid "Mark all articles in thread as unread." msgstr "Alle Artikel im aktuellen Thread as ungelesen markieren." #. type: SS -#: doc/tin.1:1078 +#: doc/tin.1:1081 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "" #. type: Plain text -#: doc/tin.1:1083 +#: doc/tin.1:1086 msgid "Read the first (base) article in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:1086 +#: doc/tin.1:1089 msgid "Read response 4 in this thread." msgstr "Antwort 4 im diesem Thread lesen." #. type: TP -#: doc/tin.1:1090 +#: doc/tin.1:1093 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1094 +#: doc/tin.1:1097 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." msgstr "" #. type: TP -#: doc/tin.1:1094 +#: doc/tin.1:1097 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1099 +#: doc/tin.1:1102 msgid "Perform B<\\%pgp>(1) operations on article." -msgstr "" +msgstr "B<\\%pgp>(1) Operation auf den Artikel an anwenden." #. type: TP -#: doc/tin.1:1099 +#: doc/tin.1:1102 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1102 +#: doc/tin.1:1105 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "" #. type: TP -#: doc/tin.1:1106 +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1109 +#: doc/tin.1:1112 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "Tabulatorbreite zwischen 4 und 8 Zeichen Umschalten." #. type: TP -#: doc/tin.1:1109 +#: doc/tin.1:1112 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1116 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." msgstr "" #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1116 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1117 +#: doc/tin.1:1120 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 -#: doc/tin.1:1117 +#: doc/tin.1:1120 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1120 +#: doc/tin.1:1123 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" #. type: TP -#: doc/tin.1:1120 +#: doc/tin.1:1123 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1123 +#: doc/tin.1:1126 msgid "Toggle ROT-13 decoding for this article." msgstr "ROT-13 Entschlüsseln ein-/ausschalten." #. type: TP -#: doc/tin.1:1123 +#: doc/tin.1:1126 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1127 +#: doc/tin.1:1130 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." msgstr "" #. type: TP -#: doc/tin.1:1127 +#: doc/tin.1:1130 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1134 +#: doc/tin.1:1137 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 " @@ -2719,23 +2723,23 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1143 +#: doc/tin.1:1146 msgid "Forward search the text of this article." msgstr "" #. type: Plain text -#: doc/tin.1:1146 +#: doc/tin.1:1149 msgid "Backward search the text of this article." msgstr "" #. type: TP -#: doc/tin.1:1146 +#: doc/tin.1:1149 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1151 +#: doc/tin.1:1154 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -2743,40 +2747,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1151 +#: doc/tin.1:1154 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1154 +#: doc/tin.1:1157 msgid "Go to the first article in the current thread." -msgstr "" +msgstr "Gehe zum ersten Artikel im aktuellen Thread." #. type: TP -#: doc/tin.1:1154 +#: doc/tin.1:1157 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1157 +#: doc/tin.1:1160 msgid "Go to the last article in the current thread." -msgstr "" +msgstr "Gehe zum letzten Artikel im aktuellen Thread." #. type: TP -#: doc/tin.1:1157 +#: doc/tin.1:1160 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1160 +#: doc/tin.1:1163 msgid "Toggle word highlighting on/off." -msgstr "" +msgstr "Wort-Hervorheben ein-/ausschalten." #. type: Plain text -#: doc/tin.1:1174 +#: doc/tin.1:1177 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -2788,7 +2792,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1183 +#: doc/tin.1:1186 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -2799,24 +2803,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1183 +#: doc/tin.1:1186 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1186 +#: doc/tin.1:1189 msgid "Go to next base article." msgstr "" #. type: TP -#: doc/tin.1:1186 +#: doc/tin.1:1189 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:1191 +#: doc/tin.1:1194 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -2824,358 +2828,342 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1194 +#: doc/tin.1:1197 msgid "Author forward search." msgstr "Suche nach Autor (vorwärts)." #. type: Plain text -#: doc/tin.1:1197 +#: doc/tin.1:1200 msgid "Author backward search." msgstr "Suche nach Autor (rückwärts)." #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1208 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." msgstr "" #. type: Plain text -#: doc/tin.1:1209 +#: doc/tin.1:1212 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." msgstr "" #. type: TP -#: doc/tin.1:1209 +#: doc/tin.1:1212 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1214 +#: doc/tin.1:1217 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1217 +#: doc/tin.1:1220 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" #. type: TP -#: doc/tin.1:1220 +#: doc/tin.1:1223 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1223 +#: doc/tin.1:1226 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" #. type: TP -#: doc/tin.1:1223 +#: doc/tin.1:1226 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1227 +#: doc/tin.1:1230 msgid "" "Post a followup to the current article without including a copy of the " "article." msgstr "" #. type: TP -#: doc/tin.1:1227 +#: doc/tin.1:1230 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1230 +#: doc/tin.1:1233 msgid "Go to the start of the article." msgstr "Zum Anfang des Artikels springen." #. type: TP -#: doc/tin.1:1230 +#: doc/tin.1:1233 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1233 +#: doc/tin.1:1236 msgid "Go to the end of the article." msgstr "Zum Ende des Artikels springen." #. type: TP -#: doc/tin.1:1239 +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1242 +#: doc/tin.1:1245 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "" +"Markiere den Rest des Threads als gelesen und springe zu nächstem " +"ungelesenen Thread." #. type: TP -#: doc/tin.1:1242 +#: doc/tin.1:1245 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1245 +#: doc/tin.1:1248 msgid "Show the thread menu that the current article is a part of." msgstr "" #. type: TP -#: doc/tin.1:1248 +#: doc/tin.1:1251 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1257 +#: doc/tin.1:1260 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1260 +#: doc/tin.1:1263 msgid "Go to the next article." -msgstr "" +msgstr "Gehe zum nächsten Artikel." #. type: TP -#: doc/tin.1:1260 +#: doc/tin.1:1263 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1263 +#: doc/tin.1:1266 msgid "Go to the next unread article." -msgstr "" +msgstr "Zum nächsten ungelesenen Artikel springen." #. type: TP -#: doc/tin.1:1268 +#: doc/tin.1:1271 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1271 +#: doc/tin.1:1274 msgid "Go to the previous article." -msgstr "" +msgstr "Gehe zum vorherigen Artikel." #. type: TP -#: doc/tin.1:1271 +#: doc/tin.1:1274 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1274 +#: doc/tin.1:1277 msgid "Go to the previous unread article." msgstr "" #. type: Plain text -#: doc/tin.1:1277 +#: doc/tin.1:1280 msgid "Return to the previous level." -msgstr "" +msgstr "Kehrt zur vorherigen Ebene zurück." #. type: TP -#: doc/tin.1:1280 +#: doc/tin.1:1283 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1284 +#: doc/tin.1:1287 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." msgstr "" #. type: TP -#: doc/tin.1:1284 +#: doc/tin.1:1287 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1288 +#: doc/tin.1:1291 msgid "" "Reply through mail to the author of the current article without including " "the original article." msgstr "" #. type: TP -#: doc/tin.1:1288 +#: doc/tin.1:1291 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1293 +#: doc/tin.1:1296 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1296 +#: doc/tin.1:1299 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1300 +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1303 +#: doc/tin.1:1306 msgid "Return to group selection level." -msgstr "" +msgstr "Kehrt zur Auswahlebene zurück." #. type: TP -#: doc/tin.1:1303 +#: doc/tin.1:1306 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1306 +#: doc/tin.1:1309 msgid "Go to parent article." msgstr "" #. type: TP -#: doc/tin.1:1306 +#: doc/tin.1:1309 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1310 +#: doc/tin.1:1313 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." msgstr "" #. type: TP -#: doc/tin.1:1310 +#: doc/tin.1:1313 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1314 +#: doc/tin.1:1317 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." msgstr "" -#. 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'), " -"postpone it for later processing via B ('B') (see also ''B<-" -"o>'' command-line switch) or discard it via B ('B')." -msgstr "" - #. type: TP -#: doc/tin.1:1321 +#: doc/tin.1:1324 #, no-wrap msgid "B" msgstr "B" #. 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 " -"for reposting from global to local newsgroups. Do not use this to crosspost " -"your own articles." -msgstr "" - -#. type: Plain text -#: doc/tin.1:1330 +#: doc/tin.1:1333 msgid "Mark article as unread." msgstr "Alle Artikel als ungelesen markieren." #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1335 +#: doc/tin.1:1338 msgid "Mark the current thread as unread." msgstr "Markiere den aktuellen Thread als ungelesen." #. type: SS -#: doc/tin.1:1335 +#: doc/tin.1:1338 #, no-wrap msgid "URL LISTING" msgstr "URL LISTE" #. type: Plain text -#: doc/tin.1:1338 +#: doc/tin.1:1341 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 -#: doc/tin.1:1339 +#: doc/tin.1:1342 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1343 +#: doc/tin.1:1346 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." msgstr "" #. type: Plain text -#: doc/tin.1:1346 +#: doc/tin.1:1349 msgid "URL forward search." msgstr "Suche nach URL (vorwärts)." #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1352 msgid "URL backward search." msgstr "Suche nach URL (rückwärts)." #. type: Plain text -#: doc/tin.1:1355 doc/tin.1:1408 +#: doc/tin.1:1358 doc/tin.1:1411 msgid "Shell escape." -msgstr "" +msgstr "Ausgang zur Shell." #. type: Plain text -#: doc/tin.1:1358 +#: doc/tin.1:1361 msgid "Toggle the display of the current URL in the last line." -msgstr "" +msgstr "Anzeige der aktuellen URL in der letzten Zeile (de)aktivieren." #. type: Plain text -#: doc/tin.1:1361 doc/tin.1:1415 +#: doc/tin.1:1364 doc/tin.1:1418 msgid "Help screen of commands available." -msgstr "" +msgstr "Hilfeseite der verfügbaren Befehle." #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1367 +#: doc/tin.1:1370 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "" #. type: Plain text -#: doc/tin.1:1370 +#: doc/tin.1:1373 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3183,108 +3171,108 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1371 +#: doc/tin.1:1374 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1374 +#: doc/tin.1:1377 msgid "Pipe attachment into command." -msgstr "" +msgstr "Anhang an Befehl weiterleiten." #. type: TP -#: doc/tin.1:1374 +#: doc/tin.1:1377 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1377 +#: doc/tin.1:1380 msgid "Save current attachment / tagged attachments to disk." msgstr "" #. type: TP -#: doc/tin.1:1377 +#: doc/tin.1:1380 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1380 +#: doc/tin.1:1383 msgid "View attachment." msgstr "Multimediaanhänge anzeigen." #. type: TP -#: doc/tin.1:1380 +#: doc/tin.1:1383 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1383 +#: doc/tin.1:1386 msgid "Tag one or more attachments for saving." msgstr "" #. type: TP -#: doc/tin.1:1383 +#: doc/tin.1:1386 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1387 +#: doc/tin.1:1390 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 -#: doc/tin.1:1387 +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1390 +#: doc/tin.1:1393 msgid "Reverse tagging of all attachments." -msgstr "" +msgstr "Markierung der Anhänge umkehren." #. type: TP -#: doc/tin.1:1390 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1393 +#: doc/tin.1:1396 msgid "Untag all tagged attachments." -msgstr "" +msgstr "Markierung der markierten Anhängen aufheben." #. type: Plain text -#: doc/tin.1:1396 +#: doc/tin.1:1399 msgid "Attachment forward search." msgstr "" #. type: Plain text -#: doc/tin.1:1399 +#: doc/tin.1:1402 msgid "Attachment backward search." msgstr "" #. type: TP -#: doc/tin.1:1402 +#: doc/tin.1:1405 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1405 +#: doc/tin.1:1408 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" #. type: Plain text -#: doc/tin.1:1412 +#: doc/tin.1:1415 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3292,27 +3280,27 @@ msgstr "Name oder Beschreibung des Anhan #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1421 +#: doc/tin.1:1424 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "" #. FIXME - add missing descriptions -#. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used +#. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1433 +#: doc/tin.1:1436 msgid "" -"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 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 " +"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 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 -#: doc/tin.1:1441 +#: doc/tin.1:1444 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 " @@ -3323,7 +3311,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1447 +#: doc/tin.1:1450 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 " @@ -3333,7 +3321,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1454 +#: doc/tin.1:1457 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3343,7 +3331,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1459 +#: doc/tin.1:1462 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3352,14 +3340,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1462 +#: doc/tin.1:1465 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." msgstr "" #. type: Plain text -#: doc/tin.1:1466 +#: doc/tin.1:1469 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/" @@ -3367,175 +3355,189 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1466 +#: doc/tin.1:1469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1472 doc/tin.5:1196 +#: doc/tin.1:1475 doc/tin.5:1199 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 "" +"Falls On werden, sofern nötig, lange Newsgruppennamen in der Auswahl- und " +"Artikelebene wie folgt abgekürzt: news.software.readers -E n.software." +"readers -E n.s.readers -E n.s.r. Voreinstellung ist OFF." #. type: TP -#: doc/tin.1:1472 +#: doc/tin.1:1475 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1476 doc/tin.5:1200 +#: doc/tin.1:1479 doc/tin.5:1203 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." msgstr "" +"Falls ON füge gepostete Artikel die einen neuen Thread einleiten zum Filter " +"hinzu um eventuelle Antworten hervorzuheben. Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1476 +#: doc/tin.1:1479 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" #. type: Plain text -#: doc/tin.1:1479 doc/tin.5:1203 +#: doc/tin.1:1482 doc/tin.5:1206 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." -msgstr "" +msgstr "Falls ON füge 'User-Agent:'-Header ein. Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1479 +#: doc/tin.1:1482 #, no-wrap msgid "B" msgstr "B<Übersp. multipart/alternative-Teile (alternative_handling)>" #. type: Plain text -#: doc/tin.1:1482 doc/tin.5:1206 +#: doc/tin.1:1485 doc/tin.5:1209 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" +"Falls ON entsorge multipart/alternative Teile des Artikels automatisch. " +"Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1482 +#: doc/tin.1:1485 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1485 doc/tin.5:1209 +#: doc/tin.1:1488 doc/tin.5:1212 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. Voreinstellung ist 'D'." #. type: TP -#: doc/tin.1:1485 +#: doc/tin.1:1488 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1488 doc/tin.5:1212 +#: doc/tin.1:1491 doc/tin.5:1215 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" #. type: TP -#: doc/tin.1:1488 +#: doc/tin.1:1491 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1492 doc/tin.5:1216 +#: doc/tin.1:1495 doc/tin.5:1219 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 -#: doc/tin.1:1492 +#: doc/tin.1:1495 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1496 doc/tin.5:1220 +#: doc/tin.1:1499 doc/tin.5:1223 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." msgstr "" #. type: TP -#: doc/tin.1:1496 +#: doc/tin.1:1499 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1500 doc/tin.5:1224 +#: doc/tin.1:1503 doc/tin.5:1227 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 -#: doc/tin.1:1500 +#: doc/tin.1:1503 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1504 +#: doc/tin.1:1507 doc/tin.5:1231 msgid "" -"The character used to show that an article has not been read. Default is " -"\\&'+'." +"The character used to show that an article has not been read. Default is " +"'+'." msgstr "" +"Zeichen das anzeigt, dass ein Artikel noch nicht gelesen wurde. " +"Voreinstellung ist '+'." #. type: TP -#: doc/tin.1:1504 +#: doc/tin.1:1507 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1507 doc/tin.5:1231 +#: doc/tin.1:1510 doc/tin.5:1234 msgid "The character used to show that an article was read. Default is ' '." msgstr "" +"Zeichen das anzeigt, dass ein Artikel schon gelesen wurde. Voreinstellung " +"ist ' '." #. type: TP -#: doc/tin.1:1507 +#: doc/tin.1:1510 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1511 doc/tin.5:1235 +#: doc/tin.1:1514 doc/tin.5:1238 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." msgstr "" +"Zeichen das anzeigt, dass ein Artikel gekillt wurde. Voreinstellung ist " +"'K'). B muss passend gesetzt sein." #. type: TP -#: doc/tin.1:1511 +#: doc/tin.1:1514 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1515 doc/tin.5:1239 +#: doc/tin.1:1518 doc/tin.5:1242 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 -#: doc/tin.1:1515 doc/tin.5:1239 +#: doc/tin.1:1518 doc/tin.5:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1520 +#: doc/tin.1:1523 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 " @@ -3543,50 +3545,52 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1520 +#: doc/tin.1:1523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1524 doc/tin.5:1250 +#: doc/tin.1:1527 doc/tin.5:1253 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." msgstr "" #. type: TP -#: doc/tin.1:1524 +#: doc/tin.1:1527 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1528 doc/tin.5:1254 +#: doc/tin.1:1531 doc/tin.5:1257 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." msgstr "" +"Falls ON: Thread beim Betreten mit der rechten Cursortaste automatisch " +"anzeigen? Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1528 +#: doc/tin.1:1531 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1531 doc/tin.1:2481 +#: doc/tin.1:1534 doc/tin.1:2509 msgid "Default is OFF." -msgstr "Standard ist OFF." +msgstr "Voreinstellung ist OFF." #. type: TP -#: doc/tin.1:1531 +#: doc/tin.1:1534 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1537 doc/tin.5:1263 +#: doc/tin.1:1540 doc/tin.5:1266 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -3594,27 +3598,30 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1537 +#: doc/tin.1:1540 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1542 doc/tin.5:1268 +#: doc/tin.1:1545 doc/tin.5:1271 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 "" +"Falls ON werden Artikel/Threads im Batchmode gespeichert wenn ''B<-S> oder " +"gemailt, wenn ''B<-M>'' bzw. ''B<-N>'' in der Kommandozeile angegeben wurde. " +"Voreinstellung ist ON." #. type: TP -#: doc/tin.1:1542 +#: doc/tin.1:1545 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1547 doc/tin.5:1273 +#: doc/tin.1:1550 doc/tin.5:1276 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 " @@ -3622,13 +3629,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1547 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1552 +#: doc/tin.1:1555 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. " @@ -3636,302 +3643,313 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1552 +#: doc/tin.1:1555 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1558 doc/tin.5:1282 +#: doc/tin.1:1561 doc/tin.5:1285 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 -#: doc/tin.1:1558 +#: doc/tin.1:1561 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1285 +#: doc/tin.1:1564 doc/tin.5:1288 msgid "Standard background color" msgstr "Standard Hintergrundfarbe" #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1564 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1567 doc/tin.5:1291 +msgid "Color of quoted text from external sources" +msgstr "Farbe des Fremdzitat-Textes" + +#. type: TP +#: doc/tin.1:1567 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1564 doc/tin.5:1288 +#: doc/tin.1:1570 doc/tin.5:1294 msgid "Color of sender (From:)" msgstr "Farbe des Autors (From:)" #. type: TP -#: doc/tin.1:1564 +#: doc/tin.1:1570 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1567 doc/tin.5:1291 +#: doc/tin.1:1573 doc/tin.5:1297 msgid "Color of header-lines" msgstr "Farbe der Artikelheaderzeilen" #. type: TP -#: doc/tin.1:1567 +#: doc/tin.1:1573 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1570 doc/tin.5:1294 +#: doc/tin.1:1576 doc/tin.5:1300 msgid "Color of help pages" msgstr "Farbe des Hilfstext" #. type: TP -#: doc/tin.1:1570 +#: doc/tin.1:1576 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1573 doc/tin.5:1297 +#: doc/tin.1:1579 doc/tin.5:1303 msgid "Color of background for inverse text" msgstr "Hintergrundfarbe für inversen Text" #. type: TP -#: doc/tin.1:1573 +#: doc/tin.1:1579 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1576 doc/tin.5:1300 +#: doc/tin.1:1582 doc/tin.5:1306 msgid "Color of foreground for inverse text" msgstr "Vordergrundfarbe für inversen Text" #. type: TP -#: doc/tin.1:1576 +#: doc/tin.1:1582 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1580 doc/tin.5:1304 +#: doc/tin.1:1586 doc/tin.5:1310 msgid "" "Color of words emphasized like _this_. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1580 +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1584 doc/tin.5:1308 +#: doc/tin.1:1590 doc/tin.5:1314 msgid "" "Color of words emphasized like /this/. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1584 +#: doc/tin.1:1590 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1588 doc/tin.5:1312 +#: doc/tin.1:1594 doc/tin.5:1318 msgid "" "Color of words emphasized like *this*. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1588 +#: doc/tin.1:1594 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1592 doc/tin.5:1316 +#: doc/tin.1:1598 doc/tin.5:1322 msgid "" "Color of words emphasized like -this-. See also B and " "B." msgstr "" #. type: TP -#: doc/tin.1:1592 +#: doc/tin.1:1598 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1595 doc/tin.5:1319 +#: doc/tin.1:1601 doc/tin.5:1325 msgid "Color of mini help menu" msgstr "Farbe des Minihilfemenü" #. type: TP -#: doc/tin.1:1595 +#: doc/tin.1:1601 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1598 doc/tin.5:1322 +#: doc/tin.1:1604 doc/tin.5:1328 msgid "Color of actual news header fields" msgstr "Farbe des angezeigten Headers" #. type: TP -#: doc/tin.1:1598 +#: doc/tin.1:1604 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1601 doc/tin.5:1325 +#: doc/tin.1:1607 doc/tin.5:1331 msgid "Standard foreground color" msgstr "Standard Vordergrundfarbe" #. type: TP -#: doc/tin.1:1601 +#: doc/tin.1:1607 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1604 doc/tin.5:1328 +#: doc/tin.1:1610 doc/tin.5:1334 msgid "Color of quoted lines" msgstr "Farbe der zitierten Zeilen" #. type: TP -#: doc/tin.1:1604 +#: doc/tin.1:1610 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1607 doc/tin.5:1331 +#: doc/tin.1:1613 doc/tin.5:1337 msgid "Color of twice quoted lines" msgstr "Farbe von zweifach zitierten Zeilen" #. type: TP -#: doc/tin.1:1607 +#: doc/tin.1:1613 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3-fach zitierten Zeilen (col_quote3)>" #. type: Plain text -#: doc/tin.1:1610 doc/tin.5:1334 +#: doc/tin.1:1616 doc/tin.5:1340 msgid "Color of E=3 times quoted lines" msgstr "Farbe von =E3-fach zitierten Zeilen" #. type: TP -#: doc/tin.1:1610 +#: doc/tin.1:1616 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1614 +#: doc/tin.1:1620 doc/tin.5:1344 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." msgstr "" #. type: TP -#: doc/tin.1:1614 +#: doc/tin.1:1620 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1617 doc/tin.5:1341 +#: doc/tin.1:1623 doc/tin.5:1347 msgid "Color of signatures" msgstr "Farbe von Signaturen" #. type: TP -#: doc/tin.1:1617 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1620 doc/tin.5:1344 +#: doc/tin.1:1626 doc/tin.5:1350 msgid "Color of urls highlight" msgstr "Farbe der hervorgehobenen URLs" #. type: TP -#: doc/tin.1:1620 +#: doc/tin.1:1626 #, no-wrap msgid "B" msgstr "B" # #. type: Plain text -#: doc/tin.1:1623 doc/tin.5:1347 +#: doc/tin.1:1629 doc/tin.5:1353 msgid "Color of verbatim blocks" msgstr "Farbe des wortgetreu darzustellenden Textes" #. type: TP -#: doc/tin.1:1623 +#: doc/tin.1:1629 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1626 doc/tin.5:1350 +#: doc/tin.1:1632 doc/tin.5:1356 msgid "Color of article subject" msgstr "Farbe der Subjectzeile" #. type: TP -#: doc/tin.1:1626 +#: doc/tin.1:1632 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1629 doc/tin.5:1353 +#: doc/tin.1:1635 doc/tin.5:1359 msgid "Color of text-lines" msgstr "Farbe der Textzeilen" #. type: TP -#: doc/tin.1:1629 +#: doc/tin.1:1635 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1632 doc/tin.5:1356 +#: doc/tin.1:1638 doc/tin.5:1362 msgid "Color of help/mail sign" msgstr "Farbe des Hilfe/Mail-Zeichens" #. type: TP -#: doc/tin.1:1632 +#: doc/tin.1:1638 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1635 +#: doc/tin.1:1641 msgid "Ask for manual confirmation to protect the user." -msgstr "" +msgstr "Vorsichtshalber um Bestätigung bitten." #. type: IP -#: doc/tin.1:1636 doc/tin.1:1642 doc/tin.1:1646 +#: doc/tin.1:1642 doc/tin.1:1648 doc/tin.1:1652 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1642 +#: doc/tin.1:1648 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -3939,21 +3957,21 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1646 +#: doc/tin.1:1652 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 -#: doc/tin.1:1650 +#: doc/tin.1:1656 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: Plain text -#: doc/tin.5:1377 +#: doc/tin.5:1383 msgid "Default is commands & quit." -msgstr "" +msgstr "Voreinstellung ist Kommandos & Ende." #. type: Plain text -#: doc/tin.5:1388 +#: doc/tin.5:1394 msgid "" "Format string used for date representation. A description of the different " "format options can be found at B<\\%strftime>(3). B<\\%tin>(1) uses B<\\" @@ -11331,82 +11462,61 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1388 +#: doc/tin.5:1394 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1390 +#: doc/tin.5:1396 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1392 +#: doc/tin.5:1398 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1395 +#: doc/tin.5:1401 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1398 +#: doc/tin.5:1404 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1402 -msgid "" -"Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF " -"= ignore case. Default is OFF." -msgstr "" - #. type: TP -#: doc/tin.5:1402 +#: doc/tin.5:1408 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1406 -msgid "" -"Default for quick (1 key) kill filter expire. ON = limit to " -"'B', OFF = don't ever expire. Default is OFF." -msgstr "" - #. type: TP -#: doc/tin.5:1406 +#: doc/tin.5:1413 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1410 -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 -#: doc/tin.5:1410 +#: doc/tin.5:1417 #, no-wrap msgid "B" msgstr "B" #. type: ta -#: doc/tin.5:1415 doc/tin.5:1443 +#: doc/tin.5:1422 doc/tin.5:1451 #, no-wrap msgid "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & last \\'\\'References:\\'\\' entry only'u" msgstr "\\w'0,1 'u +\\w'\\'\\'Message-ID:\\'\\' & letzter \\'\\'References:\\'\\' Eintrag'u" #. type: Plain text -#: doc/tin.5:1424 doc/tin.5:1452 +#: doc/tin.5:1431 doc/tin.5:1460 #, no-wrap msgid "" "0\t''Subject:'' (case sensitive)\n" @@ -11428,160 +11538,139 @@ msgstr "" "7\t''Lines:''\n" #. type: TP -#: doc/tin.5:1426 +#: doc/tin.5:1433 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1430 +#: doc/tin.5:1437 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1434 -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 -#: doc/tin.5:1434 +#: doc/tin.5:1442 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1438 -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 -#: doc/tin.5:1438 +#: doc/tin.5:1446 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1454 +#: doc/tin.5:1462 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1456 +#: doc/tin.5:1464 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1458 +#: doc/tin.5:1466 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1460 +#: doc/tin.5:1468 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1462 +#: doc/tin.5:1470 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1464 +#: doc/tin.5:1472 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1466 +#: doc/tin.5:1474 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1468 +#: doc/tin.5:1476 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1470 +#: doc/tin.5:1478 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1472 +#: doc/tin.5:1480 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1474 +#: doc/tin.5:1482 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1476 +#: doc/tin.5:1484 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1478 +#: doc/tin.5:1486 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1480 +#: doc/tin.5:1488 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1482 +#: doc/tin.5:1490 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1484 +#: doc/tin.5:1492 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1486 +#: doc/tin.5:1494 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1488 +#: doc/tin.5:1496 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1492 -msgid "" -"Allows groups/articles to be selected by an arrow '-E' if set ON or by " -"an highlighted bar if set OFF." -msgstr "" - -#. type: Plain text -#: doc/tin.5:1497 +#: doc/tin.5:1505 msgid "" "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., /" @@ -11589,19 +11678,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1497 +#: doc/tin.5:1508 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: TP +#: doc/tin.5:1513 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1501 +#: doc/tin.5:1517 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1508 +#: doc/tin.5:1524 msgid "" "If B is E 0 not more than B articles/group " "are fetched from the server. If B is E 0 B<\\%tin>(1) " @@ -11610,13 +11705,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1508 +#: doc/tin.5:1524 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1523 +#: doc/tin.5:1539 msgid "" "The format string used for the Group level. Default is \"%n\\ %m\\ %R\\ %L\\ " "\\ %s\\ \\ %F\". The following substitutions are supported:" @@ -11626,13 +11721,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:1525 +#: doc/tin.5:1541 #, no-wrap msgid "\\w'%G 'u +\\w'number of responses in thread'u" msgstr "\\w'%G 'u +\\w'Absender, Name und/oder E-Mail Adresse'u" #. type: Plain text -#: doc/tin.5:1537 +#: doc/tin.5:1553 #, no-wrap msgid "" "%D\tdate\n" @@ -11660,67 +11755,31 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:1539 -#, no-wrap -msgid "B" -msgstr "B" - -#. type: TP -#: doc/tin.5:1543 +#: doc/tin.5:1555 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1553 -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 " -"size and filename (much the same as a MIME attachment). If set to 'Hide " -"all' then any line that looks like uuencoded data will be folded into a tag " -"line. This is useful when uuencoded data is split across more than one " -"article but can also lead to false positives. This setting can also be " -"toggled in the article viewer. Default is 'No'." -msgstr "" - #. type: TP -#: doc/tin.5:1553 +#: doc/tin.5:1565 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1560 -msgid "" -"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 -#: doc/tin.5:1560 +#: doc/tin.5:1572 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1566 -msgid "" -"If ON, show current group description or article subject in the last line " -"(not in the pager and global menu) - B ('B' toggles " -"setting). This facility is useful as the full width of the screen is " -"available to display long subjects. Default is OFF." -msgstr "" - #. type: TP -#: doc/tin.5:1566 +#: doc/tin.5:1578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1572 +#: doc/tin.5:1584 msgid "" "If greater than 0 your mailreader will be invoked earlier for reply so you " "can use more of its features (e.g. MIME, pgp, ...). 1 means include headers, " @@ -11729,32 +11788,32 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1572 +#: doc/tin.5:1584 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1576 +#: doc/tin.5:1588 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1581 +#: doc/tin.5:1593 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1585 +#: doc/tin.5:1597 msgid "" "This option controls the processing and display of articles that are killed. " "There are 3 options, default is 0 (B)." msgstr "" #. type: Plain text -#: doc/tin.5:1593 +#: doc/tin.5:1605 msgid "" "B is the 'traditional' behavior of B<\\%tin>(1). " "Only unread articles are killed once only by marking them read. As filtering " @@ -11763,266 +11822,107 @@ msgid "" "When you reenter the group the mark will be gone." msgstr "" -#. type: Plain text -#: doc/tin.5:1609 -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." -msgstr "" - #. type: TP -#: doc/tin.5:1609 +#: doc/tin.5:1621 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1619 +#: doc/tin.5:1631 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1624 +#: doc/tin.5:1636 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1643 -msgid "" -"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 -#: doc/tin.5:1643 +#: doc/tin.5:1655 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1649 -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' (e.g., /bin/mail \"iain\" E .article). The flexible format allows " -"other mailers with different command line parameters to be used such as" -msgstr "" - -#. type: Plain text -#: doc/tin.5:1654 -#, no-wrap -msgid "" -"sendmail -oem -t E %F\n" -"elm -s \"%S\" \"%T\" E \"%F\"\n" -"claws-mail --compose \"mailto:%T?subject=%S&insert=%F\"\n" -msgstr "" -"sendmail -oem -t E %F\n" -"elm -s \"%S\" \"%T\" E \"%F\"\n" -"claws-mail --compose \"mailto:%T?subject=%S&insert=%F\"\n" - -#. type: Plain text -#: doc/tin.5:1658 -msgid "" -"B must be set adequate. The following substitutions are " -"supported:" -msgstr "" -"B muss passend dazu gesetzt sein. Folgende Ersetzungen " -"werden unterstützt:" - -#. type: ta -#: doc/tin.5:1660 -#, no-wrap -msgid "\\w'%S'u +\\w'subject-field'u" -msgstr "\\w'%S'u +\\w'Subject-Feld'u" - -#. type: Plain text -#: doc/tin.5:1667 -#, no-wrap -msgid "" -"%F\tfilename\n" -"%M\tdefault_mailer\n" -"%S\tsubject-field\n" -"%T\tto-filed\n" -"%U\tusername\n" -"%%\t%\n" -msgstr "" -"%F\tDateiname\n" -"%M\tdefault_mailer\n" -"%S\tSubject-Feld\n" -"%T\tTo-Feld\n" -"%U\tUsername\n" -"%%\t%\n" - #. type: TP -#: doc/tin.5:1680 +#: doc/tin.5:1692 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1692 -msgid "" -"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<\\%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 -#: doc/tin.5:1692 doc/tin.5:2385 +#: doc/tin.5:1704 doc/tin.5:2403 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1705 -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 " -"B is defined at the compile time, text in charset other " -"than the value of this parameter is considered not displayable and " -"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<\\%iconv>(3), this " -"option is disabled and you should use B instead." -msgstr "" - -#. type: Plain text -#: doc/tin.5:1716 -msgid "" -"Charset used for posting and MIME headers; replaces B. " -"Conversion between B and local charset (determined via 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: TP -#: doc/tin.5:1725 +#: doc/tin.5:1737 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1730 -msgid "" -"Character attribute of words emphasized like _this_. It is depending on your " -"terminal which attributes are usable. See also B and " -"B." -msgstr "" - #. type: TP -#: doc/tin.5:1730 +#: doc/tin.5:1742 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1735 -msgid "" -"Character attribute of words emphasized like /this/. It is depending on your " -"terminal which attributes are usable. See also B and " -"B." -msgstr "" - #. type: TP -#: doc/tin.5:1735 +#: doc/tin.5:1747 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1740 -msgid "" -"Character attribute of words emphasized like *this*. It is depending on your " -"terminal which attributes are usable. See also B and " -"B." -msgstr "" - #. type: TP -#: doc/tin.5:1740 +#: doc/tin.5:1752 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1745 -msgid "" -"Character attribute of words emphasized like -this-. It is depending on your " -"terminal which attributes are usable. See also B and " -"B." -msgstr "" - #. type: TP -#: doc/tin.5:1745 +#: doc/tin.5:1757 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1751 +#: doc/tin.5:1763 msgid "" "These are internal timers used by B<\\%tin>(1) to keep track of new " "newsgroups. Do not change them unless you understand what they are for." msgstr "" -#. type: Plain text -#: doc/tin.5:1758 -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 " -"you enter 'X-' as the value, you will see all headers beginning with " -"'X-' (like X-Alan or X-Pape). You can list more than one by delimiting with " -"spaces. Not defining anything turns off this option." -msgstr "" - -#. type: Plain text -#: doc/tin.5:1767 -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 Thing(tm), but thought Alan and Pape were miscreants... well then you " -"would do something like this: B " -"B Not defining anything turns off " -"this option." -msgstr "" - #. type: TP -#: doc/tin.5:1772 +#: doc/tin.5:1784 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1775 +#: doc/tin.5:1787 msgid "Time in seconds to wait for a response from the server. Default is 120." msgstr "" +"Maximal n Sekunden auf eine Antwort vom Server warten (0 = kein Zeitlimit). " +"Voreinstellung ist 120." #. type: TP -#: doc/tin.5:1775 +#: doc/tin.5:1787 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1779 +#: doc/tin.5:1791 msgid "" "The normalization form which should be used to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.5:1795 +#: doc/tin.5:1807 msgid "" "Some normalization modes are only available if they are supported by the " "library B<\\%tin>(1) uses to do the normalization. NFC should be used if " @@ -12030,22 +11930,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1799 -msgid "" -"If ON put cursor at first unread article in group otherwise at last " -"article. Default is ON." -msgstr "" - -#. type: Plain text -#: doc/tin.5:1815 -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: Plain text -#: doc/tin.5:1823 +#: doc/tin.5:1835 msgid "" "If ON, then B<\\%tin>(1) will start an appropriate viewer program to " "display any files that were post processed and uudecoded. The program is " @@ -12053,7 +11938,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1829 +#: doc/tin.5:1841 msgid "" "This specifies whether to perform post processing on saved articles. " "Because the shell archive may contain commands you may not want to be " @@ -12062,7 +11947,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1837 +#: doc/tin.5:1849 msgid "" "B, unpacking of multi-part B<\\%shar>(1) files only. " "Because the shell archive may contain commands you may not want to be " @@ -12070,19 +11955,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1840 +#: doc/tin.5:1852 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1850 +#: doc/tin.5:1862 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1860 +#: doc/tin.5:1872 msgid "" "The printer program with options that is to be used to print articles. The " "default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " @@ -12091,20 +11976,22 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1868 +#: doc/tin.5:1880 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default " "is OFF." msgstr "" +"Falls ON zeige leeren ''Followup-To:''-Header im Editor. Voreinstellung ist " +"OFF." #. type: TP -#: doc/tin.5:1874 +#: doc/tin.5:1886 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1880 +#: doc/tin.5:1892 msgid "" "This bit coded integer value controls how articles are to be quoted when " "following up or replying to them. Any of the following options can be " @@ -12113,7 +12000,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1885 +#: doc/tin.5:1897 msgid "" "B Compress quote characters together when quoting multiple " "times (for example, 'E E E' will be turned into " @@ -12121,7 +12008,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1891 +#: doc/tin.5:1903 msgid "" "B This option is off by default. Signatures are always " "quoted regardless of this option when you are viewing an article in raw mode " @@ -12130,18 +12017,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:1893 +#: doc/tin.5:1905 msgid "B This option is on by default." msgstr "B Diese Option ist standardmäßig aktiviert." #. type: TP -#: doc/tin.5:1894 +#: doc/tin.5:1906 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1901 +#: doc/tin.5:1913 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then B<" @@ -12149,13 +12036,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1901 +#: doc/tin.5:1913 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1908 +#: doc/tin.5:1920 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -12163,13 +12050,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1908 +#: doc/tin.5:1920 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1915 +#: doc/tin.5:1927 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -12177,72 +12064,61 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:1915 +#: doc/tin.5:1927 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1919 +#: doc/tin.5:1931 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1923 +#: doc/tin.5:1935 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1932 +#: doc/tin.5:1944 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1936 +#: doc/tin.5:1948 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1940 +#: doc/tin.5:1952 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1944 +#: doc/tin.5:1956 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:1948 +#: doc/tin.5:1960 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:1956 -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 " -"traditional 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. This setting " -"supersedes show_last_line_prev_page=ON. Set to -2 to get half-page " -"scrolling. This setting supersedes full_page_scroll=OFF." -msgstr "" - #. type: TP -#: doc/tin.5:1956 +#: doc/tin.5:1968 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:1960 +#: doc/tin.5:1972 msgid "" "The format string used for the Selection level. Default is \"%f\\ %n\\ %U\\ " "\\ %G\\ \\ %d\". The following substitutions are supported:" @@ -12252,13 +12128,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:1962 +#: doc/tin.5:1974 #, no-wrap msgid "\\w'%G 'u +\\w'current group number'u" msgstr "\\w'%G 'u +\\w'Anzahl ungelesener Artikel'u" #. type: Plain text -#: doc/tin.5:1969 +#: doc/tin.5:1981 #, no-wrap msgid "" "%G\tgroup name\n" @@ -12276,19 +12152,19 @@ msgstr "" "%%\t%\n" #. type: TP -#: doc/tin.5:1971 +#: doc/tin.5:1983 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2002 +#: doc/tin.5:2014 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2011 +#: doc/tin.5:2023 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 " @@ -12298,34 +12174,19 @@ msgid "" "mailgroups> for mailgroups. Default is ON." msgstr "" -#. type: Plain text -#: doc/tin.5:2022 -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 -#: doc/tin.5:2033 -msgid "" -"If ON show only new/unread articles otherwise show all articles. Default is " -"ON." -msgstr "" - #. type: TP -#: doc/tin.5:2033 +#: doc/tin.5:2045 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2040 +#: doc/tin.5:2052 msgid "If OFF don't show signatures when displaying articles. Default is ON." -msgstr "" +msgstr "Falls OFF zeige keine Signaturen an. Voreinstellung ist ON." #. type: Plain text -#: doc/tin.5:2054 +#: doc/tin.5:2066 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 " @@ -12337,13 +12198,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2057 +#: doc/tin.5:2069 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2064 +#: doc/tin.5:2076 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12351,27 +12212,19 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2110 +#: doc/tin.5:2122 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:2115 -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." -msgstr "" - #. type: TP -#: doc/tin.5:2115 +#: doc/tin.5:2129 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2122 +#: doc/tin.5:2136 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12379,31 +12232,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2127 +#: doc/tin.5:2141 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2131 +#: doc/tin.5:2145 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2140 +#: doc/tin.5:2154 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2144 +#: doc/tin.5:2158 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2151 +#: doc/tin.5:2165 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12411,7 +12264,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2156 +#: doc/tin.5:2170 msgid "" "Decode German style TeX umlaut codes to ISO If ON, show \"a as Umlaut-a, " "etc. Default is OFF. This behavior can also be toggled in the article viewer " @@ -12419,7 +12272,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2166 +#: doc/tin.5:2180 msgid "" "Defines which threading method to use. The choices are: 0) Don't thread, 1) " "Thread on Subject only 2) Thread on References only, 3) Thread on References " @@ -12431,7 +12284,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2170 +#: doc/tin.5:2184 msgid "" "The format string used for the Thread level. Default is \"%n\\ %m\\ \\ " "[%L]\\ \\ %T\\ \\ %F\". The following substitutions are supported:" @@ -12441,13 +12294,13 @@ msgstr "" "Ersetzungen werden unterstützt:" #. type: ta -#: doc/tin.5:2172 +#: doc/tin.5:2186 #, no-wrap msgid "\\w'%G 'u +\\w'from, name and/or address'u" msgstr "\\w'%G 'u +\\w'Subject und/oder Baumdarstellung des Thread'u" #. type: Plain text -#: doc/tin.5:2183 +#: doc/tin.5:2197 #, no-wrap msgid "" "%D\tdate\n" @@ -12473,7 +12326,7 @@ msgstr "" "%%\t%\n" #. type: Plain text -#: doc/tin.5:2190 +#: doc/tin.5:2204 msgid "" "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 " @@ -12481,25 +12334,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2194 +#: doc/tin.5:2208 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2206 +#: doc/tin.5:2220 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2237 +#: doc/tin.5:2251 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2244 +#: doc/tin.5:2258 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -12507,95 +12360,89 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2244 +#: doc/tin.5:2258 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2248 +#: doc/tin.5:2262 msgid "" "If ON remove I<${TIN_HOMEDIR:-\"$HOME\"}/.article> after posting. Default is " "ON." msgstr "" +"Falls ON entferne I<${TIN_HOMEDIR:-\"$HOME\"}/.article> nach dem posten. " +"Voreinstellung ist ON." #. type: TP -#: doc/tin.5:2248 +#: doc/tin.5:2262 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:2253 -msgid "" -"The program that will be run when launching URLs in the article viewer using " -"B ('B'). The actual URL will be appended to this. Default is " -"B." -msgstr "" - #. type: TP -#: doc/tin.5:2253 +#: doc/tin.5:2267 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2256 +#: doc/tin.5:2270 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2261 +#: doc/tin.5:2275 msgid "If enabled B<\\%tin>(1) uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2261 +#: doc/tin.5:2275 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2264 +#: doc/tin.5:2278 msgid "Use scroll keys on keypad. Default is OFF." msgstr "" #. type: TP -#: doc/tin.5:2264 +#: doc/tin.5:2278 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2270 +#: doc/tin.5:2284 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2282 +#: doc/tin.5:2296 msgid "" "If enabled B<\\%slrnface>(1) will be used to interpret the ''X-Face:'' " "header. For this option to have any effect, B<\\%tin>(1) must be running in " -"an B<\\%xterm>(1x) and B<\\%slrnface>(1) must be in your $B. Default " +"a B<\\%xterm>(1x) and B<\\%slrnface>(1) must be in your $B. Default " "is OFF." msgstr "" #. type: TP -#: doc/tin.5:2282 +#: doc/tin.5:2296 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2286 +#: doc/tin.5:2300 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2290 +#: doc/tin.5:2304 msgid "" "A regular expression that tin will use to find the begin of a verbatim " "block. Default is #v+" @@ -12604,13 +12451,13 @@ msgstr "" "Absatzes findet. Voreinstellung ist #v+" #. type: TP -#: doc/tin.5:2290 +#: doc/tin.5:2304 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2294 +#: doc/tin.5:2308 msgid "" "A regular expression that tin will use to find the end of a verbatim block. " "Default is #v-" @@ -12619,66 +12466,56 @@ msgstr "" "Absatzes findet. Voreinstellung ist #v-" #. type: Plain text -#: doc/tin.5:2298 +#: doc/tin.5:2312 msgid "If ON verbatim blocks will be detected. Default is ON" msgstr "" -"Falls ON werden wortgetreue Textblöcke in Artiklen erkannt. Voreinstellung " +"Falls ON werden wortgetreue Textblöcke in Artikeln erkannt. Voreinstellung " "ist ON." #. type: TP -#: doc/tin.5:2298 +#: doc/tin.5:2312 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" #. type: Plain text -#: doc/tin.5:2310 +#: doc/tin.5:2328 msgid "" "Allows you to select how B<\\%tin>(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 B<\\%perl>(1) compatible regular " -"expressions B<\\%pcre>(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." +"uses the wildmat notation, which is how this has traditionally been " +"handled. 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 -#: doc/tin.5:2310 +#: doc/tin.5:2328 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2322 +#: doc/tin.5:2340 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.5:2330 -msgid "" -"Enable word highlighting. See B for the options " -"available. If B is enabled the colors specified in " -"B, B, B and B are " -"used for word highlighting else the character attributes specified in " -"B, B, B and B " -"are used." -msgstr "" - #. type: TP -#: doc/tin.5:2330 +#: doc/tin.5:2348 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.5:2346 +#: doc/tin.5:2364 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2362 +#: doc/tin.5:2380 msgid "" "Yet another global configuration file with \"I=I\" pairs. " "This one is for the more general options which usually can't be controlled " @@ -12688,31 +12525,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2362 +#: doc/tin.5:2380 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2365 +#: doc/tin.5:2383 msgid "Sets a global domain name used in From lines" msgstr "" #. type: Plain text -#: doc/tin.5:2369 +#: doc/tin.5:2387 msgid "" "Defines the name of your organization. $B overrides any " "specified value." msgstr "" #. type: TP -#: doc/tin.5:2369 +#: doc/tin.5:2387 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2374 +#: doc/tin.5:2392 msgid "" "Defines the default place for some configuration files, common values are I, I, I or I. " @@ -12720,13 +12557,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2374 +#: doc/tin.5:2392 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2380 +#: doc/tin.5:2398 msgid "" "Defines the email address to which users can send bug reports using a built-" "in function. The default points to a developers mailing list located at tin." @@ -12735,61 +12572,65 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2380 +#: doc/tin.5:2398 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2385 +#: doc/tin.5:2403 msgid "Defines the directory containing of the B<\\%inews>(1) executable" msgstr "" #. type: Plain text -#: doc/tin.5:2389 +#: doc/tin.5:2407 msgid "" "Default charset to be used in MIME's ''Content-Type:'' header. " "$B overrides any specified value." msgstr "" #. type: Plain text -#: doc/tin.5:2392 +#: doc/tin.5:2410 msgid "" "Default encoding scheme used in MIME articles. 8bit might be the best value." msgstr "" +"Voreingestellte Zeichenkodierung in MIME-Artikeln. 8bit ist wahrscheinlich " +"die beste Wahl." #. type: Plain text -#: doc/tin.5:2396 +#: doc/tin.5:2414 msgid "" "Default encoding scheme used in MIME letters. quoted-printable is a good " "choice here." msgstr "" +"Voreingestellte Zeichenkodierung in MIME-Mails. Quoted-Printable ist hier " +"eine gute Wahl." #. type: TP -#: doc/tin.5:2396 +#: doc/tin.5:2414 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2402 +#: doc/tin.5:2420 msgid "" "Allow unregistered top level domains. As the list of valid TLDs is no longer " -"actively maintained the default was changed to ON starting with B<\\%tin>" -"(1) version 2.1.5" +"actively maintained the default was changed to ON starting with B<\\" +"%tin>(1) version 2.1.5" msgstr "" "Unregistrierte Top-Level-Domains zulassen. Da die Liste der gültigen TLDs " "nicht mehr aktiv gepflegt wird wurde ab B<\\%tin>(1) Version 2.1.5 die " -"Voreinstellung auf ON gändert." +"Voreinstellung auf ON geändert." #. type: TP -#: doc/tin.5:2402 +#: doc/tin.5:2420 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2406 +#: doc/tin.5:2424 msgid "" "Don't generate a ''Sender:'' header. This has an effect only if " "B is set to --internal." @@ -12798,13 +12639,13 @@ msgstr "" "steht wird die Einstellung ignoriert." #. type: TP -#: doc/tin.5:2406 +#: doc/tin.5:2424 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2411 +#: doc/tin.5:2429 msgid "" "Base of your newsspool (Bnews, Cnews and INN traditional spool style), " "common values are I, I, I. " @@ -12812,13 +12653,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2411 +#: doc/tin.5:2429 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2419 +#: doc/tin.5:2437 msgid "" "Base of your NOV database B<\\%newsoverview>(5) (tradspool style; might be " "the same dir as I), common values are I, I" msgstr "B" #. type: Plain text -#: doc/tin.5:2423 +#: doc/tin.5:2441 msgid "" "Name of a single overview file, common values are I<.overview>, I. $B overrides any specified value." @@ -12842,13 +12683,13 @@ msgstr "" "view>. $B übersteuert den angegebenen Wert." #. type: TP -#: doc/tin.5:2423 +#: doc/tin.5:2441 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2428 +#: doc/tin.5:2446 msgid "" "Full pathname of your newssystem's overview.fmt file; usually the overview." "fmt file is in I, so you only have to change this setting if " @@ -12856,13 +12697,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2428 +#: doc/tin.5:2446 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2434 +#: doc/tin.5:2452 msgid "" "Full pathname of your newssystem's active file; usually the active file " "resides in I and is named I, so you only have to change " @@ -12871,13 +12712,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2434 +#: doc/tin.5:2452 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2439 +#: doc/tin.5:2457 msgid "" "Full pathname of your newssystem's active.times file; usually the active." "times file is I, so you only have to change this setting if your " @@ -12885,13 +12726,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2439 +#: doc/tin.5:2457 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2444 +#: doc/tin.5:2462 msgid "" "Full pathname of your newssystem's newsgroups file; usually the newsgroups " "file is in I, so you only have to change this setting if your " @@ -12899,13 +12740,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:2444 +#: doc/tin.5:2462 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2449 +#: doc/tin.5:2467 msgid "" "Full pathname of your newssystem's subscriptions file; usually the " "subscriptions file is in I, so you only have to change this " @@ -12913,12 +12754,12 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2453 +#: doc/tin.5:2471 msgid "I" msgstr "I" #. type: Plain text -#: doc/tin.5:2457 +#: doc/tin.5:2475 msgid "" "translation into language specified in $B, $B or " "$B" @@ -12927,7 +12768,7 @@ msgstr "" "Sprache" #. type: Plain text -#: doc/tin.5:2471 +#: doc/tin.5:2489 msgid "" "This file lists the newsgroups that the local site receives. Each newsgroup " "should be listed only once. Each line specifies one group; within each " @@ -12937,7 +12778,7 @@ msgstr "" #. TODO: IIRC tin issues just a warning in that case? #. type: Plain text -#: doc/tin.5:2476 +#: doc/tin.5:2494 msgid "" "If an article is posted to newsgroups not mentioned in this file, those " "newsgroups are ignored. If no valid newsgroups are specified, the article " @@ -12945,37 +12786,37 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2479 +#: doc/tin.5:2497 msgid "" "Each line consists of four space-separated fields \"I I " "I I\"." msgstr "" #. type: TP -#: doc/tin.5:2479 doc/tin.5:2532 +#: doc/tin.5:2497 doc/tin.5:2550 #, no-wrap msgid "B" -msgstr "B" +msgstr "B" #. type: TP -#: doc/tin.5:2482 +#: doc/tin.5:2500 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2485 +#: doc/tin.5:2503 msgid "is the highest article number that has been used in that newsgroup" msgstr "die höchste Artikelnummer die je in der Gruppe benutzt wurde" #. type: TP -#: doc/tin.5:2485 +#: doc/tin.5:2503 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2492 +#: doc/tin.5:2510 msgid "" "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 " @@ -12983,92 +12824,100 @@ msgid "" "lowest article number is greater than the highest article number, then there " "are no articles in the newsgroup." msgstr "" +"ist die niedrigste Artikelnummer in der Gruppe; es ist nicht gewährleistet, " +"dass diese Zahl genau ist und sie sollte nur als Hinweis angesehen werden. " +"Beachten Sie, dass es aufgrund von Artikel Stornierungen, zu Lücken in der " +"Nummerierung Sequenz kommen kann. Falls die niedrigste Artikelnummer größer " +"als die höchste Artikelnummer ist, dann gibt es keine Artikel in der " +"Newsgroup." #. type: TP -#: doc/tin.5:2492 +#: doc/tin.5:2510 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2495 +#: doc/tin.5:2513 msgid "can be one of those" -msgstr "" +msgstr "kann eines der folgenden sein" #. type: TP -#: doc/tin.5:2496 +#: doc/tin.5:2514 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2499 +#: doc/tin.5:2517 msgid "local postings are allowed" -msgstr "" +msgstr "lokale Postings sind erlaubt" #. type: TP -#: doc/tin.5:2499 +#: doc/tin.5:2517 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2502 +#: doc/tin.5:2520 msgid "no local postings are allowed, only remote ones" msgstr "" +"lokale Postings sind nicht erlaubt, Artikel kommen nur über andere Server" #. type: TP -#: doc/tin.5:2502 +#: doc/tin.5:2520 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2505 +#: doc/tin.5:2523 msgid "the group is moderated and all postings must be approved" msgstr "die Gruppe ist moderiert und alle Postings müssen approved werden" #. type: TP -#: doc/tin.5:2505 +#: doc/tin.5:2523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2508 +#: doc/tin.5:2526 msgid "articles in this group are not kept, but only passed on" msgstr "" +"Artikel in dieser Gruppe werden nicht gespeichert sondern nur durchgereicht" #. type: TP -#: doc/tin.5:2508 +#: doc/tin.5:2526 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.5:2511 +#: doc/tin.5:2529 msgid "articles cannot be posted to this newsgroup" -msgstr "in diese Gruppe darf nicht geposted werden" +msgstr "in diese Gruppe darf nicht gepostet werden" #. type: TP -#: doc/tin.5:2511 +#: doc/tin.5:2529 #, no-wrap msgid "B<=foo.bar>" msgstr "B<=foo.bar>" #. type: Plain text -#: doc/tin.5:2514 +#: doc/tin.5:2532 msgid "articles are locally filed into the ''foo.bar'' group" msgstr "Artikel werden auf dem Server in der Gruppe ''foo.bar'' abgelegt" #. type: TP -#: doc/tin.5:2515 doc/tin.5:2542 doc/tin.5:2565 +#: doc/tin.5:2533 doc/tin.5:2560 doc/tin.5:2583 #, no-wrap msgid "B<\\%tin>(1)" msgstr "B<\\%tin>(1)" #. type: Plain text -#: doc/tin.5:2521 +#: doc/tin.5:2539 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST (B) or LIST " @@ -13076,7 +12925,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2532 +#: doc/tin.5:2550 msgid "" "This file provides a chronological record of when newsgroups are created. It " "is normally updated by the local news server (e.g. B<\\%innd>(8)) whenever " @@ -13085,25 +12934,27 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2539 +#: doc/tin.5:2557 msgid "" "is the time when the group was created, expressed as the number of seconds " -"since the epoch." +"since the Epoch." msgstr "" +"Zeit wann die Gruppe erzeugt wurde, ausgedrückt als Anzahl von Sekunden seit " +"Beginn der Epoche." #. type: TP -#: doc/tin.5:2539 +#: doc/tin.5:2557 #, no-wrap msgid "B" -msgstr "" +msgstr "B" #. type: Plain text -#: doc/tin.5:2542 +#: doc/tin.5:2560 msgid "is the electronic mail address of the person who created the group." msgstr "die Mailadresse der Person die die Gruppe angelegt hat." #. type: Plain text -#: doc/tin.5:2548 +#: doc/tin.5:2566 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the NEWGROUPS (B) " @@ -13111,7 +12962,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2559 +#: doc/tin.5:2577 msgid "" "This file provides short descriptions of each newsgroup. It is normally " "updated by the local news server (e.g. B<\\%innd>(8)) whenever a new group " @@ -13120,7 +12971,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2571 +#: doc/tin.5:2589 msgid "" "only tries to read the file if you read directly from the local spool, if " "you read news via NNTP, B<\\%tin>(1) uses the LIST NEWSGROUPS (B has a higher priority if set." msgstr "" #. type: Plain text -#: doc/tin.5:2598 +#: doc/tin.5:2616 msgid "" "This file specifies the organization of the news overview database (see also " "B<\\%newsoverview>(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 B<\\%overview.fmt>(5). B<\\%tin>(1) only tries to read the file if " -"you read directly from the local spool, if you read news via NNTP, B<\\%tin>" -"(1) uses the LIST OVERVIEW.FMT (B) command instead." +"you read directly from the local spool, if you read news via NNTP, B<\\" +"%tin>(1) uses the LIST OVERVIEW.FMT (B) command instead." msgstr "" #. type: Plain text -#: doc/tin.5:2613 +#: doc/tin.5:2631 msgid "" "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 " @@ -13156,26 +13007,26 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:2657 +#: doc/tin.5:2677 msgid "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<" -"\\%metamail>(1), B<\\%perl>(1), B<\\%pgp>(1), B<\\%rn>(1), B<\\%shar>(1), B<" -"\\%slrnface>(1), B<\\%tin>(1), B<\\%xterm>(1x), B<\\%heapsort>(3), B<\\" -"%iconv>(3), B<\\%iconv_open>(3), B<\\%nl_langinfo>(3), B<\\%pcre>(3), B<\\" -"%qsort>(3), B<\\%strftime>(3), B<\\%system>(3), B<\\%active>(5), B<\\" -"%mailcap>(5), B<\\%mbox>(5), B<\\%mmdf>(5), B<\\%newsoverview>(5), B<\\" -"%overview.fmt>(5), B<\\%innd>(8), B, B, B, B, B, B, B, B, B, B, B, B, B" +"\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), B<\\%rn>(1), " +"B<\\%shar>(1), B<\\%slrnface>(1), B<\\%tin>(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<\\%strftime>(3), B<\\" +"%system>(3), B<\\%active>(5), B<\\%mailcap>(5), B<\\%mbox>(5), B<\\" +"%mmdf>(5), B<\\%newsoverview>(5), B<\\%overview.fmt>(5), B<\\%innd>(8), B, B, B, B, B, B, B, B, B, B, B, B, B" msgstr "" "B<\\%elm>(1), B<\\%inews>(1), B<\\%ispell>(1), B<\\%lp>(1), B<\\%lpr>(1), B<" -"\\%metamail>(1), B<\\%perl>(1), B<\\%pgp>(1), B<\\%rn>(1), B<\\%shar>(1), B<" -"\\%slrnface>(1), B<\\%tin>(1), B<\\%xterm>(1x), B<\\%heapsort>(3), B<\\" -"%iconv>(3), B<\\%iconv_open>(3), B<\\%nl_langinfo>(3), B<\\%pcre>(3), B<\\" -"%qsort>(3), B<\\%strftime>(3), B<\\%system>(3), B<\\%active>(5), B<\\" -"%mailcap>(5), B<\\%mbox>(5), B<\\%mmdf>(5), B<\\%newsoverview>(5), B<\\" -"%overview.fmt>(5), B<\\%innd>(8), B, B, B, B, B, B, B, B, B, B, B, B, B" +"\\%metamail>(1), B<\\%perl>(1), B<\\%perlre>(1), B<\\%pgp>(1), B<\\%rn>(1), " +"B<\\%shar>(1), B<\\%slrnface>(1), B<\\%tin>(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<\\%strftime>(3), B<\\" +"%system>(3), B<\\%active>(5), B<\\%mailcap>(5), B<\\%mbox>(5), B<\\" +"%mmdf>(5), B<\\%newsoverview>(5), B<\\%overview.fmt>(5), B<\\%innd>(8), B, B, B, B, B, B, B, B, B, B, B, B, B" diff -Nurp '--exclude=.bzr*' tin-2.3.1/doc/l10n/en_GB/tin.1 tin-2.3.2/doc/l10n/en_GB/tin.1 --- tin-2.3.1/doc/l10n/en_GB/tin.1 2014-12-24 09:37:33.000000000 +0100 +++ tin-2.3.2/doc/l10n/en_GB/tin.1 2015-12-22 11:26:51.143209015 +0100 @@ -3,7 +3,7 @@ .\" Module : tin.1 .\" Author : I. Lea, U. Janssen .\" Created : 1991-08-23 -.\" Updated : 2014-12-24 +.\" Updated : 2015-12-01 .\" Notes : use american english; still needs some work, e.g.: .\" - document authorization (.newsauth) .\" - document random organization feature @@ -14,7 +14,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH tin 1 "December 24th, 2014" 2.3.1 "Usenet newsreader" +.TH tin 1 "December 24th, 2015" 2.3.2 "Usenet newsreader" .\" .\" .SH NAME @@ -289,7 +289,7 @@ newsgroups are displayed in the middle o of unread articles displayed on the same line in front, but it can be customised via \fBselect_format\fP. .PP -.\" FIXME - make this autoscale +.\" FIXME - make this auto scale .nf \->M 1 2 comp.security.announce Announcements from the CERT abou M 2 1 news.admin.announce Announcements for news adminstra @@ -334,9 +334,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 @@ -361,7 +365,7 @@ the first (unread) article in the thread the subject \- this is controlled by the \fBshow_info\fP option. The display can be customised via \fBgroup_format\fP. .PP -.\" FIXME - make this autoscale +.\" FIXME - make this auto scale .nf de.admin.net\-abuse.announce (11B 13+ 1* 1o 0K) M @@ -375,7 +379,7 @@ be customised via \fBgroup_format\fP. At the Thread level the screen usually (depends on the threading method used) looks like this, but can be customised via \fBthread_format\fP: .PP -.\" FIXME - make this autoscale +.\" FIXME - make this auto scale .nf \-> 1 [ 7] What is this funny tree in the thr Robert F. Simmig 2 [ 12] +\-> Sephan Wagner \fP') is pressed. Default is \fBPageNextUnread\fP. .TP -\fBMax. length of group names shown (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 \fBDisplay uue data as an attachment (hide_uue)\fP 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 -size and filename (much the same as a MIME attachment). If set to 'Hide all' -then any line that looks like uuencoded data will be folded into a tag -line. This is useful when uuencoded data is split across more than one +size and filename (much the same as a MIME attachment). If set to 'Hide +all' then any line that looks like uuencoded data will be folded into a tag +line. This is useful when uuencoded data is split across more than one article but can also lead to false positives. This setting can also be -toggled in the article viewer. Default is 'No'. +toggled in the article viewer. Default is 'No'. .TP \fBExternal inews (inews_prog)\fP 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 +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 @@ -1862,13 +1873,30 @@ program. It allows the user to save arti \&'=' as the filename to save to. Default is \fI${TIN_HOMEDIR:\-"$HOME"}/Mail\fP. .TP \fBInvocation of your mail command (mailer_format)\fP -.\" TODO: document %S, %T, %M, %F, %U ... The format string used to create the mailer command with parameters that is used for mailing articles to other people. Default is '%M "%T" < %F' (e.g., /bin/mail "iain" < .article). The flexible format allows other -mailers with different command\-line parameters to be used such as 'elm \-s -"%S" "%T" < "%F"' (e.g., elm \-s "subject" "iain" < .article) or -\&'sendmail \-oi \-oem \-t < %F' (e.g. sendmail \-oi \-oem \-t < .article). +mailers with different command line parameters to be used such as +.in +.3i +.nf +sendmail \-oem \-t < %F +elm \-s "%S" "%T" < "%F" +claws\-mail \-\-compose "mailto:%T?subject=%S&insert=%F" +.fi +.in -.3i +\fBinteractive_mailer\fP must be set adequate. The following substitutions are +supported: +.in +.3i +.nf +.ta \w'%S'u +\w'default_mailer'u +%F filename +%M default_mailer +%S subject\-field +%T to\-filed +%U username +%% % +.fi +.in -.3i .TP \&\fB'Mark as (un)read' ignores tags (mark_ignore_tags)\fP When this is ON, the \fBGroupMarkThdRead\fP ('\fBK\fP'), \fBThreadMarkArtRead\fP @@ -1887,7 +1915,7 @@ non\-textual parts of articles. To use \-\-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. +any attachments. See also \fBask_for_metamail\fP. .TP \fBMM_CHARSET (mm_charset)\fP Charset supported locally, which is also used for MIME header (charset @@ -1949,11 +1977,11 @@ spaces. Not defining anything turns off .TP \fBDo not display these header fields (news_headers_to_not_display)\fP Same as \fBnews_headers_to_display\fP except it denotes the opposite. An -example of using both options might be if you thought X\- headers were A Good -Thing(tm), but thought Alan and Pape were miscreants... well then you would -do something like this: \fInews_headers_to_display=X\-\fP -\fInews_headers_to_not_display=X\-Alan X\-Pape\fP. Not defining anything turns -off this option. +example of using both options might be if you thought 'X\-' headers were A +Good Thing(tm), but thought Alan and Pape were miscreants... well then you +would do something like this: \fBnews_headers_to_display=X\-\fP +\fBnews_headers_to_not_display=X\-Alan X\-Pape\fP Not defining anything turns off +this option. .TP \fBQuote line when following up (news_quote_format)\fP Format of quote line when posting/following up an article (%A=Address, @@ -1998,8 +2026,8 @@ local hierarchy of your interest to dete .TP \fBMIME encoding in news messages (post_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. base64 -and quoted\-printable are usually undesired on usenet. +quoted\-printable, 7bit). Default is 8bit, which leads to no encoding. +base64 and quoted\-printable are usually undesired on usenet. .TP \fBView post\-processed files (post_process_view)\fP If ON, then \fBtin\fP will start an appropriate viewer program to display any @@ -2112,13 +2140,13 @@ using cursor\-up/down. The default is 1 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. This setting supersedes show_last_line_prev_page=ON. Set to \-2 to get -half\-page scrolling. This setting supersedes full_page_scroll=OFF. +half\-page scrolling. This setting supersedes \fBfull_page_scroll\fP=OFF. .TP \fBFormat string for the Selection level (select_format)\fP Format string tin uses for Selection level representation. See the section "CUSTOMISING THE SCREEN FORMAT". Default is "%f\ %n\ %U\ \ %G\ \ %d". .TP -\fBIn group menu, show author by (show_author)\fP +\fBIn group and thread level, show author by (show_author)\fP Which information about the author should be shown. Default is 2, authors full name. .RS +.5i @@ -2384,10 +2412,10 @@ matching words are shown in \fBcol_markd \fBRemove ~/.article after posting (unlink_article)\fP If ON remove \fI~/.article\fP after posting. Default is ON. .TP -\fBProgram that opens URL's (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. -Default is \fBurl_handler.pl %s\fP. +\fBProgram that opens URLs (url_handler)\fP +The program that will be run when launching URLs in the article viewer using +\fBPageViewUrl\fP ('\fBU\fP'). The actual URL will be appended to this. Default is +\fBurl_handler.pl %s\fP. .TP \fBURL highlighting in message body (url_highlight)\fP Enable highlighting URLs in message body. Default is ON. @@ -2404,7 +2432,7 @@ enabled/disabled. Default is OFF. .TP \fBUse slrnface to show \*(rqX\-Face:\*(rqs (use_slrnface)\fP 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 +header. For this option to have any effect, \fBtin\fP must be running in a \fB\%xterm\fP(1x) and \fB\%slrnface\fP(1) must be in your $\fBPATH\fP. Default is OFF. .TP @@ -2461,7 +2489,7 @@ width plus the given value (as long as t otherwise it will fall back to the current screen width). Default is 0, wrapping at the current screen width. .TP -\fBQuote line when cross\-posting (xpost_quote_format)\fP +\fBQuote line when crossposting (xpost_quote_format)\fP .\" .\" Format is the same as for \fBnews_quote_format\fP, this is used when answering @@ -2477,7 +2505,7 @@ no private attributes file yet. Note that the \fIscope=\fP 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 +to change (e.g., \fBsavedir\fP). All toggle attributes are set by specifying ON/OFF. Otherwise, these function exactly the same as their global equivalents. For more details see \fB\%tin\fP(5). .PP @@ -2486,7 +2514,7 @@ accessed by \fBConfigToggleAttrib\fP ('\ or \fBScopeSelect\fP ('\fB^J\fP' or '\fB\fP') from the scopes menu. The attributes menu looks and behaves very similar to the options menu. The title shows the current scope. Attributes set in the current scope are -marked with '\+' to the left of the attributes number. +marked with '+' to the left of the attributes number. .PP .\" .\" @@ -2643,18 +2671,18 @@ according to the default save parameters attributes set for the current group. .PP 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. +hot (auto\-selected), regular expression pattern, tagged articles you wish to +mail, pipe etc. .PP 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 -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 -News"). Any articles that match the entered expression will be mailed, piped -etc. See also the \fBwildcard\fP tinrc variable for advanced pattern matching -options. +If a regular expression pattern is selected you are asked to enter a pattern +(e.g., to match all articles subject lines containing 'net News' you enter +"net News"). Any articles that match the entered expression will be mailed, +piped etc. See also the \fBwildcard\fP tinrc variable for advanced pattern +matching options. .PP Various expansion characters are recognised when entering the directory and file to save to. Environment variables (prefixed with '$') and user home @@ -2682,7 +2710,7 @@ that expire has removed a whole load of \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 +structure under your \fBsavedir\fP 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 @@ -2728,10 +2756,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 -\fB\%rn(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 @@ -2844,23 +2872,30 @@ The information displayed with '\fB%F\fP \fBshow_author\fP. \fBGroupToggleSubjDisplay\fP resp. \fBThreadToggleSubjDisplay\fP ('\fBd\fP') switches through all available options. .PP -\(cq\fB%D\fP' uses \fBdate_format\fP for date representation. It is possible to +For date representation '\fB%D\fP' uses \fBdate_format\fP. It is possible to specify a different date format in round brackets (e.g. '\fB%(%d %b %y %H:%M)D\fP'). See \fBdate_format\fP for more details. .PP The length of each item (except '\fB%%\fP') can be defined with a positive number after the '\fB%\fP'. The following example displays the score in the -thread level 10 characters wide: '\fB%10S\fP'. 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. '\fB%6n\fP'. Here is an overview of the defaults: +thread level 10 characters wide: '\fB%10S\fP'. +.PP +If the newsgroup name is displayed together with the newsgroup description, +the width of the newsgroup name can be controlled via a optional comma +separated second value (e.g. '\fB%60,20G\fP'). It is valid to omit the first +value (e.g. ('\fB%,20G\fP')). If no second value is given, \fBtin\fP uses a +default value of 32. +.PP +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, +that is 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, e.g. '\fB%6n\fP'. Here is an overview of the defaults: .PP .in +.3i .nf -.ta \w'Variable 'u +\w'width'u +.ta \w'Variable 'u +\w'width'u Variable width \fB%I\fP 3 \fB%L\fP 4 @@ -2881,15 +2916,19 @@ May and the article to which the date is December. In such cases it might useful to determine the maximum length manually and specify the length in the format string. .PP +In case the format string contains '\fB%G\fP' and '\fB%d\fP' and no length are +given, \fBtin\fP determines the longest newsgroup name and uses this length for +\&'\fB%G\fP'. The remaining space will used for '\fB%d\fP'. +.PP When the format string contains the specifier '\fB%F\fP' and '\fB%s\fP' resp. '\fB%T\fP' and no length are given, '\fB%F\fP' will use one third and \&'\fB%s\fP' resp. '\fB%T\fP' will use two third of the available space. .PP In addition, a minimum screen width can be defined for each item (except -\(cq\fB%%\fP'). 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 '\fB>\fP'. In the +\&'\fB%%\fP'). 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 '\fB>\fP'. In the following example \fBtin\fP will display the score only if the screen is wider than 100 characters: '\fB%>100S\fP'. .PP @@ -2899,7 +2938,7 @@ If both the length and the minimum scree 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: -\(cq\fB%10>100S\fP'. +\&'\fB%10>100S\fP'. .SS "TIPS AND 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 @@ -2921,7 +2960,7 @@ Many prompts within \fBtin\fP offer a de 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 \fB\%xterm\fP(1x) it will resize itself each time the +When \fBtin\fP is run in a \fB\%xterm\fP(1x) it will resize itself each time the \fB\%xterm\fP(1x) is resized. .PP \fBtin\fP will reread the @@ -3244,7 +3283,7 @@ compiled into the \fBtin\fP binary, defa 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 +Define this variable if you want to override the \fBOVERVIEW_FILE\fP filename 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 @@ -3475,7 +3514,7 @@ The pathname of the user's login shell. \fBXDG_RUNTIME_DIR\fP .\" .\" -The pathname of the user's dir to put non\-essential runtime files into. +The pathname of the user's dir to put non\-essential run time files into. .SH SIGNALS .\" TODO: add missing, sort useful, document in detail \fBtin\fP handles a couple of signals: @@ -3487,7 +3526,7 @@ Terminate gracefully. Terminate gracefully. .TP \fBSIGUSR1\fP -Terminate gracefully but do not restore tty. +Terminate gracefully but do not restore terminal (tty). .TP \fBSIGUSR2\fP .\" @@ -3534,7 +3573,7 @@ Before mailing a bug\-report to =3 times quoted lines .TP \fBcol_response\fP -Colour of response counter. This is the text that says 'Response x of y' in +Colour of response counter. This is the text that says "Response x of y" in the article viewer. .TP \fBcol_signature\fP @@ -1328,14 +1334,14 @@ Colour of help/mail sign choices: .in +.5i .\" TODO: check if all affected commands are marked [after confirmation] -\fBcommands:\fP Ask for confirmation before executing certain dangerous +\fBcommands\fP: Ask for confirmation before executing certain dangerous 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 \fB\%tin\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 +\fBselect\fP: Ask for confirmation before marking all not selected (with \fBGroupMarkUnselArtRead\fP ('\fBX\fP') command) articles as read. .in -.5i Default is commands & quit. @@ -1357,15 +1363,15 @@ The last article/author/config option th Default is 28. .TP \fBdefault_filter_kill_case\fP -Default for quick (1 key) kill filter case. ON = filter case\-sensitive, OFF +Default for quick (1 key) kill filter case. ON = filter case\-sensitive, OFF = ignore case. Default is OFF. .TP \fBdefault_filter_kill_expire\fP -Default for quick (1 key) kill filter expire. ON = limit to -\&'\fBdefault_filter_days\fP', OFF = don't ever expire. Default is OFF. +Default for quick (1 key) kill filter expire. ON = limit to +\fBdefault_filter_days\fP, OFF = don't ever expire. Default is OFF. .TP \fBdefault_filter_kill_global\fP -Default for quick (1 key) kill filter global. ON=apply to all groups, +Default for quick (1 key) kill filter global. ON=apply to all groups, OFF=apply to current group. Default is ON. .TP \fBdefault_filter_kill_header\fP @@ -1389,8 +1395,8 @@ Default for quick (1 key) auto\-selectio case\-sensitive, OFF=ignore case. Default is OFF. .TP \fBdefault_filter_select_expire\fP -Default for quick (1 key) auto\-selection filter expire. ON = limit to -\&'\fBdefault_filter_days\fP', OFF = don't ever expire. Default is OFF. +Default for quick (1 key) auto\-selection filter expire. ON = limit to +\fBdefault_filter_days\fP, OFF = don't ever expire. Default is OFF. .TP \fBdefault_filter_select_global\fP Default for quick (1 key) auto\-selection filter global. ON=apply to all @@ -1448,13 +1454,21 @@ Default for quick (1 key) auto\-selectio .TP \fBdraw_arrow\fP Allows groups/articles to be selected by an arrow '\->' if set ON or by -an highlighted bar if set OFF. +an highlighted bar if set OFF. Default is OFF. .TP \fBeditor_format\fP 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 +\fBextquote_handling\fP +If ON quotes from external sources will be detected. Default is OFF. +.TP +\fBextquote_regex\fP +A regular expression that will be applied when reading articles. All +matching lines are shown in \fBcol_extquote\fP. If \fBextquote_regex\fP is blank, +then \fBtin\fP uses a built\-in default. +.TP \fBforce_screen_redraw\fP Specifies whether a screen redraw should always be done after certain external commands. Default is OFF. @@ -1495,10 +1509,6 @@ The format string used for the Group lev .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. -.TP \fBhide_uue\fP 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 @@ -1516,8 +1526,8 @@ article'. .TP \fBinfo_in_last_line\fP If ON, show current group description or article subject in the last line -(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP' toggles -setting). This facility is useful as the full width of the screen is +(not in the pager and global menu) \- \fBToggleInfoLastLine\fP ('\fBi\fP') toggles +setting. This facility is useful as the full width of the screen is available to display long subjects. Default is OFF. .TP \fBinteractive_mailer\fP @@ -1584,7 +1594,7 @@ details on MBOXO and MBOXRD and \fB\%mmd 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. +\&'=' 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 @@ -1602,7 +1612,7 @@ claws\-mail \-\-compose "mailto:%T?subje supported: .in +.3i .nf -.ta \w'%S'u +\w'subject\-field'u +.ta \w'%S'u +\w'default_mailer'u %F filename %M default_mailer %S subject\-field @@ -1634,7 +1644,7 @@ any attachments. See also \fBask_for_met \fBmm_charset\fP Charset supported locally, which is also used for MIME header (charset parameter and charset name in header encoding) in mail and news postings. If -\fBMIME_STRICT_CHARSET\fP is defined at the compile time, text in charset other +\fBMIME_STRICT_CHARSET\fP is defined at compile time, text in charset other than the value of this parameter is considered not displayable and represented as '?'. Otherwise, all character sets are regarded as compatible with the display. If it's not set, the value of the environment variable @@ -1647,7 +1657,7 @@ Charset used for posting and MIME header Conversion between \fBmm_network_charset\fP and local charset (determined via \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 +\fBmm_charset\fP instead. \fBmm_network_charset\fP is limited to one of the following charsets: .in +.3i US\-ASCII, ISO\-8859\-{1,2,3,4,5,7,9,10,13,14,15,16}, KOI8\-{R,U,RU} @@ -1659,22 +1669,22 @@ $\fBMM_CHARSET\fP is used. US\-ASCII or neither of them is defined. .TP \fBmono_markdash\fP -Character attribute of words emphasised like _this_. It is depending on your +Character attribute of words emphasised like _this_. It depends on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP \fBmono_markslash\fP -Character attribute of words emphasised like /this/. It is depending on your +Character attribute of words emphasised like /this/. It depends on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP \fBmono_markstar\fP -Character attribute of words emphasised like *this*. It is depending on your +Character attribute of words emphasised like *this*. It depends on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP \fBmono_markstroke\fP -Character attribute of words emphasised like \-this\-. It is depending on your +Character attribute of words emphasised like \-this\-. It depends on your terminal which attributes are usable. See also \fBword_h_display_marks\fP and \fBword_highlight\fP. .TP @@ -1684,7 +1694,7 @@ newsgroups. Do not change them unless yo .TP \fBnews_headers_to_display\fP 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 +place an '*' as this value. This is the only way a wildcard can be used. If you enter 'X\-' as the value, you will see all headers beginning with 'X\-' (like X\-Alan or X\-Pape). You can list more than one by delimiting with spaces. Not defining anything turns off this option. @@ -1726,7 +1736,7 @@ possible. .TP \fBpos_first_unread\fP If ON put cursor at first unread article in group otherwise at last -article. Default is ON. +article. Default is ON. .TP \fBpost_8bit_header\fP Allows 8bit characters unencoded in the header of a news article, if set @@ -1746,7 +1756,7 @@ base64 and quoted\-printable are usually \fBpost_process_view\fP 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 \fB\%mailcap\fP(5) 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. @@ -1863,10 +1873,10 @@ Score of an article which should be mark \fBscroll_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 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. This setting -supersedes show_last_line_prev_page=ON. Set to \-2 to get half\-page -scrolling. This setting supersedes full_page_scroll=OFF. +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. +This setting supersedes show_last_line_prev_page=ON. Set to \-2 to get +half\-page scrolling. This setting supersedes \fBfull_page_scroll\fP=OFF. .TP \fBselect_format\fP The format string used for the Selection level. Default is "%f\ %n\ %U\ \ %G\ \ %d". The following substitutions are supported: @@ -1925,7 +1935,7 @@ show only the line count. \fBNone\fP, no information will be displayed. .IP 1 \fBLines\fP, 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 +and in thread listing the line count of first (unread) article will be displayed. .IP 2 \fBScore\fP, in article listing the score of an article will be displayed and @@ -1936,7 +1946,7 @@ in thread listing the score of the threa .RE .TP \fBshow_only_unread_arts\fP -If ON show only new/unread articles otherwise show all articles. Default is +If ON show only new/unread articles otherwise show all articles. Default is ON. .TP \fBshow_only_unread_groups\fP @@ -2015,7 +2025,9 @@ ascending. \fBspamtrap_warning_addresses\fP 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. +these strings. The matching is case\-insensitive. Example: +.sp +\fIspam,delete,remove\fP .TP \fBstars_regex\fP A regular expression that will be applied when reading articles. All @@ -2163,8 +2175,8 @@ enabled/disabled. Default is OFF. \fBuse_slrnface\fP 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. +a \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 @@ -2184,10 +2196,11 @@ If ON verbatim blocks will be detected. \fBwildcard\fP 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 \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. +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 \fBword_h_display_marks\fP Should the leading and ending stars, slashes, strokes and dashes also be @@ -2207,7 +2220,7 @@ available. If \fBuse_color\fP is enabled \fBcol_markdash\fP, \fBcol_markslash\fP, \fBcol_markstar\fP and \fBcol_markstroke\fP are used for word highlighting else the character attributes specified in \fBmono_markdash\fP, \fBmono_markslash\fP, \fBmono_markstar\fP and \fBmono_markstroke\fP -are used. +are used. Default is ON. .TP \fBwrap_column\fP Sets the column at which a displayed article body should be wrapped. If @@ -2243,7 +2256,7 @@ built\-in default) the \fInewslibdir\fP. Sets a global domain name used in From lines .TP \fBorganization\fP -Defines the name of your organization. $\fBORGANIZATION\fP overrides any +Defines the name of your organisation. $\fBORGANIZATION\fP overrides any specified value. .TP \fBnewslibdir\fP @@ -2407,7 +2420,7 @@ is the name of the newsgroup .TP \fBtime\fP is the time when the group was created, expressed as the number of seconds -since the epoch. +since the Epoch. .TP \fBcreator\fP is the electronic mail address of the person who created the group. @@ -2443,7 +2456,7 @@ command instead. \fI${TIN_LIBDIR:\-NEWSLIBDIR}/organization\fP .sp .RS -This file specifies might hold a default organization to be used in the +This file might hold a default organisation to be used in the \&\*(rqOrganization:\*(rq header. $\fBORGANIZATION\fP has a higher priority if set. .RE .PP @@ -2452,7 +2465,7 @@ This file specifies might hold a default \fI${TIN_LIBDIR:\-NEWSLIBDIR}/overview.fmt\fP .sp .RS -This file specifies the organization of the news overview database (see also +This file specifies the organisation of the news overview database (see also \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 \fB\%overview.fmt\fP(5). \fB\%tin\fP(1) only tries to read the file if you @@ -2475,12 +2488,12 @@ the LIST SUBSCRIPTIONS (\fBRFC\%6048\fP) .SH "SEE ALSO" \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 +\fB\%metamail\fP(1), \fB\%perl\fP(1), \fB\%perlre\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\%pcrepattern\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.3.1/doc/l10n/en_GB.po tin-2.3.2/doc/l10n/en_GB.po --- tin-2.3.1/doc/l10n/en_GB.po 2014-12-24 09:37:25.000000000 +0100 +++ tin-2.3.2/doc/l10n/en_GB.po 2015-12-22 11:26:46.683209007 +0100 @@ -1,13 +1,13 @@ -# English (United Kingdom) translations for the tin manpages. +# English (United Kingdom) translations for the tin man pages. # This file is distributed under the same license as the tin package. -# Urs Janssen , 2011-2014. +# Urs Janssen , 2011-2016. # msgid "" msgstr "" "Project-Id-Version: tin-man 2.3.0\n" "Report-Msgid-Bugs-To: translation@tin.org\n" -"POT-Creation-Date: 2014-12-24 09:36+0100\n" -"PO-Revision-Date: 2013-11-28 22:55+0100\n" +"POT-Creation-Date: 2015-12-22 11:26+0100\n" +"PO-Revision-Date: 2015-12-01 15:50+0100\n" "Last-Translator: Urs Janssen \n" "Language-Team: LANGUAGE \n" "Language: en_GB\n" @@ -24,14 +24,14 @@ msgstr "tin" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "December 24th, 2014" -msgstr "December 24th, 2014" +msgid "December 24th, 2015" +msgstr "December 24th, 2015" #. type: TH #: doc/tin.1:12 doc/tin.5:9 #, no-wrap -msgid "2.3.1" -msgstr "2.3.1" +msgid "2.3.2" +msgstr "2.3.2" #. type: TH #: doc/tin.1:12 doc/tin.5:9 @@ -149,7 +149,7 @@ msgid "Interactive mode:" msgstr "Interactive mode:" #. type: TP -#: doc/tin.1:80 doc/tin.1:90 doc/tin.1:1080 doc/tin.1:3409 +#: doc/tin.1:80 doc/tin.1:90 doc/tin.1:1083 doc/tin.1:3448 #, no-wrap msgid "B<0>" msgstr "B<0>" @@ -160,7 +160,7 @@ msgid "Successful program execution." msgstr "Successful program execution." #. type: TP -#: doc/tin.1:83 doc/tin.1:93 doc/tin.1:3412 +#: doc/tin.1:83 doc/tin.1:93 doc/tin.1:3451 #, no-wrap msgid "B<1>" msgstr "B<1>" @@ -181,7 +181,7 @@ msgid "No unread news" msgstr "No unread news" #. type: TP -#: doc/tin.1:96 doc/tin.1:3415 +#: doc/tin.1:96 doc/tin.1:3454 #, no-wrap msgid "B<2>" msgstr "B<2>" @@ -1005,9 +1005,13 @@ msgid "" "(B). I.e.:" msgstr "" "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.:" #. FIXME - make this autocenter #. type: Plain text @@ -1183,48 +1187,48 @@ msgid "COMMON EDITING COMMANDS" msgstr "COMMON EDITING COMMANDS" #. type: Plain text -#: doc/tin.1:450 +#: doc/tin.1:452 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 " -"addition to the cursor keys, the following commands are available when " -"editing a string:" +"An B<\\%emacs>(1) style editing package allows the easy editing of input " +"strings. A history list allows the easy reuse of previously entered " +"strings. In addition to the cursor keys, the following commands are " +"available when editing a string:" msgstr "" -"An emacs style editing package allows the easy editing of input strings. An " -"history list allows the easy reuse of previously entered strings. In " -"addition to the cursor keys, the following commands are available when " -"editing a string:" +"An B<\\%emacs>(1) style editing package allows the easy editing of input " +"strings. A history list allows the easy reuse of previously entered " +"strings. In addition to the cursor keys, the following commands are " +"available when editing a string:" #. type: TP -#: doc/tin.1:451 +#: doc/tin.1:453 #, no-wrap msgid "B<^A, ^E>" msgstr "B<^A, ^E>" #. type: Plain text -#: doc/tin.1:454 +#: doc/tin.1:456 msgid "move to beginning or end of line, respectively." msgstr "move to beginning or end of line, respectively." #. type: TP -#: doc/tin.1:454 +#: doc/tin.1:456 #, no-wrap msgid "B<^F, ^B>" msgstr "B<^F, ^B>" #. type: Plain text -#: doc/tin.1:457 +#: doc/tin.1:459 msgid "non-destructive move forward or back one location, respectively." msgstr "non-destructive move forward or back one location, respectively." #. type: TP -#: doc/tin.1:457 +#: doc/tin.1:459 #, no-wrap msgid "B<^D>" msgstr "B<^D>" #. type: Plain text -#: doc/tin.1:461 +#: doc/tin.1:463 msgid "" "delete the character currently under the cursor, or send EOF if no " "characters in the buffer." @@ -1233,57 +1237,57 @@ msgstr "" "characters in the buffer." #. type: TP -#: doc/tin.1:461 +#: doc/tin.1:463 #, no-wrap msgid "B<^H, EDELE>" msgstr "B<^H, EDELE>" #. type: Plain text -#: doc/tin.1:464 +#: doc/tin.1:466 msgid "delete character left of the cursor." msgstr "delete character left of the cursor." #. type: TP -#: doc/tin.1:464 +#: doc/tin.1:466 #, no-wrap msgid "B<^K>" msgstr "B<^K>" #. type: Plain text -#: doc/tin.1:467 +#: doc/tin.1:469 msgid "delete from cursor to end of line." msgstr "delete from cursor to end of line." #. type: TP -#: doc/tin.1:467 +#: doc/tin.1:469 #, no-wrap msgid "B<^P, ^N>" msgstr "B<^P, ^N>" #. type: Plain text -#: doc/tin.1:470 +#: doc/tin.1:472 msgid "move through history, previous and next, respectively." msgstr "move through history, previous and next, respectively." #. type: TP -#: doc/tin.1:470 +#: doc/tin.1:472 #, no-wrap msgid "B<^L, ^R>" msgstr "B<^L, ^R>" #. type: Plain text -#: doc/tin.1:473 +#: doc/tin.1:475 msgid "redraw the current line." msgstr "redraw the current line." #. type: TP -#: doc/tin.1:473 +#: doc/tin.1:475 #, no-wrap msgid "BCRE>" msgstr "BCRE>" #. type: Plain text -#: doc/tin.1:477 +#: doc/tin.1:479 msgid "" "places line on history list if non-blank, appends newline and returns to the " "caller." @@ -1292,24 +1296,24 @@ msgstr "" "caller." #. type: TP -#: doc/tin.1:477 +#: doc/tin.1:479 #, no-wrap msgid "BESCE>" msgstr "BESCE>" #. type: Plain text -#: doc/tin.1:482 +#: doc/tin.1:484 msgid "aborts the present editing operation." msgstr "aborts the present editing operation." #. type: SS -#: doc/tin.1:482 +#: doc/tin.1:484 #, no-wrap msgid "GLOBAL COMMANDS" msgstr "GLOBAL COMMANDS" #. type: Plain text -#: doc/tin.1:485 +#: doc/tin.1:487 msgid "" "The following commands are available at all 4 menu levels and always have " "the same effect." @@ -1318,13 +1322,13 @@ msgstr "" "the same effect." #. type: TP -#: doc/tin.1:486 doc/tin.1:1352 doc/tin.1:1405 +#: doc/tin.1:488 doc/tin.1:1355 doc/tin.1:1408 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:491 +#: doc/tin.1:493 msgid "" "Shell escape. B by itself will launch a shell, B " "EcommandE will run an external EcommandE. This facility may " @@ -1335,57 +1339,57 @@ msgstr "" "have been disabled by the System Administrator." #. type: TP -#: doc/tin.1:491 +#: doc/tin.1:493 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:494 +#: doc/tin.1:496 msgid "Toggle use of ANSI color." msgstr "Toggle use of ANSI colour." #. type: TP -#: doc/tin.1:494 +#: doc/tin.1:496 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:497 +#: doc/tin.1:499 msgid "Redraw the current screen." msgstr "Redraw the current screen." #. type: TP -#: doc/tin.1:497 +#: doc/tin.1:499 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:500 +#: doc/tin.1:502 msgid "Scroll screen up by one line." msgstr "Scroll screen up by one line." #. type: TP -#: doc/tin.1:500 +#: doc/tin.1:502 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:503 +#: doc/tin.1:505 msgid "Scroll screen down by one line." msgstr "Scroll screen down by one line." #. type: TP -#: doc/tin.1:503 +#: doc/tin.1:505 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:517 +#: doc/tin.1:519 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 " @@ -1412,13 +1416,13 @@ msgstr "" "('B<^O>''B''B'). See also ''B<-o>'' command-line switch." #. type: TP -#: doc/tin.1:517 doc/tin.1:1358 doc/tin.1:1412 +#: doc/tin.1:519 doc/tin.1:1361 doc/tin.1:1415 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:523 +#: doc/tin.1:525 msgid "" "Help screen of commands available on the current menu. You can use " "B ('B'), B ('B') and B ('B<" @@ -1429,24 +1433,24 @@ msgstr "" "\\e>') to search on this screen. B ('B') returns to the menu." #. type: TP -#: doc/tin.1:523 doc/tin.1:1361 doc/tin.1:1415 +#: doc/tin.1:525 doc/tin.1:1364 doc/tin.1:1418 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:526 doc/tin.1:1364 doc/tin.1:1418 +#: doc/tin.1:528 doc/tin.1:1367 doc/tin.1:1421 msgid "Toggle the display of help mini menu at the bottom of the screen." msgstr "Toggle the display of help mini menu at the bottom of the screen." #. type: TP -#: doc/tin.1:526 +#: doc/tin.1:528 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:532 +#: doc/tin.1:534 msgid "" "List articles posted by user. The date posted, the newsgroup and the subject " "are listed. You can use B ('B'), B ('B') and " @@ -1459,42 +1463,42 @@ msgstr "" "returns to the menu." #. type: TP -#: doc/tin.1:532 +#: doc/tin.1:534 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:537 +#: doc/tin.1:539 msgid "Print B version information." msgstr "Print B version information." #. type: SS -#: doc/tin.1:537 +#: doc/tin.1:539 #, no-wrap msgid "NEWSGROUP SELECTION COMMANDS" msgstr "NEWSGROUP SELECTION COMMANDS" #. type: TP -#: doc/tin.1:538 doc/tin.1:669 doc/tin.1:919 doc/tin.1:1083 doc/tin.1:3421 +#: doc/tin.1:540 doc/tin.1:671 doc/tin.1:922 doc/tin.1:1086 doc/tin.1:3460 #, no-wrap msgid "B<4>" msgstr "B<4>" #. type: Plain text -#: doc/tin.1:541 +#: doc/tin.1:543 msgid "Select group 4." msgstr "Select group 4." #. type: TP -#: doc/tin.1:541 +#: doc/tin.1:543 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:545 +#: doc/tin.1:547 msgid "" "Reset I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. This will destroy all " "records of which articles have been read, so use this carefully." @@ -1503,13 +1507,13 @@ msgstr "" "records of which articles have been read, so use this carefully." #. type: TP -#: doc/tin.1:545 doc/tin.1:690 doc/tin.1:940 +#: doc/tin.1:547 doc/tin.1:692 doc/tin.1:943 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:549 doc/tin.1:694 doc/tin.1:944 +#: doc/tin.1:551 doc/tin.1:696 doc/tin.1:947 msgid "" "Choose a range of articles to be affected by the next command. See the " "section \"RANGES\" for more information." @@ -1518,71 +1522,71 @@ msgstr "" "section \"RANGES\" for more information." #. type: TP -#: doc/tin.1:549 +#: doc/tin.1:551 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:552 +#: doc/tin.1:554 msgid "Sort the list of newsgroups." msgstr "Sort the list of newsgroups." #. 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 +#: doc/tin.1:554 doc/tin.1:699 doc/tin.1:950 doc/tin.1:1140 doc/tin.1:1352 +#: doc/tin.1:1402 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:555 doc/tin.1:950 doc/tin.1:1140 doc/tin.1:1352 doc/tin.1:1402 +#: doc/tin.1:557 doc/tin.1:953 doc/tin.1:1143 doc/tin.1:1355 doc/tin.1:1405 msgid "Repeat the previous search." msgstr "Repeat the previous search." #. 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 +#: doc/tin.1:557 doc/tin.1:702 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 -#: doc/tin.1:558 +#: doc/tin.1:560 msgid "Search for a group by name and description (if displayed)." msgstr "Search for a group by name and description (if displayed)." #. 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 +#: doc/tin.1:560 doc/tin.1:705 doc/tin.1:956 doc/tin.1:1146 doc/tin.1:1349 +#: doc/tin.1:1399 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:561 +#: doc/tin.1:563 msgid "Backward search through the group names and descriptions." msgstr "Backward search through the group names and descriptions." #. type: TP -#: doc/tin.1:561 +#: doc/tin.1:563 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:564 +#: doc/tin.1:566 msgid "Read current group." msgstr "Read current group." #. type: TP -#: doc/tin.1:564 +#: doc/tin.1:566 #, no-wrap msgid "BTABE' 'n'>" msgstr "BTABE' 'n'>" #. type: Plain text -#: doc/tin.1:568 +#: doc/tin.1:570 msgid "" "Enter next group with unread news. Will wrap around to the beginning of the " "group selection list looking for unread groups." @@ -1591,13 +1595,13 @@ msgstr "" "group selection list looking for unread groups." #. type: TP -#: doc/tin.1:568 doc/tin.1:778 doc/tin.1:991 doc/tin.1:1201 +#: doc/tin.1:570 doc/tin.1:780 doc/tin.1:994 doc/tin.1:1204 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:572 +#: doc/tin.1:574 msgid "" "Make current group as all read [after confirmation] and move to the next " "group in the group selection list." @@ -1606,13 +1610,13 @@ msgstr "" "group in the group selection list." #. type: TP -#: doc/tin.1:572 doc/tin.1:782 doc/tin.1:995 doc/tin.1:1205 +#: doc/tin.1:574 doc/tin.1:784 doc/tin.1:998 doc/tin.1:1208 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:576 +#: doc/tin.1:578 msgid "" "Mark current group as all read [after confirmation] and enter the next " "unread group in the group selection list." @@ -1621,13 +1625,13 @@ msgstr "" "unread group in the group selection list." #. type: TP -#: doc/tin.1:576 +#: doc/tin.1:578 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:580 +#: doc/tin.1:582 msgid "" "Toggle display to show just the group name or the group name and the group " "descriptions." @@ -1636,24 +1640,24 @@ msgstr "" "descriptions." #. type: TP -#: doc/tin.1:580 doc/tin.1:795 doc/tin.1:1008 doc/tin.1:1217 +#: doc/tin.1:582 doc/tin.1:797 doc/tin.1:1011 doc/tin.1:1220 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:583 doc/tin.1:798 doc/tin.1:1011 doc/tin.1:1220 +#: doc/tin.1:585 doc/tin.1:800 doc/tin.1:1014 doc/tin.1:1223 msgid "Edit the filter file and reload it afterwards." msgstr "Edit the filter file and reload it afterwards." #. type: TP -#: doc/tin.1:583 +#: doc/tin.1:585 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:587 doc/tin.1:802 +#: doc/tin.1:589 doc/tin.1:804 msgid "" "Choose a new group by name. This command can be used to access any group, " "even those not currently yanked in." @@ -1662,14 +1666,14 @@ msgstr "" "even those not currently yanked in." #. 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 +#: doc/tin.1:589 doc/tin.1:807 doc/tin.1:1014 doc/tin.1:1236 doc/tin.1:1358 +#: doc/tin.1:1411 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:592 +#: doc/tin.1:594 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>'' " @@ -1680,24 +1684,24 @@ msgstr "" "option." #. type: TP -#: doc/tin.1:592 doc/tin.1:809 doc/tin.1:1014 doc/tin.1:1236 +#: doc/tin.1:594 doc/tin.1:811 doc/tin.1:1017 doc/tin.1:1239 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:595 doc/tin.1:812 doc/tin.1:1017 doc/tin.1:1239 +#: doc/tin.1:597 doc/tin.1:814 doc/tin.1:1020 doc/tin.1:1242 msgid "Toggle inverse video." msgstr "Toggle inverse video." #. type: TP -#: doc/tin.1:595 +#: doc/tin.1:597 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:601 +#: doc/tin.1:603 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 " @@ -1710,13 +1714,13 @@ msgstr "" "group displayed." #. type: TP -#: doc/tin.1:601 doc/tin.1:829 doc/tin.1:1253 +#: doc/tin.1:603 doc/tin.1:831 doc/tin.1:1256 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:605 doc/tin.1:833 doc/tin.1:1257 +#: doc/tin.1:607 doc/tin.1:835 doc/tin.1:1260 msgid "" "User configurable options menu (for more information see section \"GLOBAL " "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." @@ -1725,24 +1729,24 @@ msgstr "" "OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES\")." #. type: TP -#: doc/tin.1:605 +#: doc/tin.1:607 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:608 +#: doc/tin.1:610 msgid "Positions the cursor on the next group with unread articles in it." msgstr "Positions the cursor on the next group with unread articles in it." #. type: TP -#: doc/tin.1:608 doc/tin.1:850 doc/tin.1:1036 doc/tin.1:1274 +#: doc/tin.1:610 doc/tin.1:852 doc/tin.1:1039 doc/tin.1:1277 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:612 +#: doc/tin.1:614 msgid "" "Quit B - ask the user to confirm if B is set " "accordingly." @@ -1751,24 +1755,24 @@ msgstr "" "accordingly." #. type: TP -#: doc/tin.1:612 doc/tin.1:853 doc/tin.1:1039 doc/tin.1:1277 +#: doc/tin.1:614 doc/tin.1:855 doc/tin.1:1042 doc/tin.1:1280 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:615 doc/tin.1:856 doc/tin.1:1042 doc/tin.1:1280 +#: doc/tin.1:617 doc/tin.1:858 doc/tin.1:1045 doc/tin.1:1283 msgid "Quit B - don't ask the user to confirm." msgstr "Quit B - don't ask the user to confirm." #. type: TP -#: doc/tin.1:615 +#: doc/tin.1:617 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:620 +#: doc/tin.1:622 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 " @@ -1779,13 +1783,13 @@ msgstr "" "command-line when B was started." #. type: TP -#: doc/tin.1:620 doc/tin.1:859 doc/tin.1:1042 +#: doc/tin.1:622 doc/tin.1:861 doc/tin.1:1045 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:624 doc/tin.1:863 doc/tin.1:1046 +#: doc/tin.1:626 doc/tin.1:865 doc/tin.1:1049 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." @@ -1794,24 +1798,24 @@ msgstr "" "way of getting bugs fixed and features added/changed." #. type: TP -#: doc/tin.1:624 +#: doc/tin.1:626 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:627 +#: doc/tin.1:629 msgid "Subscribe to current group." msgstr "Subscribe to current group." #. type: TP -#: doc/tin.1:627 +#: doc/tin.1:629 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:632 +#: doc/tin.1:634 msgid "" "Subscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1822,13 +1826,13 @@ msgstr "" "understands." #. type: TP -#: doc/tin.1:632 +#: doc/tin.1:634 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:637 +#: doc/tin.1:639 msgid "" "Unsubscribe to current group. This can be used to remove bogus groups. See " "B in the \"GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" @@ -1839,13 +1843,13 @@ msgstr "" "\" section." #. type: TP -#: doc/tin.1:637 +#: doc/tin.1:639 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:642 +#: doc/tin.1:644 msgid "" "Unsubscribe to groups matching user specified pattern. See the section " "\"NEWSGROUP LISTS & WILDCARDS\" for the types of pattern that B " @@ -1856,13 +1860,13 @@ msgstr "" "understands." #. type: TP -#: doc/tin.1:642 doc/tin.1:887 doc/tin.1:1061 doc/tin.1:1314 +#: doc/tin.1:644 doc/tin.1:889 doc/tin.1:1064 doc/tin.1:1317 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:648 +#: doc/tin.1:650 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 " @@ -1875,24 +1879,24 @@ msgstr "" "discard it via B ('B')." #. type: TP -#: doc/tin.1:648 +#: doc/tin.1:650 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:651 +#: doc/tin.1:653 msgid "Quit B without saving any changes to the configuration." msgstr "Quit B without saving any changes to the configuration." #. type: TP -#: doc/tin.1:651 +#: doc/tin.1:653 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:656 +#: doc/tin.1:658 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 " @@ -1903,13 +1907,13 @@ msgstr "" "those that are subscribed to in I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>." #. type: TP -#: doc/tin.1:656 +#: doc/tin.1:658 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:660 +#: doc/tin.1:662 msgid "" "Reread the I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file " "to see if any new news has arrived since starting B." @@ -1918,25 +1922,25 @@ msgstr "" "to see if any new news has arrived since starting B." #. type: TP -#: doc/tin.1:660 +#: doc/tin.1:662 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:665 +#: doc/tin.1:667 msgid "Mark all articles in the current group as unread." msgstr "Mark all articles in the current group as unread." #. type: SS -#: doc/tin.1:665 +#: doc/tin.1:667 #, no-wrap msgid "GROUP INDEX COMMANDS" msgstr "GROUP INDEX COMMANDS" #. type: Plain text -#: doc/tin.1:669 +#: doc/tin.1:671 msgid "" "All searches in this level are limited to unread articles if in " "B mode. B ('B') can be use " @@ -1947,18 +1951,18 @@ msgstr "" "toggle the setting right before/after the search." #. type: Plain text -#: doc/tin.1:672 +#: doc/tin.1:674 msgid "Select article 4." msgstr "Select article 4." #. type: TP -#: doc/tin.1:672 doc/tin.1:922 doc/tin.1:1086 +#: doc/tin.1:674 doc/tin.1:925 doc/tin.1:1089 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:676 doc/tin.1:926 doc/tin.1:1090 +#: doc/tin.1:678 doc/tin.1:929 doc/tin.1:1093 msgid "" "Auto select article(s) using a menu. Read the section \"FILTERING ARTICLES\" " "for more information." @@ -1967,13 +1971,13 @@ msgstr "" "for more information." #. type: TP -#: doc/tin.1:676 doc/tin.1:926 doc/tin.1:1102 +#: doc/tin.1:678 doc/tin.1:929 doc/tin.1:1105 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:680 doc/tin.1:930 doc/tin.1:1106 +#: doc/tin.1:682 doc/tin.1:933 doc/tin.1:1109 msgid "" "Kill article(s) using a menu. Read the section \"FILTERING ARTICLES\" for " "more information." @@ -1982,13 +1986,13 @@ msgstr "" "more information." #. type: TP -#: doc/tin.1:680 doc/tin.1:930 +#: doc/tin.1:682 doc/tin.1:933 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:685 doc/tin.1:935 +#: doc/tin.1:687 doc/tin.1:938 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as read. A prompt asks which type should " @@ -1999,13 +2003,13 @@ msgstr "" "be marked." #. type: TP -#: doc/tin.1:685 doc/tin.1:935 +#: doc/tin.1:687 doc/tin.1:938 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:690 doc/tin.1:940 +#: doc/tin.1:692 doc/tin.1:943 msgid "" "Mark current article, thread, range, auto-selected (hot) articles, articles " "matching pattern or tagged articles as unread. A prompt asks which type " @@ -2016,50 +2020,50 @@ msgstr "" "should be marked." #. type: TP -#: doc/tin.1:694 doc/tin.1:944 doc/tin.1:1134 +#: doc/tin.1:696 doc/tin.1:947 doc/tin.1:1137 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:697 doc/tin.1:947 doc/tin.1:1137 +#: doc/tin.1:699 doc/tin.1:950 doc/tin.1:1140 msgid "Re-enter the last message that was viewed." msgstr "Re-enter the last message that was viewed." #. type: Plain text -#: doc/tin.1:700 +#: doc/tin.1:702 msgid "Repeat the previous search" msgstr "Repeat the previous search" #. type: Plain text -#: doc/tin.1:703 +#: doc/tin.1:705 doc/tin.1:956 msgid "Search forward for specified subject." msgstr "Search forward for specified subject." #. type: Plain text -#: doc/tin.1:706 -msgid "Search backward for specified subject." -msgstr "Search backward for specified subject." +#: doc/tin.1:708 doc/tin.1:959 +msgid "Search backwards for specified subject." +msgstr "Search backwards for specified subject." #. type: TP -#: doc/tin.1:706 +#: doc/tin.1:708 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:709 +#: doc/tin.1:711 doc/tin.1:962 msgid "Select current thread for later processing." msgstr "Select current thread for later processing." #. type: TP -#: doc/tin.1:709 +#: doc/tin.1:711 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:713 +#: doc/tin.1:715 msgid "" "Selects all threads in current group. It is a shortcut for calling " "B with a pattern of ''*''." @@ -2068,13 +2072,13 @@ msgstr "" "B with a pattern of ''*''." #. type: TP -#: doc/tin.1:713 +#: doc/tin.1:715 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:718 +#: doc/tin.1:720 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 " @@ -2085,13 +2089,13 @@ msgstr "" "articles become selected." #. type: TP -#: doc/tin.1:718 +#: doc/tin.1:720 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:723 +#: doc/tin.1:725 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-" @@ -2102,13 +2106,13 @@ msgstr "" "selection on author where reader wants to see entire thread." #. type: TP -#: doc/tin.1:723 +#: doc/tin.1:725 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:729 +#: doc/tin.1:731 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 " @@ -2121,24 +2125,24 @@ msgstr "" "was entered." #. type: TP -#: doc/tin.1:729 +#: doc/tin.1:731 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:732 +#: doc/tin.1:734 msgid "Reverse all selections on all articles." msgstr "Reverse all selections on all articles." #. type: TP -#: doc/tin.1:732 +#: doc/tin.1:734 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:738 +#: doc/tin.1:740 msgid "" "Undo all selections on all articles. It clears the toggle effect of " "B ('B') command. Thus after first doing a " @@ -2151,13 +2155,13 @@ msgstr "" "Thus, one can iteratively whittle down uninteresting threads." #. type: TP -#: doc/tin.1:738 doc/tin.1:968 doc/tin.1:1160 +#: doc/tin.1:740 doc/tin.1:971 doc/tin.1:1163 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:743 doc/tin.1:973 doc/tin.1:1165 +#: doc/tin.1:745 doc/tin.1:976 doc/tin.1:1168 msgid "" "Pipe current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles into command. See the section \"MAILING " @@ -2168,13 +2172,13 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:743 doc/tin.1:1165 +#: doc/tin.1:745 doc/tin.1:1168 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:752 +#: doc/tin.1:754 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: " @@ -2193,13 +2197,13 @@ msgstr "" "information on filtering." #. type: TP -#: doc/tin.1:752 doc/tin.1:1174 +#: doc/tin.1:754 doc/tin.1:1177 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:761 +#: doc/tin.1:763 msgid "" "Kill article(s) with a single key [after confirmation]. The defaults used " "for killing are based upon the following four tinrc config variables: " @@ -2218,35 +2222,35 @@ msgstr "" "information on filtering." #. type: TP -#: doc/tin.1:761 +#: doc/tin.1:763 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:764 +#: doc/tin.1:766 msgid "Read current article." msgstr "Read current article." #. type: TP -#: doc/tin.1:764 +#: doc/tin.1:766 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:767 +#: doc/tin.1:769 msgid "View next unread article or group." msgstr "View next unread article or group." #. type: TP -#: doc/tin.1:767 doc/tin.1:979 doc/tin.1:1191 +#: doc/tin.1:769 doc/tin.1:982 doc/tin.1:1194 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:771 +#: doc/tin.1:773 msgid "" "Author forward search. This searches for articles with a specific ''From:'' " "line." @@ -2255,24 +2259,24 @@ msgstr "" "line." #. type: TP -#: doc/tin.1:771 doc/tin.1:984 doc/tin.1:1194 +#: doc/tin.1:773 doc/tin.1:987 doc/tin.1:1197 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:774 doc/tin.1:987 +#: doc/tin.1:776 doc/tin.1:990 msgid "Author backward search. Otherwise, see B ('B') above." msgstr "Author backward search. Otherwise, see B ('B') above." #. type: TP -#: doc/tin.1:774 doc/tin.1:987 doc/tin.1:1197 +#: doc/tin.1:776 doc/tin.1:990 doc/tin.1:1200 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:778 doc/tin.1:991 doc/tin.1:1201 +#: doc/tin.1:780 doc/tin.1:994 doc/tin.1:1204 msgid "" "Search the body of all articles in group (can be slow). You can abort the " "search using B ('B')." @@ -2281,7 +2285,7 @@ msgstr "" "search using B ('B')." #. type: Plain text -#: doc/tin.1:782 +#: doc/tin.1:784 msgid "" "Mark all articles as read [after confirmation] then return to the group " "selection list. Move cursor to next group." @@ -2290,7 +2294,7 @@ msgstr "" "selection list. Move cursor to next group." #. type: Plain text -#: doc/tin.1:786 +#: doc/tin.1:788 msgid "" "Mark all articles as read [after confirmation] and enter the next group with " "unread news." @@ -2299,13 +2303,13 @@ msgstr "" "unread news." #. type: TP -#: doc/tin.1:786 +#: doc/tin.1:788 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:790 doc/tin.1:1003 +#: doc/tin.1:792 doc/tin.1:1006 msgid "" "Cycle the display of the author through all the possible options for the " "tinrc variable B." @@ -2314,13 +2318,13 @@ msgstr "" "tinrc variable B." #. type: TP -#: doc/tin.1:790 +#: doc/tin.1:792 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:795 doc/tin.1:1008 doc/tin.1:1214 +#: doc/tin.1:797 doc/tin.1:1011 doc/tin.1:1217 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 " @@ -2331,24 +2335,24 @@ msgstr "" "newsgroup 'control' or 'control.cancel'." #. type: TP -#: doc/tin.1:798 +#: doc/tin.1:800 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:802 +#: doc/tin.1:804 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:805 +#: doc/tin.1:807 msgid "Toggle article/group limit." msgstr "Toggle article/group limit." #. type: Plain text -#: doc/tin.1:809 +#: doc/tin.1:811 msgid "" "Display the subject of the first article in the current thread in the last " "line." @@ -2357,13 +2361,13 @@ msgstr "" "line." #. type: TP -#: doc/tin.1:812 +#: doc/tin.1:814 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:818 +#: doc/tin.1:820 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 " @@ -2376,35 +2380,35 @@ msgstr "" "prompt asks how to proceed." #. type: TP -#: doc/tin.1:818 +#: doc/tin.1:820 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:821 +#: doc/tin.1:823 msgid "Open the thread under the current cursor position." msgstr "Open the thread under the current cursor position." #. type: TP -#: doc/tin.1:821 doc/tin.1:1023 doc/tin.1:1245 +#: doc/tin.1:823 doc/tin.1:1026 doc/tin.1:1248 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:824 doc/tin.1:1026 doc/tin.1:1248 +#: doc/tin.1:826 doc/tin.1:1029 doc/tin.1:1251 msgid "Look up article by ''Message-ID:''." msgstr "Look up article by ''Message-ID:''." #. type: TP -#: doc/tin.1:824 +#: doc/tin.1:826 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:829 doc/tin.1:1031 doc/tin.1:1253 +#: doc/tin.1:831 doc/tin.1:1034 doc/tin.1:1256 msgid "" "Mail current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to someone. See the section \"MAILING " @@ -2415,35 +2419,35 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:833 +#: doc/tin.1:835 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:836 +#: doc/tin.1:838 msgid "Go to next group." msgstr "Go to next group." #. type: TP -#: doc/tin.1:836 +#: doc/tin.1:838 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:839 +#: doc/tin.1:841 msgid "Go to next unread article." msgstr "Go to next unread article." #. type: TP -#: doc/tin.1:839 doc/tin.1:1031 doc/tin.1:1263 +#: doc/tin.1:841 doc/tin.1:1034 doc/tin.1:1266 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:844 doc/tin.1:1036 doc/tin.1:1268 +#: doc/tin.1:846 doc/tin.1:1039 doc/tin.1:1271 msgid "" "Send current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles to printer. See the section \"MAILING " @@ -2454,51 +2458,51 @@ msgstr "" "PIPING PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:844 +#: doc/tin.1:846 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:847 +#: doc/tin.1:849 msgid "Go to previous group." msgstr "Go to previous group." #. type: TP -#: doc/tin.1:847 +#: doc/tin.1:849 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:850 +#: doc/tin.1:852 msgid "Go to previous unread article." msgstr "Go to previous unread article." #. type: Plain text -#: doc/tin.1:853 doc/tin.1:1039 +#: doc/tin.1:855 doc/tin.1:1042 msgid "Return to previous level." msgstr "Return to previous level." #. type: TP -#: doc/tin.1:856 +#: doc/tin.1:858 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:859 +#: doc/tin.1:861 msgid "Toggle the display between all articles and unread articles." msgstr "Toggle the display between all articles and unread articles." #. type: TP -#: doc/tin.1:863 +#: doc/tin.1:865 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:868 doc/tin.1:1051 doc/tin.1:1293 +#: doc/tin.1:870 doc/tin.1:1054 doc/tin.1:1296 msgid "" "Save current article / thread / auto-selected (hot) articles / articles " "matching pattern / tagged articles. See the section \"MAILING PIPING " @@ -2509,24 +2513,24 @@ msgstr "" "PRINTING REPOSTING AND SAVING ARTICLES\" for more information." #. type: TP -#: doc/tin.1:868 +#: doc/tin.1:870 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:871 doc/tin.1:1054 doc/tin.1:1296 +#: doc/tin.1:873 doc/tin.1:1057 doc/tin.1:1299 msgid "Save marked articles automatically without further prompting." msgstr "Save marked articles automatically without further prompting." #. type: TP -#: doc/tin.1:871 +#: doc/tin.1:873 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:876 +#: doc/tin.1:878 msgid "" "Toggle tag-status of current article / thread for B ('B') / " "B ('B<|>') / B ('B') / B ('B') / " @@ -2537,26 +2541,26 @@ msgstr "" "B ('B')." #. type: TP -#: doc/tin.1:876 +#: doc/tin.1:878 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:879 +#: doc/tin.1:881 msgid "" "Automatically tag in order all the parts of the current multi-part message." msgstr "" "Automatically tag in order all the parts of the current multi-part message." #. type: TP -#: doc/tin.1:879 +#: doc/tin.1:881 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:884 +#: doc/tin.1:886 msgid "" "Cycle the threading mode through no threading, threading by subject, " "threading by references, threading on both subject and references, group " @@ -2567,56 +2571,56 @@ msgstr "" "multipart articles into a thread (''Subject:'' based)." #. type: TP -#: doc/tin.1:884 +#: doc/tin.1:886 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:887 +#: doc/tin.1:889 msgid "Untag all articles that were tagged." msgstr "Untag all articles that were tagged." #. type: Plain text -#: doc/tin.1:893 +#: doc/tin.1:896 doc/tin.1:1071 doc/tin.1:1324 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 " -"it via B ('B') for later processing (see also ''B<-o>'' " -"command-line switch) or discard it via B ('B')." +"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'), " +"postpone it for later processing via B ('B') (see also ''B<-" +"o>'' command-line switch) or discard it via B ('B')." msgstr "" -"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 " -"it via B ('B') for later processing (see also ''B<-o>'' " -"command-line switch) or discard it via B ('B')." +"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'), " +"postpone it for later processing via B ('B') (see also ''B<-" +"o>'' command-line switch) or discard it via B ('B')." #. type: TP -#: doc/tin.1:893 +#: doc/tin.1:896 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:899 +#: doc/tin.1:902 doc/tin.1:1330 msgid "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " -"for reposting from global to local newsgroups. Do not use this to cross-post " +"for reposting from global to local newsgroups. Do not use this to crosspost " "your own articles." msgstr "" "Repost an already posted article / thread / auto-selected (hot) articles / " "articles matching pattern / tagged articles to another newsgroup(s). Useful " -"for reposting from global to local newsgroups. Do not use this to cross-post " +"for reposting from global to local newsgroups. Do not use this to crosspost " "your own articles." #. type: TP -#: doc/tin.1:899 +#: doc/tin.1:902 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:907 +#: doc/tin.1:910 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. " @@ -2633,25 +2637,25 @@ msgstr "" "changes permanent." #. type: TP -#: doc/tin.1:907 doc/tin.1:1068 doc/tin.1:1327 +#: doc/tin.1:910 doc/tin.1:1071 doc/tin.1:1330 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:910 +#: doc/tin.1:913 msgid "Mark current article as unread." msgstr "Mark current article as unread." #. type: TP -#: doc/tin.1:910 doc/tin.1:1073 doc/tin.1:1330 +#: doc/tin.1:913 doc/tin.1:1076 doc/tin.1:1333 #, no-wrap msgid "B" msgstr "B" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:917 +#: doc/tin.1:920 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 " @@ -2662,94 +2666,79 @@ msgstr "" "present, a prompt asks how to proceed." #. type: SS -#: doc/tin.1:917 +#: doc/tin.1:920 #, no-wrap msgid "THREAD LISTING COMMANDS" msgstr "THREAD LISTING COMMANDS" #. type: Plain text -#: doc/tin.1:922 +#: doc/tin.1:925 msgid "Select article 4 within thread." msgstr "Select article 4 within thread." -#. type: Plain text -#: doc/tin.1:953 -msgid "Search forward for a specified subject." -msgstr "Search forward for a specified subject." - -#. type: Plain text -#: doc/tin.1:956 -msgid "Search backwards for a specified subject." -msgstr "Search backwards for a specified subject." - #. type: TP -#: doc/tin.1:956 +#: doc/tin.1:959 #, no-wrap msgid "B" msgstr "B" -#. type: Plain text -#: doc/tin.1:959 -msgid "Select the current thread for later processing." -msgstr "Select the current thread for later processing." - #. type: TP -#: doc/tin.1:959 +#: doc/tin.1:962 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:962 +#: doc/tin.1:965 msgid "Toggle selection of current article." msgstr "Toggle selection of current article." #. type: TP -#: doc/tin.1:962 +#: doc/tin.1:965 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:965 +#: doc/tin.1:968 msgid "Reverse article selections." msgstr "Reverse article selections." #. type: TP -#: doc/tin.1:965 +#: doc/tin.1:968 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:968 +#: doc/tin.1:971 msgid "Undo all selections on current thread." msgstr "Undo all selections on current thread." #. type: TP -#: doc/tin.1:973 +#: doc/tin.1:976 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:976 +#: doc/tin.1:979 msgid "Read current article within thread." msgstr "Read current article within thread." #. type: TP -#: doc/tin.1:976 +#: doc/tin.1:979 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:979 +#: doc/tin.1:982 msgid "View next unread article within thread." msgstr "View next unread article within thread." #. type: Plain text -#: doc/tin.1:984 +#: doc/tin.1:987 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 " @@ -2760,7 +2749,7 @@ msgstr "" "the current one." #. type: Plain text -#: doc/tin.1:995 +#: doc/tin.1:998 msgid "" "Mark thread as read [after confirmation] and return to the group index " "page. Move cursor to next thread." @@ -2769,7 +2758,7 @@ msgstr "" "page. Move cursor to next thread." #. type: Plain text -#: doc/tin.1:999 +#: doc/tin.1:1002 msgid "" "Mark thread as read [after confirmation] and enter the next thread " "containing unread news." @@ -2778,30 +2767,30 @@ msgstr "" "containing unread news." #. type: TP -#: doc/tin.1:999 +#: doc/tin.1:1002 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1003 +#: doc/tin.1:1006 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1014 doc/tin.1:1236 +#: doc/tin.1:1017 doc/tin.1:1239 msgid "Display the subject of the current article in the last line." msgstr "Display the subject of the current article in the last line." #. type: TP -#: doc/tin.1:1017 +#: doc/tin.1:1020 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1023 +#: doc/tin.1:1026 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 " @@ -2812,31 +2801,31 @@ msgstr "" "article. When tagged articles are present, a prompt asks how to proceed." #. type: TP -#: doc/tin.1:1026 +#: doc/tin.1:1029 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1046 +#: doc/tin.1:1049 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1051 +#: doc/tin.1:1054 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1054 +#: doc/tin.1:1057 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1058 doc/tin.1:1300 +#: doc/tin.1:1061 doc/tin.1:1303 msgid "" "Toggle tag status of current article for mailing, piping, printing, saving " "or reposting." @@ -2845,31 +2834,18 @@ msgstr "" "or reposting." #. type: TP -#: doc/tin.1:1058 +#: doc/tin.1:1061 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1061 +#: doc/tin.1:1064 msgid "Untag all tagged threads." msgstr "Untag all tagged threads." #. 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 " -"it for later processing via B ('B') (see also ''B<-o>'' " -"command-line switch) or discard it via B ('B')." -msgstr "" -"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 " -"it for later processing via B ('B') (see also ''B<-o>'' " -"command-line switch) or discard it via B ('B')." - -#. type: Plain text -#: doc/tin.1:1073 +#: doc/tin.1:1076 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 " @@ -2881,34 +2857,34 @@ msgstr "" #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1078 +#: doc/tin.1:1081 msgid "Mark all articles in thread as unread." msgstr "Mark all articles in thread as unread." #. type: SS -#: doc/tin.1:1078 +#: doc/tin.1:1081 #, no-wrap msgid "ARTICLE VIEWER COMMANDS" msgstr "ARTICLE VIEWER COMMANDS" #. type: Plain text -#: doc/tin.1:1083 +#: doc/tin.1:1086 msgid "Read the first (base) article in this thread." msgstr "Read the first (base) article in this thread." #. type: Plain text -#: doc/tin.1:1086 +#: doc/tin.1:1089 msgid "Read response 4 in this thread." msgstr "Read response 4 in this thread." #. type: TP -#: doc/tin.1:1090 +#: doc/tin.1:1093 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1094 +#: doc/tin.1:1097 msgid "" "Reply through mail to the author of the current article with a copy of the " "article with all headers included." @@ -2917,46 +2893,46 @@ msgstr "" "article with all headers included." #. type: TP -#: doc/tin.1:1094 +#: doc/tin.1:1097 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1099 +#: doc/tin.1:1102 msgid "Perform B<\\%pgp>(1) operations on article." msgstr "Perform B<\\%pgp>(1) operations on article." #. type: TP -#: doc/tin.1:1099 +#: doc/tin.1:1102 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1102 +#: doc/tin.1:1105 msgid "Toggles the display mode (raw including all headers vs. cooked)." msgstr "Toggles the display mode (raw including all headers vs. cooked)." #. type: TP -#: doc/tin.1:1106 +#: doc/tin.1:1109 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1109 +#: doc/tin.1:1112 msgid "Toggle the TAB width between 4 and 8 characters." msgstr "Toggle the TAB width between 4 and 8 characters." #. type: TP -#: doc/tin.1:1109 +#: doc/tin.1:1112 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1113 +#: doc/tin.1:1116 msgid "" "Post a followup to the current article with a copy of the article with all " "headers included." @@ -2965,13 +2941,13 @@ msgstr "" "headers included." #. type: TP -#: doc/tin.1:1113 +#: doc/tin.1:1116 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1117 +#: doc/tin.1:1120 msgid "" "Toggle TeX to ISO decoding for current article. The default behavior is " "taken from the B variable in the tinrc file." @@ -2980,37 +2956,37 @@ msgstr "" "taken from the B variable in the tinrc file." #. type: TP -#: doc/tin.1:1117 +#: doc/tin.1:1120 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1120 +#: doc/tin.1:1123 msgid "" "Toggles the display of all headers vs. headers in B." msgstr "" "Toggles the display of all headers vs. headers in B." #. type: TP -#: doc/tin.1:1120 +#: doc/tin.1:1123 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1123 +#: doc/tin.1:1126 msgid "Toggle ROT-13 decoding for this article." msgstr "Toggle ROT-13 decoding for this article." #. type: TP -#: doc/tin.1:1123 +#: doc/tin.1:1126 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1127 +#: doc/tin.1:1130 msgid "" "Toggle the display of uuencoded sections. The default behavior is taken from " "the B variable in the tinrc file." @@ -3019,13 +2995,13 @@ msgstr "" "from the B variable in the tinrc file." #. type: TP -#: doc/tin.1:1127 +#: doc/tin.1:1130 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1134 +#: doc/tin.1:1137 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 " @@ -3040,23 +3016,23 @@ msgstr "" "up will hide it again." #. type: Plain text -#: doc/tin.1:1143 +#: doc/tin.1:1146 msgid "Forward search the text of this article." msgstr "Forward search the text of this article." #. type: Plain text -#: doc/tin.1:1146 +#: doc/tin.1:1149 msgid "Backward search the text of this article." msgstr "Backward search the text of this article." #. type: TP -#: doc/tin.1:1146 +#: doc/tin.1:1149 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1151 +#: doc/tin.1:1154 msgid "" "Skip to the end of the next quoted text-block in this article. Quoted text " "is everything which matches B, B or " @@ -3067,40 +3043,40 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1151 +#: doc/tin.1:1154 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1154 +#: doc/tin.1:1157 msgid "Go to the first article in the current thread." msgstr "Go to the first article in the current thread." #. type: TP -#: doc/tin.1:1154 +#: doc/tin.1:1157 #, no-wrap msgid "B'>" msgstr "B'>" #. type: Plain text -#: doc/tin.1:1157 +#: doc/tin.1:1160 msgid "Go to the last article in the current thread." msgstr "Go to the last article in the current thread." #. type: TP -#: doc/tin.1:1157 +#: doc/tin.1:1160 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1160 +#: doc/tin.1:1163 msgid "Toggle word highlighting on/off." msgstr "Toggle word highlighting on/off." #. type: Plain text -#: doc/tin.1:1174 +#: doc/tin.1:1177 msgid "" "Auto select article(s) with a single key. The defaults used for selection " "are set based upon the following four tinrc config variables: " @@ -3119,7 +3095,7 @@ msgstr "" "information on filtering." #. type: Plain text -#: doc/tin.1:1183 +#: doc/tin.1:1186 msgid "" "Kill article(s) with a single key. The defaults used for killing are based " "upon the following four tinrc config variables: B, " @@ -3136,24 +3112,24 @@ msgstr "" "\"FILTERING ARTICLES\" for more information on filtering." #. type: TP -#: doc/tin.1:1183 +#: doc/tin.1:1186 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1186 +#: doc/tin.1:1189 msgid "Go to next base article." msgstr "Go to next base article." #. type: TP -#: doc/tin.1:1186 +#: doc/tin.1:1189 #, no-wrap msgid "BTABE'>" msgstr "BTABE'>" #. type: Plain text -#: doc/tin.1:1191 +#: doc/tin.1:1194 msgid "" "Go to next unread article. If the tinrc variable B doesn't " "contain PageNextUnread, then this key will first page through the current " @@ -3164,17 +3140,17 @@ msgstr "" "article." #. type: Plain text -#: doc/tin.1:1194 +#: doc/tin.1:1197 msgid "Author forward search." msgstr "Author forward search." #. type: Plain text -#: doc/tin.1:1197 +#: doc/tin.1:1200 msgid "Author backward search." msgstr "Author backward search." #. type: Plain text -#: doc/tin.1:1205 +#: doc/tin.1:1208 msgid "" "Mark the current thread as read [after confirmation] and return to the " "previous menu. Move cursor to next item." @@ -3183,7 +3159,7 @@ msgstr "" "previous menu. Move cursor to next item." #. type: Plain text -#: doc/tin.1:1209 +#: doc/tin.1:1212 msgid "" "Mark the rest of the current thread as read [after confirmation] and enter " "the next thread with unread articles." @@ -3192,45 +3168,45 @@ msgstr "" "the next thread with unread articles." #. type: TP -#: doc/tin.1:1209 +#: doc/tin.1:1212 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1214 +#: doc/tin.1:1217 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1217 +#: doc/tin.1:1220 msgid "" "Edit the current article. This is restricted to mailgroups and saved news." msgstr "" "Edit the current article. This is restricted to mailgroups and saved news." #. type: TP -#: doc/tin.1:1220 +#: doc/tin.1:1223 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1223 +#: doc/tin.1:1226 msgid "" "Post a followup to the current article with a copy of the article included." msgstr "" "Post a followup to the current article with a copy of the article included." #. type: TP -#: doc/tin.1:1223 +#: doc/tin.1:1226 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1227 +#: doc/tin.1:1230 msgid "" "Post a followup to the current article without including a copy of the " "article." @@ -3239,112 +3215,112 @@ msgstr "" "article." #. type: TP -#: doc/tin.1:1227 +#: doc/tin.1:1230 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1230 +#: doc/tin.1:1233 msgid "Go to the start of the article." msgstr "Go to the start of the article." #. type: TP -#: doc/tin.1:1230 +#: doc/tin.1:1233 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1233 +#: doc/tin.1:1236 msgid "Go to the end of the article." msgstr "Go to the end of the article." #. type: TP -#: doc/tin.1:1239 +#: doc/tin.1:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1242 +#: doc/tin.1:1245 msgid "Mark rest of thread as read and move onto the next unread thread." msgstr "Mark rest of thread as read and move onto the next unread thread." #. type: TP -#: doc/tin.1:1242 +#: doc/tin.1:1245 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1245 +#: doc/tin.1:1248 msgid "Show the thread menu that the current article is a part of." msgstr "Show the thread menu that the current article is a part of." #. type: TP -#: doc/tin.1:1248 +#: doc/tin.1:1251 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1257 +#: doc/tin.1:1260 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1260 +#: doc/tin.1:1263 msgid "Go to the next article." msgstr "Go to the next article." #. type: TP -#: doc/tin.1:1260 +#: doc/tin.1:1263 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1263 +#: doc/tin.1:1266 msgid "Go to the next unread article." msgstr "Go to the next unread article." #. type: TP -#: doc/tin.1:1268 +#: doc/tin.1:1271 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1271 +#: doc/tin.1:1274 msgid "Go to the previous article." msgstr "Go to the previous article." #. type: TP -#: doc/tin.1:1271 +#: doc/tin.1:1274 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1274 +#: doc/tin.1:1277 msgid "Go to the previous unread article." msgstr "Go to the previous unread article." #. type: Plain text -#: doc/tin.1:1277 +#: doc/tin.1:1280 msgid "Return to the previous level." msgstr "Return to the previous level." #. type: TP -#: doc/tin.1:1280 +#: doc/tin.1:1283 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1284 +#: doc/tin.1:1287 msgid "" "Reply through mail to the author of the current article with a copy of the " "article included." @@ -3353,13 +3329,13 @@ msgstr "" "article included." #. type: TP -#: doc/tin.1:1284 +#: doc/tin.1:1287 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1288 +#: doc/tin.1:1291 msgid "" "Reply through mail to the author of the current article without including " "the original article." @@ -3368,53 +3344,53 @@ msgstr "" "the original article." #. type: TP -#: doc/tin.1:1288 +#: doc/tin.1:1291 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1293 +#: doc/tin.1:1296 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1296 +#: doc/tin.1:1299 #, no-wrap msgid "B" msgstr "B" #. type: TP -#: doc/tin.1:1300 +#: doc/tin.1:1303 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1303 +#: doc/tin.1:1306 msgid "Return to group selection level." msgstr "Return to group selection level." #. type: TP -#: doc/tin.1:1303 +#: doc/tin.1:1306 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1306 +#: doc/tin.1:1309 msgid "Go to parent article." msgstr "Go to parent article." #. type: TP -#: doc/tin.1:1306 +#: doc/tin.1:1309 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1310 +#: doc/tin.1:1313 msgid "" "Display a list of URLs in the current article. See the section \"URL LISTING" "\" for more information." @@ -3423,13 +3399,13 @@ msgstr "" "\" for more information." #. type: TP -#: doc/tin.1:1310 +#: doc/tin.1:1313 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1314 +#: doc/tin.1:1317 msgid "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." @@ -3437,57 +3413,31 @@ msgstr "" "Display a list of attachments of the current article. See the section " "\"ATTACHMENT LISTING\" for more information." -#. 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'), " -"postpone it for later processing via B ('B') (see also ''B<-" -"o>'' command-line switch) or discard it via B ('B')." -msgstr "" -"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'), " -"postpone it for later processing via B ('B') (see also ''B<-" -"o>'' command-line switch) or discard it via B ('B')." - #. type: TP -#: doc/tin.1:1321 +#: doc/tin.1:1324 #, no-wrap msgid "B" msgstr "B" #. 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 " -"for reposting from global to local newsgroups. Do not use this to crosspost " -"your own articles." -msgstr "" -"Repost an already posted article / thread / auto-selected (hot) articles / " -"articles matching pattern / tagged articles to another newsgroup(s). Useful " -"for reposting from global to local newsgroups. Do not use this to crosspost " -"your own articles." - -#. type: Plain text -#: doc/tin.1:1330 +#: doc/tin.1:1333 msgid "Mark article as unread." msgstr "Mark article as unread." #. -------------------------------------------------------------------- #. type: Plain text -#: doc/tin.1:1335 +#: doc/tin.1:1338 msgid "Mark the current thread as unread." msgstr "Mark the current thread as unread." #. type: SS -#: doc/tin.1:1335 +#: doc/tin.1:1338 #, no-wrap msgid "URL LISTING" msgstr "URL LISTING" #. type: Plain text -#: doc/tin.1:1338 +#: doc/tin.1:1341 msgid "" "B ('B') displays a list of URLs in the current article. " "Besides the common moving keys, the following commands are available:" @@ -3496,13 +3446,13 @@ msgstr "" "Besides the common moving keys, the following commands are available:" #. type: TP -#: doc/tin.1:1339 +#: doc/tin.1:1342 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1343 +#: doc/tin.1:1346 msgid "" "The current URL will be prompted and opened using the B. " "'BESCE>' or no input will skip the URL." @@ -3511,39 +3461,39 @@ msgstr "" "'BESCE>' or no input will skip the URL." #. type: Plain text -#: doc/tin.1:1346 +#: doc/tin.1:1349 msgid "URL forward search." msgstr "URL forward search." #. type: Plain text -#: doc/tin.1:1349 +#: doc/tin.1:1352 msgid "URL backward search." msgstr "URL backward search." #. type: Plain text -#: doc/tin.1:1355 doc/tin.1:1408 +#: doc/tin.1:1358 doc/tin.1:1411 msgid "Shell escape." msgstr "Shell escape." #. type: Plain text -#: doc/tin.1:1358 +#: doc/tin.1:1361 msgid "Toggle the display of the current URL in the last line." msgstr "Toggle the display of the current URL in the last line." #. type: Plain text -#: doc/tin.1:1361 doc/tin.1:1415 +#: doc/tin.1:1364 doc/tin.1:1418 msgid "Help screen of commands available." msgstr "Help screen of commands available." #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1367 +#: doc/tin.1:1370 #, no-wrap msgid "ATTACHMENT LISTING" msgstr "ATTACHMENT LISTING" #. type: Plain text -#: doc/tin.1:1370 +#: doc/tin.1:1373 msgid "" "B ('B') displays a list of attachments of the current " "article. Besides the common moving keys, the following commands are " @@ -3554,57 +3504,57 @@ msgstr "" "available:" #. type: TP -#: doc/tin.1:1371 +#: doc/tin.1:1374 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1374 +#: doc/tin.1:1377 msgid "Pipe attachment into command." msgstr "Pipe attachment into command." #. type: TP -#: doc/tin.1:1374 +#: doc/tin.1:1377 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1377 +#: doc/tin.1:1380 msgid "Save current attachment / tagged attachments to disk." msgstr "Save current attachment / tagged attachments to disk." #. type: TP -#: doc/tin.1:1377 +#: doc/tin.1:1380 #, no-wrap msgid "BCRE'>" msgstr "BCRE'>" #. type: Plain text -#: doc/tin.1:1380 +#: doc/tin.1:1383 msgid "View attachment." msgstr "View attachment." #. type: TP -#: doc/tin.1:1380 +#: doc/tin.1:1383 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1383 +#: doc/tin.1:1386 msgid "Tag one or more attachments for saving." msgstr "Tag one or more attachments for saving." #. type: TP -#: doc/tin.1:1383 +#: doc/tin.1:1386 #, no-wrap msgid "B" #. type: Plain text -#: doc/tin.1:1387 +#: doc/tin.1:1390 msgid "" "Prompts for a pattern to match. All attachments whose name/description or " "content type/transfer encoding match the pattern will be tagged." @@ -3613,52 +3563,52 @@ msgstr "" "content type/transfer encoding match the pattern will be tagged." #. type: TP -#: doc/tin.1:1387 +#: doc/tin.1:1390 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1390 +#: doc/tin.1:1393 msgid "Reverse tagging of all attachments." msgstr "Reverse tagging of all attachments." #. type: TP -#: doc/tin.1:1390 +#: doc/tin.1:1393 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1393 +#: doc/tin.1:1396 msgid "Untag all tagged attachments." msgstr "Untag all tagged attachments." #. type: Plain text -#: doc/tin.1:1396 +#: doc/tin.1:1399 msgid "Attachment forward search." msgstr "Attachment forward search." #. type: Plain text -#: doc/tin.1:1399 +#: doc/tin.1:1402 msgid "Attachment backward search." msgstr "Attachment backward search." #. type: TP -#: doc/tin.1:1402 +#: doc/tin.1:1405 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1405 +#: doc/tin.1:1408 msgid "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." msgstr "" "Pipe attachment into command. Uses the raw attachment, no decoding is done." #. type: Plain text -#: doc/tin.1:1412 +#: doc/tin.1:1415 msgid "" "Toggle the display of the name/description of the current attachment in the " "last line." @@ -3668,34 +3618,33 @@ msgstr "" #. -------------------------------------------------------------------- #. type: SS -#: doc/tin.1:1421 +#: doc/tin.1:1424 #, no-wrap msgid "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" msgstr "GLOBAL OPTIONS MENU AND TINRC CONFIGURABLE VARIABLES" #. FIXME - add missing descriptions -#. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used +#. - \fI${TIN_LIBDIR:\-NEWSLIBDIR}/tinrc\fR is used #. in the !TIN_DEFAULTS_DIR config case #. type: Plain text -#: doc/tin.1:1433 +#: doc/tin.1:1436 msgid "" -"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 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 " +"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 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 "" -"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." +"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 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." #. type: Plain text -#: doc/tin.1:1441 +#: doc/tin.1:1444 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 " @@ -3712,7 +3661,7 @@ msgstr "" "don't edit the file directly whilst B is running." #. type: Plain text -#: doc/tin.1:1447 +#: doc/tin.1:1450 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 " @@ -3727,7 +3676,7 @@ msgstr "" "\\&'BESCE>' will abort without saving changes." #. type: Plain text -#: doc/tin.1:1454 +#: doc/tin.1:1457 msgid "" "As with the other menus, B ('B<^L>') will redraw the screen. You " "can use B ('B'), B ('B') and B " @@ -3742,7 +3691,7 @@ msgstr "" "keeping your changes." #. type: Plain text -#: doc/tin.1:1459 +#: doc/tin.1:1462 msgid "" "The options menu provides access to the attributes menu for the current " "group by the B ('BTABE>') command. Pressing " @@ -3755,7 +3704,7 @@ msgstr "" "information see section \"ATTRIBUTES MENU AND GROUP ATTRIBUTES\"." #. type: Plain text -#: doc/tin.1:1462 +#: doc/tin.1:1465 msgid "" "The B ('B') command brings up the scopes menu. For more " "information see section \"SCOPES MENU\"." @@ -3764,7 +3713,7 @@ msgstr "" "information see section \"SCOPES MENU\"." #. type: Plain text -#: doc/tin.1:1466 +#: doc/tin.1:1469 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/" @@ -3775,13 +3724,13 @@ msgstr "" "tinrc>." #. type: TP -#: doc/tin.1:1466 +#: doc/tin.1:1469 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1472 doc/tin.5:1196 +#: doc/tin.1:1475 doc/tin.5:1199 msgid "" "If ON abbreviate long newsgroup names at group selection level and article " "level (if necessary) like this: news.software.readers -E n.software." @@ -3792,13 +3741,13 @@ msgstr "" "readers -E n.s.readers -E n.s.r. Default is OFF." #. type: TP -#: doc/tin.1:1472 +#: doc/tin.1:1475 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1476 doc/tin.5:1200 +#: doc/tin.1:1479 doc/tin.5:1203 msgid "" "If ON add posted articles which start a new thread to filter for " "highlighting follow-ups. Default is ON." @@ -3807,62 +3756,62 @@ msgstr "" "highlighting follow-ups. Default is ON." #. type: TP -#: doc/tin.1:1476 +#: doc/tin.1:1479 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1479 doc/tin.5:1203 +#: doc/tin.1:1482 doc/tin.5:1206 msgid "Turn ON advertising in header (''User-Agent:''). Default is ON." msgstr "Turn ON advertising in header (''User-Agent:''). Default is ON." #. type: TP -#: doc/tin.1:1479 +#: doc/tin.1:1482 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1482 doc/tin.5:1206 +#: doc/tin.1:1485 doc/tin.5:1209 msgid "" "If ON strip multipart/alternative messages automatically. Default is ON." msgstr "" "If ON strip multipart/alternative messages automatically. Default is ON." #. type: TP -#: doc/tin.1:1482 +#: doc/tin.1:1485 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1485 doc/tin.5:1209 +#: doc/tin.1:1488 doc/tin.5:1212 msgid "The character used to show that an article was deleted. Default is 'D'." msgstr "" "The character used to show that an article was deleted. Default is 'D'." #. type: TP -#: doc/tin.1:1485 +#: doc/tin.1:1488 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1488 doc/tin.5:1212 +#: doc/tin.1:1491 doc/tin.5:1215 msgid "" "The character used to show that an article is in a range. Default is '#'." msgstr "" "The character used to show that an article is in a range. Default is '#'." #. type: TP -#: doc/tin.1:1488 +#: doc/tin.1:1491 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1492 doc/tin.5:1216 +#: doc/tin.1:1495 doc/tin.5:1219 msgid "" "The character used to show that an article will return as an unread article " "when the group is next entered. Default is '-'." @@ -3871,13 +3820,13 @@ msgstr "" "when the group is next entered. Default is '-'." #. type: TP -#: doc/tin.1:1492 +#: doc/tin.1:1495 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1496 doc/tin.5:1220 +#: doc/tin.1:1499 doc/tin.5:1223 msgid "" "The character used to show that an article/thread is auto-selected (hot). " "Default is '*'." @@ -3886,13 +3835,13 @@ msgstr "" "Default is '*'." #. type: TP -#: doc/tin.1:1496 +#: doc/tin.1:1499 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1500 doc/tin.5:1224 +#: doc/tin.1:1503 doc/tin.5:1227 msgid "" "The character used to show that an article/thread is recent (not older than " "X days). See also B. Default is 'o'." @@ -3901,39 +3850,39 @@ msgstr "" "X days). See also B. Default is 'o'." #. type: TP -#: doc/tin.1:1500 +#: doc/tin.1:1503 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1504 +#: doc/tin.1:1507 doc/tin.5:1231 msgid "" -"The character used to show that an article has not been read. Default is " -"\\&'+'." +"The character used to show that an article has not been read. Default is " +"'+'." msgstr "" -"The character used to show that an article has not been read. Default is " -"\\&'+'." +"The character used to show that an article has not been read. Default is " +"'+'." #. type: TP -#: doc/tin.1:1504 +#: doc/tin.1:1507 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1507 doc/tin.5:1231 +#: doc/tin.1:1510 doc/tin.5:1234 msgid "The character used to show that an article was read. Default is ' '." msgstr "The character used to show that an article was read. Default is ' '." #. type: TP -#: doc/tin.1:1507 +#: doc/tin.1:1510 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1511 doc/tin.5:1235 +#: doc/tin.1:1514 doc/tin.5:1238 msgid "" "The character used to show that an article was killed. Default is 'K'. " "B must be set accordingly." @@ -3942,13 +3891,13 @@ msgstr "" "B must be set accordingly." #. type: TP -#: doc/tin.1:1511 +#: doc/tin.1:1514 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1515 doc/tin.5:1239 +#: doc/tin.1:1518 doc/tin.5:1242 msgid "" "The character used to show that an article was hot before it was read. " "Default is ':'. B must be set accordingly." @@ -3957,13 +3906,13 @@ msgstr "" "Default is ':'. B must be set accordingly." #. type: TP -#: doc/tin.1:1515 doc/tin.5:1239 +#: doc/tin.1:1518 doc/tin.5:1242 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1520 +#: doc/tin.1:1523 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 " @@ -3974,13 +3923,13 @@ msgstr "" "OFF." #. type: TP -#: doc/tin.1:1520 +#: doc/tin.1:1523 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1524 doc/tin.5:1250 +#: doc/tin.1:1527 doc/tin.5:1253 msgid "" "Automatically put your name in the ''Cc:'' and/or ''Bcc:'' field when " "mailing an article. Default is No." @@ -3989,13 +3938,13 @@ msgstr "" "mailing an article. Default is No." #. type: TP -#: doc/tin.1:1524 +#: doc/tin.1:1527 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1528 doc/tin.5:1254 +#: doc/tin.1:1531 doc/tin.5:1257 msgid "" "If ON automatically list thread when entering it using right arrow key. " "Default is ON." @@ -4004,24 +3953,24 @@ msgstr "" "Default is ON." #. type: TP -#: doc/tin.1:1528 +#: doc/tin.1:1531 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1531 doc/tin.1:2481 +#: doc/tin.1:1534 doc/tin.1:2509 msgid "Default is OFF." msgstr "Default is OFF." #. type: TP -#: doc/tin.1:1531 +#: doc/tin.1:1534 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1537 doc/tin.5:1263 +#: doc/tin.1:1540 doc/tin.5:1266 msgid "" "If ON articles/threads with ''Archive-name:'' in header will be " "automatically saved with the Archive-name & part/patch no and post processed " @@ -4032,13 +3981,13 @@ msgstr "" "if B is set to something other than 'No'. Default is OFF." #. type: TP -#: doc/tin.1:1537 +#: doc/tin.1:1540 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1542 doc/tin.5:1268 +#: doc/tin.1:1545 doc/tin.5:1271 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 " @@ -4049,13 +3998,13 @@ msgstr "" "ON." #. type: TP -#: doc/tin.1:1542 +#: doc/tin.1:1545 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1547 doc/tin.5:1273 +#: doc/tin.1:1550 doc/tin.5:1276 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 " @@ -4066,13 +4015,13 @@ msgstr "" "displayed after composing an article. Default is ON." #. type: TP -#: doc/tin.1:1547 +#: doc/tin.1:1550 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1552 +#: doc/tin.1:1555 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. " @@ -4083,13 +4032,13 @@ msgstr "" "See also \"INDEX FILES\". Default is OFF." #. type: TP -#: doc/tin.1:1552 +#: doc/tin.1:1555 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1558 doc/tin.5:1282 +#: doc/tin.1:1561 doc/tin.5:1285 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." @@ -4098,79 +4047,90 @@ msgstr "" "current session should be marked read. Default is OFF." #. type: TP -#: doc/tin.1:1558 +#: doc/tin.1:1561 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1561 doc/tin.5:1285 +#: doc/tin.1:1564 doc/tin.5:1288 msgid "Standard background color" msgstr "Standard background colour" #. type: TP -#: doc/tin.1:1561 +#: doc/tin.1:1564 #, no-wrap -msgid "B" -msgstr "B" +msgid "B" +msgstr "B" #. type: Plain text -#: doc/tin.1:1564 doc/tin.5:1288 -msgid "Color of sender (From:)" -msgstr "Colour of sender (From:)" +#: doc/tin.1:1567 doc/tin.5:1291 +msgid "Color of quoted text from external sources" +msgstr "Colour of quoted text from external sources" #. type: TP -#: doc/tin.1:1564 +#: doc/tin.1:1567 +#, no-wrap +msgid "B" +msgstr "B" + +#. type: Plain text +#: doc/tin.1:1570 doc/tin.5:1294 +msgid "Color of sender (From:)" +msgstr "Colour of sender (From:)" + +#. type: TP +#: doc/tin.1:1570 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1567 doc/tin.5:1291 +#: doc/tin.1:1573 doc/tin.5:1297 msgid "Color of header-lines" msgstr "Colour of header-lines" #. type: TP -#: doc/tin.1:1567 +#: doc/tin.1:1573 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1570 doc/tin.5:1294 +#: doc/tin.1:1576 doc/tin.5:1300 msgid "Color of help pages" msgstr "Colour of help pages" #. type: TP -#: doc/tin.1:1570 +#: doc/tin.1:1576 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1573 doc/tin.5:1297 +#: doc/tin.1:1579 doc/tin.5:1303 msgid "Color of background for inverse text" msgstr "Colour of background for inverse text" #. type: TP -#: doc/tin.1:1573 +#: doc/tin.1:1579 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1576 doc/tin.5:1300 +#: doc/tin.1:1582 doc/tin.5:1306 msgid "Color of foreground for inverse text" msgstr "Colour of foreground for inverse text" #. type: TP -#: doc/tin.1:1576 +#: doc/tin.1:1582 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1580 doc/tin.5:1304 +#: doc/tin.1:1586 doc/tin.5:1310 msgid "" "Color of words emphasized like _this_. See also B and " "B." @@ -4179,13 +4139,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1580 +#: doc/tin.1:1586 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1584 doc/tin.5:1308 +#: doc/tin.1:1590 doc/tin.5:1314 msgid "" "Color of words emphasized like /this/. See also B and " "B." @@ -4194,13 +4154,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1584 +#: doc/tin.1:1590 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1588 doc/tin.5:1312 +#: doc/tin.1:1594 doc/tin.5:1318 msgid "" "Color of words emphasized like *this*. See also B and " "B." @@ -4209,13 +4169,13 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1588 +#: doc/tin.1:1594 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1592 doc/tin.5:1316 +#: doc/tin.1:1598 doc/tin.5:1322 msgid "" "Color of words emphasized like -this-. See also B and " "B." @@ -4224,79 +4184,79 @@ msgstr "" "B." #. type: TP -#: doc/tin.1:1592 +#: doc/tin.1:1598 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1595 doc/tin.5:1319 +#: doc/tin.1:1601 doc/tin.5:1325 msgid "Color of mini help menu" msgstr "Colour of mini help menu" #. type: TP -#: doc/tin.1:1595 +#: doc/tin.1:1601 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1598 doc/tin.5:1322 +#: doc/tin.1:1604 doc/tin.5:1328 msgid "Color of actual news header fields" msgstr "Colour of actual news header fields" #. type: TP -#: doc/tin.1:1598 +#: doc/tin.1:1604 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1601 doc/tin.5:1325 +#: doc/tin.1:1607 doc/tin.5:1331 msgid "Standard foreground color" msgstr "Standard foreground colour" #. type: TP -#: doc/tin.1:1601 +#: doc/tin.1:1607 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1604 doc/tin.5:1328 +#: doc/tin.1:1610 doc/tin.5:1334 msgid "Color of quoted lines" msgstr "Colour of quoted lines" #. type: TP -#: doc/tin.1:1604 +#: doc/tin.1:1610 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1607 doc/tin.5:1331 +#: doc/tin.1:1613 doc/tin.5:1337 msgid "Color of twice quoted lines" msgstr "Colour of twice quoted lines" #. type: TP -#: doc/tin.1:1607 +#: doc/tin.1:1613 #, no-wrap msgid "B3 times quoted line (col_quote3)>" msgstr "B3 times quoted line (col_quote3)>" #. type: Plain text -#: doc/tin.1:1610 doc/tin.5:1334 +#: doc/tin.1:1616 doc/tin.5:1340 msgid "Color of E=3 times quoted lines" msgstr "Colour of E=3 times quoted lines" #. type: TP -#: doc/tin.1:1610 +#: doc/tin.1:1616 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1614 +#: doc/tin.1:1620 doc/tin.5:1344 msgid "" "Color of response counter. This is the text that says \"Response x of y\" in " "the article viewer." @@ -4305,91 +4265,91 @@ msgstr "" "in the article viewer." #. type: TP -#: doc/tin.1:1614 +#: doc/tin.1:1620 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1617 doc/tin.5:1341 +#: doc/tin.1:1623 doc/tin.5:1347 msgid "Color of signatures" msgstr "Colour of signatures" #. type: TP -#: doc/tin.1:1617 +#: doc/tin.1:1623 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1620 doc/tin.5:1344 +#: doc/tin.1:1626 doc/tin.5:1350 msgid "Color of urls highlight" msgstr "Colour of urls highlight" #. type: TP -#: doc/tin.1:1620 +#: doc/tin.1:1626 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1623 doc/tin.5:1347 +#: doc/tin.1:1629 doc/tin.5:1353 msgid "Color of verbatim blocks" msgstr "Colour of verbatim blocks" #. type: TP -#: doc/tin.1:1623 +#: doc/tin.1:1629 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1626 doc/tin.5:1350 +#: doc/tin.1:1632 doc/tin.5:1356 msgid "Color of article subject" msgstr "Colour of article subject" #. type: TP -#: doc/tin.1:1626 +#: doc/tin.1:1632 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1629 doc/tin.5:1353 +#: doc/tin.1:1635 doc/tin.5:1359 msgid "Color of text-lines" msgstr "Colour of text-lines" #. type: TP -#: doc/tin.1:1629 +#: doc/tin.1:1635 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1632 doc/tin.5:1356 +#: doc/tin.1:1638 doc/tin.5:1362 msgid "Color of help/mail sign" msgstr "Colour of help/mail sign" #. type: TP -#: doc/tin.1:1632 +#: doc/tin.1:1638 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: doc/tin.1:1635 +#: doc/tin.1:1641 msgid "Ask for manual confirmation to protect the user." msgstr "Ask for manual confirmation to protect the user." #. type: IP -#: doc/tin.1:1636 doc/tin.1:1642 doc/tin.1:1646 +#: doc/tin.1:1642 doc/tin.1:1648 doc/tin.1:1652 #, no-wrap msgid "\\(bu" msgstr "\\(bu" #. TODO: check if all affected commands are marked [after confirmation] #. type: Plain text -#: doc/tin.1:1642 +#: doc/tin.1:1648 msgid "" "B Ask for confirmation before executing certain dangerous commands " "(e.g., B ('B')). Commands that this affects are marked in this " @@ -4400,7 +4360,7 @@ msgstr "" "manual with '[after confirmation]'. Default is commands & quit." #. type: Plain text -#: doc/tin.1:1646 +#: doc/tin.1:1652 msgid "" "B You'll be asked to confirm that you wish to exit B when you use " "the B ('B') command." @@ -4409,7 +4369,7 @@ msgstr "" "the B ('B') command." #. type: Plain text -#: doc/tin.1:1650 +#: doc/tin.1:1656 msgid "" "B: Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" -"B Ask for confirmation before marking all not selected (with " +"B Ask for confirmation before marking all not selected (with " "B ('B') command) articles as read." msgstr "" #. type: TP -#: doc/tin.1:1651 +#: doc/tin.1:1657 #, no-wrap msgid "B" msgstr "" @@ -3877,7 +3846,7 @@ msgstr "" #. most of these default_* settings are not available from the menu #. as they are intended for internal use only. #. type: Plain text -#: doc/tin.1:1663 +#: doc/tin.1:1669 msgid "" "Format string B uses for date representation. A description of the " "different format options can be found at B<\\%strftime>(3). B uses " @@ -3886,384 +3855,409 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1663 +#: doc/tin.1:1669 #, no-wrap msgid "B<(default_art_search)>" msgstr "" #. type: TP -#: doc/tin.1:1665 +#: doc/tin.1:1671 #, no-wrap msgid "B<(default_author_search)>" msgstr "" #. type: TP -#: doc/tin.1:1667 +#: doc/tin.1:1673 #, no-wrap msgid "B<(default_config_search)>" msgstr "" #. type: Plain text -#: doc/tin.1:1670 doc/tin.5:1395 +#: doc/tin.1:1676 doc/tin.5:1401 msgid "The last article/author/config option that was searched for." msgstr "" #. type: TP -#: doc/tin.1:1670 +#: doc/tin.1:1676 #, no-wrap msgid "B<(default_filter_days)>" msgstr "" #. type: Plain text -#: doc/tin.1:1673 doc/tin.5:1398 +#: doc/tin.1:1679 doc/tin.5:1404 msgid "Default is 28." msgstr "" #. type: TP -#: doc/tin.1:1673 +#: doc/tin.1:1679 #, no-wrap msgid "B<(default_filter_kill_case)>" msgstr "" #. type: Plain text -#: doc/tin.1:1677 +#: doc/tin.1:1683 doc/tin.5:1408 msgid "" "Default for quick (1 key) kill filter case. ON = filter case sensitive, OFF " "= ignore case. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1677 +#: doc/tin.1:1683 #, no-wrap msgid "B<(default_filter_kill_expire)>" msgstr "" #. type: Plain text -#: doc/tin.1:1682 +#: doc/tin.1:1688 doc/tin.5:1413 msgid "" "Default for quick (1 key) kill filter expire. ON = limit to " "B, OFF = don't ever expire. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1682 +#: doc/tin.1:1688 #, no-wrap msgid "B<(default_filter_kill_global)>" msgstr "" #. type: Plain text -#: doc/tin.1:1686 +#: doc/tin.1:1692 doc/tin.5:1417 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 -#: doc/tin.1:1686 +#: doc/tin.1:1692 #, no-wrap msgid "B<(default_filter_kill_header)>" msgstr "" #. type: Plain text -#: doc/tin.1:1689 doc/tin.5:1413 +#: doc/tin.1:1695 doc/tin.5:1420 msgid "Default for quick (1 key) kill filter header." msgstr "" #. type: IP -#: doc/tin.1:1690 doc/tin.1:1724 doc/tin.1:1859 doc/tin.1:2035 doc/tin.1:2081 doc/tin.1:2197 doc/tin.1:2222 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: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 +#: doc/tin.1:1696 doc/tin.1:1730 doc/tin.1:1870 doc/tin.1:2063 doc/tin.1:2109 doc/tin.1:2225 doc/tin.1:2250 doc/tin.1:2265 doc/tin.1:2316 doc/tin.1:2346 doc/tin.1:2417 doc/tin.1:2449 doc/tin.1:2469 doc/tin.1:2557 doc/tin.5:1598 doc/tin.5:1792 doc/tin.5:1842 doc/tin.5:1987 doc/tin.5:2002 doc/tin.5:2028 doc/tin.5:2081 doc/tin.5:2110 doc/tin.5:2213 doc/tin.5:2233 doc/tin.5:2333 #, no-wrap msgid "0" msgstr "" #. type: Plain text -#: doc/tin.1:1692 doc/tin.1:1726 +#: doc/tin.1:1698 doc/tin.1:1732 #, no-wrap msgid " ''Subject:'' (case sensitive)\n" msgstr "" #. type: IP -#: doc/tin.1:1692 doc/tin.1:1726 doc/tin.1:1865 doc/tin.1:2037 doc/tin.1:2083 doc/tin.1:2199 doc/tin.1:2226 doc/tin.1:2239 doc/tin.1:2290 doc/tin.1:2320 doc/tin.1:2391 doc/tin.1:2423 doc/tin.1:2443 doc/tin.1:2531 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 +#: doc/tin.1:1698 doc/tin.1:1732 doc/tin.1:1876 doc/tin.1:2065 doc/tin.1:2111 doc/tin.1:2227 doc/tin.1:2254 doc/tin.1:2267 doc/tin.1:2318 doc/tin.1:2348 doc/tin.1:2419 doc/tin.1:2451 doc/tin.1:2471 doc/tin.1:2559 doc/tin.5:1605 doc/tin.5:1794 doc/tin.5:1844 doc/tin.5:1893 doc/tin.5:1991 doc/tin.5:2004 doc/tin.5:2030 doc/tin.5:2083 doc/tin.5:2112 doc/tin.5:2215 doc/tin.5:2235 doc/tin.5:2335 #, no-wrap msgid "1" msgstr "" #. type: Plain text -#: doc/tin.1:1694 doc/tin.1:1728 +#: doc/tin.1:1700 doc/tin.1:1734 #, no-wrap msgid " ''Subject:'' (ignore case)\n" msgstr "" #. type: IP -#: doc/tin.1:1694 doc/tin.1:1728 doc/tin.1:1870 doc/tin.1:2039 doc/tin.1:2087 doc/tin.1:2202 doc/tin.1:2243 doc/tin.1:2292 doc/tin.1:2323 doc/tin.1:2393 doc/tin.1:2425 doc/tin.1:2445 doc/tin.1:2533 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 +#: doc/tin.1:1700 doc/tin.1:1734 doc/tin.1:1881 doc/tin.1:2067 doc/tin.1:2115 doc/tin.1:2230 doc/tin.1:2271 doc/tin.1:2320 doc/tin.1:2351 doc/tin.1:2421 doc/tin.1:2453 doc/tin.1:2473 doc/tin.1:2561 doc/tin.5:1610 doc/tin.5:1796 doc/tin.5:1849 doc/tin.5:1897 doc/tin.5:2007 doc/tin.5:2034 doc/tin.5:2085 doc/tin.5:2115 doc/tin.5:2217 doc/tin.5:2237 doc/tin.5:2337 #, no-wrap msgid "2" msgstr "" #. type: Plain text -#: doc/tin.1:1696 doc/tin.1:1730 +#: doc/tin.1:1702 doc/tin.1:1736 #, no-wrap msgid " ''From:'' (case sensitive)\n" msgstr "" #. type: IP -#: doc/tin.1:1696 doc/tin.1:1730 doc/tin.1:2041 doc/tin.1:2205 doc/tin.1:2247 doc/tin.1:2294 doc/tin.1:2325 doc/tin.1:2395 doc/tin.1:2447 doc/tin.5:1786 doc/tin.5:1998 doc/tin.5:2026 doc/tin.5:2075 doc/tin.5:2105 doc/tin.5:2225 +#: doc/tin.1:1702 doc/tin.1:1736 doc/tin.1:2069 doc/tin.1:2233 doc/tin.1:2275 doc/tin.1:2322 doc/tin.1:2353 doc/tin.1:2423 doc/tin.1:2475 doc/tin.5:1798 doc/tin.5:2010 doc/tin.5:2038 doc/tin.5:2087 doc/tin.5:2117 doc/tin.5:2239 #, no-wrap msgid "3" msgstr "" #. type: Plain text -#: doc/tin.1:1698 doc/tin.1:1732 +#: doc/tin.1:1704 doc/tin.1:1738 #, no-wrap msgid " ''From:'' (ignore case)\n" msgstr "" #. type: IP -#: doc/tin.1:1698 doc/tin.1:1732 doc/tin.1:2043 doc/tin.1:2296 doc/tin.1:2327 doc/tin.1:2398 doc/tin.1:2449 doc/tin.5:1788 doc/tin.5:1891 doc/tin.5:2077 doc/tin.5:2107 doc/tin.5:2227 +#: doc/tin.1:1704 doc/tin.1:1738 doc/tin.1:2071 doc/tin.1:2324 doc/tin.1:2355 doc/tin.1:2426 doc/tin.1:2477 doc/tin.5:1800 doc/tin.5:1903 doc/tin.5:2089 doc/tin.5:2119 doc/tin.5:2241 #, no-wrap msgid "4" msgstr "" #. type: Plain text -#: doc/tin.1:1700 doc/tin.1:1734 +#: doc/tin.1:1706 doc/tin.1:1740 #, no-wrap msgid " ''Message-ID:'' & full ''References:'' line\n" msgstr "" #. type: IP -#: doc/tin.1:1700 doc/tin.1:1734 doc/tin.1:2298 doc/tin.1:2400 doc/tin.1:2452 doc/tin.5:2079 doc/tin.5:2230 +#: doc/tin.1:1706 doc/tin.1:1740 doc/tin.1:2326 doc/tin.1:2428 doc/tin.1:2480 doc/tin.5:2091 doc/tin.5:2244 #, no-wrap msgid "5" msgstr "" #. type: Plain text -#: doc/tin.1:1702 doc/tin.1:1736 +#: doc/tin.1:1708 doc/tin.1:1742 #, no-wrap msgid " ''Message-ID:'' & last ''References:'' entry only\n" msgstr "" #. type: IP -#: doc/tin.1:1702 doc/tin.1:1736 doc/tin.1:2300 doc/tin.1:2454 doc/tin.5:2081 doc/tin.5:2232 +#: doc/tin.1:1708 doc/tin.1:1742 doc/tin.1:2328 doc/tin.1:2482 doc/tin.5:2093 doc/tin.5:2246 #, no-wrap msgid "6" msgstr "" #. type: Plain text -#: doc/tin.1:1704 doc/tin.1:1738 +#: doc/tin.1:1710 doc/tin.1:1744 #, no-wrap msgid " ''Message-ID:'' entry only\n" msgstr "" #. type: IP -#: doc/tin.1:1704 doc/tin.1:1738 doc/tin.1:2303 doc/tin.1:2456 doc/tin.5:2084 doc/tin.5:2234 +#: doc/tin.1:1710 doc/tin.1:1744 doc/tin.1:2331 doc/tin.1:2484 doc/tin.5:2096 doc/tin.5:2248 #, no-wrap msgid "7" msgstr "" #. type: Plain text -#: doc/tin.1:1706 doc/tin.1:1740 +#: doc/tin.1:1712 doc/tin.1:1746 #, no-wrap msgid " ''Lines:''\n" msgstr "" #. type: TP -#: doc/tin.1:1707 +#: doc/tin.1:1713 #, no-wrap msgid "B<(default_filter_select_case)>" msgstr "" #. type: Plain text -#: doc/tin.1:1711 doc/tin.5:1430 +#: doc/tin.1:1717 doc/tin.5:1437 msgid "" "Default for quick (1 key) auto-selection filter case. ON=filter case " "sensitive, OFF=ignore case. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1711 +#: doc/tin.1:1717 #, no-wrap msgid "B<(default_filter_select_expire)>" msgstr "" #. type: Plain text -#: doc/tin.1:1716 +#: doc/tin.1:1722 doc/tin.5:1442 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 -#: doc/tin.1:1716 +#: doc/tin.1:1722 #, no-wrap msgid "B<(default_filter_select_global)>" msgstr "" #. type: Plain text -#: doc/tin.1:1720 +#: doc/tin.1:1726 doc/tin.5:1446 msgid "" "Default for quick (1 key) auto-selection filter global. ON=apply to all " -"groups OFF=apply to current group. Default is ON." +"groups, OFF=apply to current group. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1720 +#: doc/tin.1:1726 #, no-wrap msgid "B<(default_filter_select_header)>" msgstr "" #. type: Plain text -#: doc/tin.1:1723 doc/tin.5:1441 +#: doc/tin.1:1729 doc/tin.5:1449 msgid "Default for quick (1 key) auto-selection filter header." msgstr "" #. type: TP -#: doc/tin.1:1741 +#: doc/tin.1:1747 #, no-wrap msgid "B<(default_goto_group)>" msgstr "" #. type: TP -#: doc/tin.1:1743 +#: doc/tin.1:1749 #, no-wrap msgid "B<(default_group_search)>" msgstr "" #. type: TP -#: doc/tin.1:1745 +#: doc/tin.1:1751 #, no-wrap msgid "B<(default_mail_address)>" msgstr "" #. type: TP -#: doc/tin.1:1747 +#: doc/tin.1:1753 #, no-wrap msgid "B<(default_move_group)>" msgstr "" #. type: TP -#: doc/tin.1:1749 +#: doc/tin.1:1755 #, no-wrap msgid "B<(default_pattern)>" msgstr "" #. type: TP -#: doc/tin.1:1751 +#: doc/tin.1:1757 #, no-wrap msgid "B<(default_pipe_command)>" msgstr "" #. type: TP -#: doc/tin.1:1753 +#: doc/tin.1:1759 #, no-wrap msgid "B<(default_post_newsgroups)>" msgstr "" #. type: TP -#: doc/tin.1:1755 +#: doc/tin.1:1761 #, no-wrap msgid "B<(default_post_subject)>" msgstr "" #. type: TP -#: doc/tin.1:1757 +#: doc/tin.1:1763 #, no-wrap msgid "B<(default_range_group)>" msgstr "" #. type: TP -#: doc/tin.1:1759 +#: doc/tin.1:1765 #, no-wrap msgid "B<(default_range_select)>" msgstr "" #. type: TP -#: doc/tin.1:1761 +#: doc/tin.1:1767 #, no-wrap msgid "B<(default_range_thread)>" msgstr "" #. type: TP -#: doc/tin.1:1763 +#: doc/tin.1:1769 #, no-wrap msgid "B<(default_repost_group)>" msgstr "" #. type: TP -#: doc/tin.1:1765 +#: doc/tin.1:1771 #, no-wrap msgid "B<(default_save_file)>" msgstr "" #. type: TP -#: doc/tin.1:1767 +#: doc/tin.1:1773 #, no-wrap msgid "B<(default_save_mode)>" msgstr "" #. type: TP -#: doc/tin.1:1769 +#: doc/tin.1:1775 #, no-wrap msgid "B<(default_select_pattern)>" msgstr "" #. type: TP -#: doc/tin.1:1771 +#: doc/tin.1:1777 #, no-wrap msgid "B<(default_shell_command)>" msgstr "" #. type: TP -#: doc/tin.1:1773 +#: doc/tin.1:1779 #, no-wrap msgid "B<(default_subject_search)>" msgstr "" #. type: TP -#: doc/tin.1:1775 +#: doc/tin.1:1781 #, no-wrap msgid "B instead of highlighted bar (draw_arrow)>" msgstr "" #. type: Plain text -#: doc/tin.1:1779 +#: doc/tin.1:1785 doc/tin.5:1500 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 -#: doc/tin.1:1779 +#: doc/tin.1:1785 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1783 +#: doc/tin.1:1789 msgid "" "The format string used to create the editor start command with parameters. " -"Default is \"%E +%N %F\" (i.e., /bin/vi +7 .article)." +"Default is \"%E +%N %F\" (e.g., /bin/vi +7 .article)." +msgstr "" + +#. type: TP +#: doc/tin.1:1789 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1792 doc/tin.5:1508 +msgid "If ON quotes from external sources will be detected. Default is OFF." +msgstr "" + +#. type: TP +#: doc/tin.1:1792 +#, no-wrap +msgid "B" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1797 doc/tin.5:1513 +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 -#: doc/tin.1:1783 +#: doc/tin.1:1797 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1787 doc/tin.5:1501 +#: doc/tin.1:1801 doc/tin.5:1517 msgid "" "Specifies whether a screen redraw should always be done after certain " "external commands. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:1787 +#: doc/tin.1:1801 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1793 +#: doc/tin.1:1807 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 " @@ -4272,24 +4266,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1793 +#: doc/tin.1:1807 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1796 doc/tin.5:1519 +#: doc/tin.1:1810 doc/tin.5:1535 msgid "If ON catchup group when leaving with the left arrow key. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1796 +#: doc/tin.1:1810 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1800 +#: doc/tin.1:1814 msgid "" "Format string tin uses for Group level representation. See the section " "\"CUSTOMIZING THE SCREEN FORMAT\". Default is \"%n\\ %m\\ %R\\ %L\\ \\ %s\\ " @@ -4297,13 +4291,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1800 +#: doc/tin.1:1814 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1808 doc/tin.5:1516 +#: doc/tin.1:1822 doc/tin.5:1532 msgid "" "Which keys B should accept to jump to the next unread article. " "Possible is any combination of B and B. When " @@ -4314,60 +4308,46 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1808 -#, no-wrap -msgid "B" -msgstr "" - -#. type: Plain text -#: doc/tin.1:1812 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 -#: doc/tin.1:1812 +#: doc/tin.1:1822 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1821 +#: doc/tin.1:1832 doc/tin.5:1565 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 " -"size and filename (much the same as a MIME attachment). If set to 'Hide all' " -"then any line that looks like uuencoded data will be folded into a tag " -"line. This is useful when uuencoded data is split across more than one " +"size and filename (much the same as a MIME attachment). If set to 'Hide " +"all' then any line that looks like uuencoded data will be folded into a tag " +"line. This is useful when uuencoded data is split across more than one " "article but can also lead to false positives. This setting can also be " -"toggled in the article viewer. Default is 'No'." +"toggled in the article viewer. Default is 'No'." msgstr "" #. type: TP -#: doc/tin.1:1821 +#: doc/tin.1:1832 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1828 +#: doc/tin.1:1839 doc/tin.5:1572 msgid "" "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 " +"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 -#: doc/tin.1:1828 +#: doc/tin.1:1839 #, no-wrap msgid "B<(info_in_last_line)>" msgstr "" -#. this is missing from the Menu #. type: Plain text -#: doc/tin.1:1835 +#: doc/tin.1:1846 doc/tin.5:1578 msgid "" "If ON, show current group description or article subject in the last line " "(not in the pager and global menu) - B ('B') toggles " @@ -4376,13 +4356,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1835 +#: doc/tin.1:1846 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1842 +#: doc/tin.1:1853 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, " @@ -4395,26 +4375,26 @@ msgstr "" #. mono_mark* currently do allow "Reverse video" even if #. inverse_okay=FALSE #. type: TP -#: doc/tin.1:1842 +#: doc/tin.1:1853 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1849 doc/tin.5:1576 +#: doc/tin.1:1860 doc/tin.5:1588 msgid "" "If ON use inverse video for page headers and URL highlighting. Default is " "ON." msgstr "" #. type: TP -#: doc/tin.1:1849 +#: doc/tin.1:1860 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1854 doc/tin.5:1581 +#: doc/tin.1:1865 doc/tin.5:1593 msgid "" "If ON keep all failed postings in I<${TIN_HOMEDIR:-\"$HOME\"}/dead.articles> " "besides keeping the last failed posting in " @@ -4422,20 +4402,20 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1854 +#: doc/tin.1:1865 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1858 +#: doc/tin.1:1869 msgid "" "This option controls the processing and display of articles that are " "killed. There are 3 options:" msgstr "" #. type: Plain text -#: doc/tin.1:1865 +#: doc/tin.1:1876 msgid "" "B is the 'traditional' behavior of B. Only " "unread articles are killed once only by marking them read. As filtering only " @@ -4445,7 +4425,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1870 doc/tin.5:1598 +#: doc/tin.1:1881 doc/tin.5:1610 msgid "" "B will process all articles in the group and " "therefore there is a processing overhead when using this option. Killed " @@ -4454,7 +4434,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1874 doc/tin.5:1602 +#: doc/tin.1:1885 doc/tin.5:1614 msgid "" "B will process all articles in the group and " "therefore there is a processing overhead when using this option. Killed " @@ -4462,59 +4442,59 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1876 +#: doc/tin.1:1887 msgid "Default is 0 (B)." msgstr "" #. type: TP -#: doc/tin.1:1876 +#: doc/tin.1:1887 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1882 +#: doc/tin.1:1893 doc/tin.5:1621 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 -#: doc/tin.1:1882 +#: doc/tin.1:1893 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1888 doc/tin.5:1615 +#: doc/tin.1:1899 doc/tin.5:1627 msgid "" "User's mail address (and full name), if not username@host. This is used when " "creating articles, sending mail and when B<\\%pgp>(1) signing." msgstr "" #. type: TP -#: doc/tin.1:1888 +#: doc/tin.1:1899 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1892 doc/tin.5:1619 +#: doc/tin.1:1903 doc/tin.5:1631 msgid "" "MIME encoding of the body in mail message, if necessary (8bit, base64, " "quoted-printable, 7bit). Default is quoted-printable." msgstr "" #. type: TP -#: doc/tin.1:1892 +#: doc/tin.1:1903 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1897 doc/tin.5:1624 +#: doc/tin.1:1908 doc/tin.5:1636 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, " @@ -4522,13 +4502,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1897 +#: doc/tin.1:1908 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1907 doc/tin.5:1634 +#: doc/tin.1:1918 doc/tin.5:1646 msgid "" "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 " @@ -4537,13 +4517,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1907 +#: doc/tin.1:1918 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1916 +#: doc/tin.1:1927 doc/tin.5:1655 msgid "" "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 " @@ -4553,32 +4533,62 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1916 +#: doc/tin.1:1927 #, no-wrap msgid "B" msgstr "" -#. TODO: document %S, %T, %M, %F, %U ... #. type: Plain text -#: doc/tin.1:1925 +#: doc/tin.1:1933 doc/tin.5:1661 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' " "(e.g., /bin/mail \"iain\" E .article). The flexible format allows other " -"mailers with different command-line parameters to be used such as 'elm -s " -"\"%S\" \"%T\" E \"%F\"' (e.g., elm -s \"subject\" \"iain\" E " -".article) or 'sendmail -oi -oem -t E %F' (e.g. sendmail -oi -oem -t " -"E .article)." +"mailers with different command line parameters to be used such as" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1938 doc/tin.5:1666 +#, no-wrap +msgid "" +"sendmail -oem -t E %F\n" +"elm -s \"%S\" \"%T\" E \"%F\"\n" +"claws-mail --compose \"mailto:%T?subject=%S&insert=%F\"\n" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1942 doc/tin.5:1670 +msgid "" +"B must be set adequate. The following substitutions are " +"supported:" +msgstr "" + +#. type: ta +#: doc/tin.1:1944 doc/tin.5:1672 +#, no-wrap +msgid "\\w'%S'u +\\w'default_mailer'u" +msgstr "" + +#. type: Plain text +#: doc/tin.1:1951 doc/tin.5:1679 +#, no-wrap +msgid "" +"%F\tfilename\n" +"%M\tdefault_mailer\n" +"%S\tsubject-field\n" +"%T\tto-filed\n" +"%U\tusername\n" +"%%\t%\n" msgstr "" #. type: TP -#: doc/tin.1:1925 +#: doc/tin.1:1953 #, no-wrap msgid "B<'Mark as (un)read' ignores tags (mark_ignore_tags)>" msgstr "" #. type: Plain text -#: doc/tin.1:1933 doc/tin.5:1680 +#: doc/tin.1:1961 doc/tin.5:1692 msgid "" "When this is ON, the B ('B'), B " "('B'), B ('B') at Group level and B " @@ -4589,41 +4599,41 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1933 +#: doc/tin.1:1961 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1936 doc/tin.5:1672 +#: doc/tin.1:1964 doc/tin.5:1684 msgid "If ON mark articles that are saved as read. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:1936 +#: doc/tin.1:1964 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1948 +#: doc/tin.1:1976 doc/tin.5:1704 msgid "" "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<\\%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." +"any attachments. See also B." msgstr "" #. type: TP -#: doc/tin.1:1948 +#: doc/tin.1:1976 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1961 +#: doc/tin.1:1989 doc/tin.5:1717 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 " @@ -4637,13 +4647,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1961 +#: doc/tin.1:1989 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1972 +#: doc/tin.1:2000 doc/tin.5:1728 msgid "" "Charset used for posting and MIME headers; replaces B. " "Conversion between B and local charset (determined via " @@ -4654,14 +4664,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:1975 doc/tin.5:1719 +#: doc/tin.1:2003 doc/tin.5:1731 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 -#: doc/tin.1:1981 doc/tin.5:1725 +#: doc/tin.1:2009 doc/tin.5:1737 msgid "" "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 " @@ -4670,13 +4680,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1981 +#: doc/tin.1:2009 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1986 +#: doc/tin.1:2014 doc/tin.5:1742 msgid "" "Character attribute of words emphasized like _this_. It depends on your " "terminal which attributes are usable. See also B and " @@ -4684,13 +4694,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1986 +#: doc/tin.1:2014 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1991 +#: doc/tin.1:2019 doc/tin.5:1747 msgid "" "Character attribute of words emphasized like /this/. It depends on your " "terminal which attributes are usable. See also B and " @@ -4698,13 +4708,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1991 +#: doc/tin.1:2019 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:1996 +#: doc/tin.1:2024 doc/tin.5:1752 msgid "" "Character attribute of words emphasized like *this*. It depends on your " "terminal which attributes are usable. See also B and " @@ -4712,13 +4722,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:1996 +#: doc/tin.1:2024 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2001 +#: doc/tin.1:2029 doc/tin.5:1757 msgid "" "Character attribute of words emphasized like -this-. It depends on your " "terminal which attributes are usable. See also B and " @@ -4726,26 +4736,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2001 +#: doc/tin.1:2029 #, no-wrap msgid "B<(newnews)>" msgstr "" #. type: Plain text -#: doc/tin.1:2005 +#: doc/tin.1:2033 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 -#: doc/tin.1:2005 +#: doc/tin.1:2033 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2012 +#: doc/tin.1:2040 doc/tin.5:1770 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 " @@ -4755,30 +4765,30 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2012 +#: doc/tin.1:2040 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2021 +#: doc/tin.1:2049 doc/tin.5:1779 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 " -"Thing(tm), but thought Alan and Pape were miscreants... well then you would " -"do something like this: I " -"I. Not defining anything turns " -"off this option." +"example of using both options might be if you thought 'X-' headers were A " +"Good Thing(tm), but thought Alan and Pape were miscreants... well then you " +"would do something like this: B " +"B Not defining anything turns off " +"this option." msgstr "" #. type: TP -#: doc/tin.1:2021 +#: doc/tin.1:2049 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2026 doc/tin.5:1772 +#: doc/tin.1:2054 doc/tin.5:1784 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, " @@ -4786,84 +4796,84 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2026 +#: doc/tin.1:2054 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2030 +#: doc/tin.1:2058 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:2030 +#: doc/tin.1:2058 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2034 +#: doc/tin.1:2062 msgid "" "The normalization form B should use to normalize unicode input. The " "possible values are:" msgstr "" #. type: Plain text -#: doc/tin.1:2037 doc/tin.5:1782 +#: doc/tin.1:2065 doc/tin.5:1794 msgid "B: no normalization" msgstr "" #. type: Plain text -#: doc/tin.1:2039 doc/tin.5:1784 +#: doc/tin.1:2067 doc/tin.5:1796 msgid "B: Compatibility Decomposition, followed by Canonical Composition" msgstr "" #. type: Plain text -#: doc/tin.1:2041 doc/tin.5:1786 +#: doc/tin.1:2069 doc/tin.5:1798 msgid "B: Compatibility Decomposition" msgstr "" #. type: Plain text -#: doc/tin.1:2043 doc/tin.5:1788 +#: doc/tin.1:2071 doc/tin.5:1800 msgid "B: Canonical Decomposition, followed by Canonical Composition" msgstr "" #. type: Plain text -#: doc/tin.1:2045 doc/tin.5:1790 +#: doc/tin.1:2073 doc/tin.5:1802 msgid "B: Canonical Decomposition" msgstr "" #. type: Plain text -#: doc/tin.1:2049 +#: doc/tin.1:2077 msgid "" "Some normalization modes are only available if they are supported by the " "library B uses to do the normalization. NFC should be used if possible." msgstr "" #. type: TP -#: doc/tin.1:2049 +#: doc/tin.1:2077 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2053 +#: doc/tin.1:2081 doc/tin.5:1811 msgid "" "If ON put cursor at first unread article in group otherwise at last " "article. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2053 +#: doc/tin.1:2081 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2064 doc/tin.5:1810 +#: doc/tin.1:2092 doc/tin.5:1822 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 " @@ -4876,27 +4886,27 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2064 +#: doc/tin.1:2092 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2069 +#: doc/tin.1:2097 doc/tin.5:1827 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." +"quoted-printable, 7bit). Default is 8bit, which leads to no encoding. " +"base64 and quoted-printable are usually undesired on usenet." msgstr "" #. type: TP -#: doc/tin.1:2069 +#: doc/tin.1:2097 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2076 +#: doc/tin.1:2104 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 " @@ -4904,41 +4914,41 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2076 +#: doc/tin.1:2104 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2080 +#: doc/tin.1:2108 msgid "" "This specifies whether to perform post processing on saved articles. The " "following values are allowed:" msgstr "" #. type: Plain text -#: doc/tin.1:2083 doc/tin.5:1832 +#: doc/tin.1:2111 doc/tin.5:1844 msgid "B (default), no post processing is done." msgstr "" #. type: Plain text -#: doc/tin.1:2087 +#: doc/tin.1:2115 msgid "B, unpacking of multi-part B<\\%shar>(1) files only." msgstr "" #. type: Plain text -#: doc/tin.1:2089 doc/tin.5:1839 +#: doc/tin.1:2117 doc/tin.5:1851 msgid "B, binary attachments and data will be decoded and saved." msgstr "" #. type: TP -#: doc/tin.1:2090 +#: doc/tin.1:2118 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2096 doc/tin.5:1846 +#: doc/tin.1:2124 doc/tin.5:1858 msgid "" "Keep posted articles in " "I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/>B. If no filename " @@ -4946,26 +4956,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2096 +#: doc/tin.1:2124 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2100 doc/tin.5:1850 +#: doc/tin.1:2128 doc/tin.5:1862 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 -#: doc/tin.1:2100 +#: doc/tin.1:2128 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2109 +#: doc/tin.1:2137 msgid "" "The printer program with options that is to be used to print articles. The " "default is B<\\%lpr>(1) for BSD machines and B<\\%lp>(1) for SysV " @@ -4974,40 +4984,40 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2109 +#: doc/tin.1:2137 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2113 doc/tin.5:1864 +#: doc/tin.1:2141 doc/tin.5:1876 msgid "" "If ON only save/print/pipe/mail unread articles (tagged articles excepted). " "Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:2113 +#: doc/tin.1:2141 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2116 +#: doc/tin.1:2144 msgid "" "If ON show empty ''Followup-To:'' header when editing an article. Default is " "OFF." msgstr "" #. type: TP -#: doc/tin.1:2116 +#: doc/tin.1:2144 #, no-wrap msgid "B" msgstr "" #. TODO: document %s #. type: Plain text -#: doc/tin.1:2121 doc/tin.5:1874 +#: doc/tin.1:2149 doc/tin.5:1886 msgid "" "The character used in quoting included text to article followups and mail " "replies. The '_' character represents a blank character and is replaced with " @@ -5015,13 +5025,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2121 +#: doc/tin.1:2149 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2128 +#: doc/tin.1:2156 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, " @@ -5032,7 +5042,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2132 +#: doc/tin.1:2160 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 " @@ -5040,13 +5050,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2132 +#: doc/tin.1:2160 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2137 +#: doc/tin.1:2165 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -5054,13 +5064,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2137 +#: doc/tin.1:2165 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2142 +#: doc/tin.1:2170 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -5068,13 +5078,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2142 +#: doc/tin.1:2170 #, no-wrap msgid "B= 3 times q.l. (quote_regex3)>" msgstr "" #. type: Plain text -#: doc/tin.1:2147 +#: doc/tin.1:2175 msgid "" "A regular expression that will be applied when reading articles. All " "matching lines are shown in B. If B is blank, then " @@ -5082,39 +5092,39 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2147 +#: doc/tin.1:2175 #, no-wrap msgid "B
" msgstr "" #. type: Plain text -#: doc/tin.1:2151 doc/tin.5:1919 +#: doc/tin.1:2179 doc/tin.5:1931 msgid "" "If set to 0, this feature is deactivated, otherwise it means the number of " "days. Default is 2." msgstr "" #. type: TP -#: doc/tin.1:2151 +#: doc/tin.1:2179 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2155 doc/tin.5:1923 +#: doc/tin.1:2183 doc/tin.5:1935 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 -#: doc/tin.1:2155 +#: doc/tin.1:2183 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2160 doc/tin.5:1928 +#: doc/tin.1:2188 doc/tin.5:1940 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 " @@ -5122,95 +5132,95 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2160 +#: doc/tin.1:2188 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2164 doc/tin.5:1932 +#: doc/tin.1:2192 doc/tin.5:1944 msgid "" "Directory where articles/threads are saved. Default is " "I<${TIN_HOMEDIR:-\"$HOME\"}/News>." msgstr "" #. type: TP -#: doc/tin.1:2164 +#: doc/tin.1:2192 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2168 doc/tin.5:1936 +#: doc/tin.1:2196 doc/tin.5:1948 msgid "" "If the score of an article is below or equal this value the article gets " "marked as killed." msgstr "" #. type: TP -#: doc/tin.1:2168 +#: doc/tin.1:2196 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2172 doc/tin.5:1940 +#: doc/tin.1:2200 doc/tin.5:1952 msgid "" "If the score of an article is above or equal this value the article gets " "marked as hot." msgstr "" #. type: TP -#: doc/tin.1:2172 +#: doc/tin.1:2200 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2176 doc/tin.5:1944 +#: doc/tin.1:2204 doc/tin.5:1956 msgid "" "Score of an article which should be killed, this must be E= " "B." msgstr "" #. type: TP -#: doc/tin.1:2176 +#: doc/tin.1:2204 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2180 doc/tin.5:1948 +#: doc/tin.1:2208 doc/tin.5:1960 msgid "" "Score of an article which should be marked hot, this must be E= " "B." msgstr "" #. type: TP -#: doc/tin.1:2180 +#: doc/tin.1:2208 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2188 +#: doc/tin.1:2216 doc/tin.5:1968 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 " "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. " "This setting supersedes show_last_line_prev_page=ON. Set to -2 to get " -"half-page scrolling. This setting supersedes full_page_scroll=OFF." +"half-page scrolling. This setting supersedes B=OFF." msgstr "" #. type: TP -#: doc/tin.1:2188 +#: doc/tin.1:2216 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2192 +#: doc/tin.1:2220 msgid "" "Format string tin uses for Selection level representation. See the section " "\"CUSTOMIZING THE SCREEN FORMAT\". Default is \"%f\\ %n\\ %U\\ \\ %G\\ \\ " @@ -5218,52 +5228,52 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2192 +#: doc/tin.1:2220 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2196 doc/tin.5:1989 +#: doc/tin.1:2224 doc/tin.5:2001 msgid "" "Which information about the author should be shown. Default is 2, authors " "full name." msgstr "" #. type: Plain text -#: doc/tin.1:2199 doc/tin.5:1992 +#: doc/tin.1:2227 doc/tin.5:2004 msgid "B, only the ''Subject:'' line will be displayed." msgstr "" #. type: Plain text -#: doc/tin.1:2202 doc/tin.5:1995 +#: doc/tin.1:2230 doc/tin.5:2007 msgid "" "B
, ''Subject:'' line & the address part of the ''From:'' line are " "displayed." msgstr "" #. type: Plain text -#: doc/tin.1:2205 doc/tin.5:1998 +#: doc/tin.1:2233 doc/tin.5:2010 msgid "" "B, ''Subject:'' line & the authors full name part of the " "\\&''From:'' line are displayed (default)." msgstr "" #. type: Plain text -#: doc/tin.1:2208 doc/tin.5:2001 +#: doc/tin.1:2236 doc/tin.5:2013 msgid "" "B
, ''Subject:'' line & all of the ''From:'' line are " "displayed." msgstr "" #. type: TP -#: doc/tin.1:2209 +#: doc/tin.1:2237 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2218 +#: doc/tin.1:2246 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 " @@ -5274,48 +5284,48 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2218 +#: doc/tin.1:2246 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2221 doc/tin.5:1974 +#: doc/tin.1:2249 doc/tin.5:1986 msgid "Function used for sorting articles. Default is 0." msgstr "" #. type: Plain text -#: doc/tin.1:2226 doc/tin.5:1979 +#: doc/tin.1:2254 doc/tin.5:1991 msgid "Use B<\\%qsort>(3) for sorting." msgstr "" #. type: Plain text -#: doc/tin.1:2231 doc/tin.5:1984 +#: doc/tin.1:2259 doc/tin.5:1996 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:2232 +#: doc/tin.1:2260 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2236 doc/tin.5:2015 +#: doc/tin.1:2264 doc/tin.5:2027 msgid "" "Which information about the thread or article should be shown. Default is 1, " "show only the line count." msgstr "" #. type: Plain text -#: doc/tin.1:2239 doc/tin.5:2018 +#: doc/tin.1:2267 doc/tin.5:2030 msgid "B, no information will be displayed." msgstr "" #. type: Plain text -#: doc/tin.1:2243 +#: doc/tin.1:2271 doc/tin.5:2034 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 " @@ -5323,7 +5333,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2247 doc/tin.5:2026 +#: doc/tin.1:2275 doc/tin.5:2038 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 " @@ -5331,66 +5341,66 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2249 doc/tin.5:2028 +#: doc/tin.1:2277 doc/tin.5:2040 msgid "B, display line count and score." msgstr "" #. type: TP -#: doc/tin.1:2250 +#: doc/tin.1:2278 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2254 +#: doc/tin.1:2282 doc/tin.5:2045 msgid "" "If ON show only new/unread articles otherwise show all articles. Default is " "ON." msgstr "" #. type: TP -#: doc/tin.1:2254 +#: doc/tin.1:2282 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2258 doc/tin.5:2037 +#: doc/tin.1:2286 doc/tin.5:2049 msgid "" "If ON show only subscribed groups that contain unread articles. Default is " "OFF." msgstr "" #. type: TP -#: doc/tin.1:2258 +#: doc/tin.1:2286 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2262 +#: doc/tin.1:2290 msgid "If OFF don't show signatures when displaying articles. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2262 +#: doc/tin.1:2290 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2265 doc/tin.5:2043 +#: doc/tin.1:2293 doc/tin.5:2055 msgid "If ON prepend the signature with sigdashes. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2265 +#: doc/tin.1:2293 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2275 +#: doc/tin.1:2303 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 " @@ -5402,24 +5412,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2275 +#: doc/tin.1:2303 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2278 doc/tin.5:2057 +#: doc/tin.1:2306 doc/tin.5:2069 msgid "If ON add signature to reposted articles. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2278 +#: doc/tin.1:2306 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2283 +#: doc/tin.1:2311 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -5427,141 +5437,141 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2283 +#: doc/tin.1:2311 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2287 doc/tin.5:2068 +#: doc/tin.1:2315 doc/tin.5:2080 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 -#: doc/tin.1:2290 doc/tin.5:2071 +#: doc/tin.1:2318 doc/tin.5:2083 msgid "B, don't sort articles." msgstr "" #. type: Plain text -#: doc/tin.1:2292 doc/tin.5:2073 +#: doc/tin.1:2320 doc/tin.5:2085 msgid "B, sort articles by ''Subject:'' field descending." msgstr "" #. type: Plain text -#: doc/tin.1:2294 doc/tin.5:2075 +#: doc/tin.1:2322 doc/tin.5:2087 msgid "B, sort articles by ''Subject:'' field ascending." msgstr "" #. type: Plain text -#: doc/tin.1:2296 doc/tin.5:2077 +#: doc/tin.1:2324 doc/tin.5:2089 msgid "B, sort articles by ''From:'' field descending." msgstr "" #. type: Plain text -#: doc/tin.1:2298 doc/tin.5:2079 +#: doc/tin.1:2326 doc/tin.5:2091 msgid "B, sort articles by ''From:'' field ascending." msgstr "" #. type: Plain text -#: doc/tin.1:2300 doc/tin.5:2081 +#: doc/tin.1:2328 doc/tin.5:2093 msgid "B, sort articles by ''Date:'' field descending." msgstr "" #. type: Plain text -#: doc/tin.1:2303 doc/tin.5:2084 +#: doc/tin.1:2331 doc/tin.5:2096 msgid "B, sort articles by ''Date:'' field ascending (default)." msgstr "" #. type: Plain text -#: doc/tin.1:2305 doc/tin.5:2086 +#: doc/tin.1:2333 doc/tin.5:2098 msgid "B, sort articles by filtering score descending." msgstr "" #. type: IP -#: doc/tin.1:2305 doc/tin.5:2086 +#: doc/tin.1:2333 doc/tin.5:2098 #, no-wrap msgid "8" msgstr "" #. type: Plain text -#: doc/tin.1:2307 doc/tin.5:2088 +#: doc/tin.1:2335 doc/tin.5:2100 msgid "B, sort articles by filtering score ascending." msgstr "" #. type: IP -#: doc/tin.1:2307 doc/tin.5:2088 +#: doc/tin.1:2335 doc/tin.5:2100 #, no-wrap msgid "9" msgstr "" #. type: Plain text -#: doc/tin.1:2309 doc/tin.5:2090 +#: doc/tin.1:2337 doc/tin.5:2102 msgid "B, sort articles by ''Lines:'' field descending." msgstr "" #. type: IP -#: doc/tin.1:2309 doc/tin.5:2090 +#: doc/tin.1:2337 doc/tin.5:2102 #, no-wrap msgid "10" msgstr "" #. type: Plain text -#: doc/tin.1:2311 doc/tin.5:2092 +#: doc/tin.1:2339 doc/tin.5:2104 msgid "B, sort articles by ''Lines:'' field ascending." msgstr "" #. type: TP -#: doc/tin.1:2312 +#: doc/tin.1:2340 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2317 doc/tin.5:2097 +#: doc/tin.1:2345 doc/tin.5:2109 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 -#: doc/tin.1:2320 doc/tin.5:2100 +#: doc/tin.1:2348 doc/tin.5:2112 msgid "B, don't sort threads." msgstr "" #. type: Plain text -#: doc/tin.1:2323 doc/tin.5:2103 +#: doc/tin.1:2351 doc/tin.5:2115 msgid "B, sort threads by filtering score descending (default)." msgstr "" #. type: Plain text -#: doc/tin.1:2325 doc/tin.5:2105 +#: doc/tin.1:2353 doc/tin.5:2117 msgid "B, sort threads by filtering score ascending." msgstr "" #. type: Plain text -#: doc/tin.1:2327 doc/tin.5:2107 +#: doc/tin.1:2355 doc/tin.5:2119 msgid "" "B, sort threads by date of last posting " "descending." msgstr "" #. type: Plain text -#: doc/tin.1:2329 doc/tin.5:2109 +#: doc/tin.1:2357 doc/tin.5:2121 msgid "" "B, sort threads by date of last posting " "ascending." msgstr "" #. type: TP -#: doc/tin.1:2330 +#: doc/tin.1:2358 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2335 +#: doc/tin.1:2363 doc/tin.5:2127 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 " @@ -5569,18 +5579,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2337 +#: doc/tin.1:2365 doc/tin.5:2129 msgid "I" msgstr "" #. type: TP -#: doc/tin.1:2337 +#: doc/tin.1:2365 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2342 +#: doc/tin.1:2370 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -5588,13 +5598,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2342 +#: doc/tin.1:2370 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2347 doc/tin.5:2127 +#: doc/tin.1:2375 doc/tin.5:2141 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 " @@ -5602,26 +5612,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2347 +#: doc/tin.1:2375 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2353 doc/tin.5:2131 +#: doc/tin.1:2381 doc/tin.5:2145 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 -#: doc/tin.1:2353 +#: doc/tin.1:2381 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2362 doc/tin.5:2140 +#: doc/tin.1:2390 doc/tin.5:2154 msgid "" "Bogus groups are groups that are present in your " "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file that no longer exist on the news " @@ -5633,26 +5643,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2362 +#: doc/tin.1:2390 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2366 doc/tin.5:2144 +#: doc/tin.1:2394 doc/tin.5:2158 msgid "" "If ON, then unsubscribed groups will be permanently removed from your " "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc> file. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:2366 +#: doc/tin.1:2394 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2371 +#: doc/tin.1:2399 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -5660,13 +5670,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2371 +#: doc/tin.1:2399 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2376 doc/tin.5:2346 +#: doc/tin.1:2404 doc/tin.5:2364 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 " @@ -5674,26 +5684,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2376 +#: doc/tin.1:2404 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2380 +#: doc/tin.1:2408 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 -#: doc/tin.1:2380 +#: doc/tin.1:2408 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2388 +#: doc/tin.1:2416 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 " @@ -5704,60 +5714,60 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2391 +#: doc/tin.1:2419 msgid "B, don't thread." msgstr "" #. type: Plain text -#: doc/tin.1:2393 +#: doc/tin.1:2421 msgid "B, thread on ''Subject:'' only." msgstr "" #. type: Plain text -#: doc/tin.1:2395 +#: doc/tin.1:2423 msgid "B, thread on ''References:'' only." msgstr "" #. type: Plain text -#: doc/tin.1:2398 +#: doc/tin.1:2426 msgid "" "B, thread on ''References:'' then " "\\&''Subject:'' (default)." msgstr "" #. type: Plain text -#: doc/tin.1:2400 +#: doc/tin.1:2428 msgid "B, thread multipart articles on ''Subject:''." msgstr "" #. type: Plain text -#: doc/tin.1:2403 +#: doc/tin.1:2431 msgid "" "B, thread base upon a partial character match on " "\\&''Subject:''." msgstr "" #. type: TP -#: doc/tin.1:2404 +#: doc/tin.1:2432 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2408 doc/tin.5:2194 +#: doc/tin.1:2436 doc/tin.5:2208 msgid "" "If ON catchup group/thread when leaving with the left arrow key. Default is " "ON." msgstr "" #. type: TP -#: doc/tin.1:2408 +#: doc/tin.1:2436 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2412 +#: doc/tin.1:2440 msgid "" "Format string tin uses for Thread level representation. See the section " "\"CUSTOMIZING THE SCREEN FORMAT\". Default is \"%n\\ %m\\ \\ [%L]\\ \\ %T\\ " @@ -5765,54 +5775,54 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2412 +#: doc/tin.1:2440 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2416 +#: doc/tin.1:2444 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 -#: doc/tin.1:2416 +#: doc/tin.1:2444 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2420 doc/tin.5:2198 +#: doc/tin.1:2448 doc/tin.5:2212 msgid "" "How the total score of a thread is computed. Default is 0, the maximum score " "in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:2423 doc/tin.5:2201 +#: doc/tin.1:2451 doc/tin.5:2215 msgid "B, the maximum score in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:2425 doc/tin.5:2203 +#: doc/tin.1:2453 doc/tin.5:2217 msgid "B, the sum of all scores in this thread." msgstr "" #. type: Plain text -#: doc/tin.1:2427 doc/tin.5:2205 +#: doc/tin.1:2455 doc/tin.5:2219 msgid "B, the average score in this thread." msgstr "" #. type: TP -#: doc/tin.1:2428 +#: doc/tin.1:2456 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2436 doc/tin.5:2214 +#: doc/tin.1:2464 doc/tin.5:2228 msgid "" "If ON append //TRANSLIT to the first argument of B<\\%iconv_open>(3) to " "enable transliteration. This means that when a character cannot be " @@ -5822,70 +5832,70 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2436 +#: doc/tin.1:2464 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2440 doc/tin.5:2218 +#: doc/tin.1:2468 doc/tin.5:2232 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 -#: doc/tin.1:2443 doc/tin.5:2221 +#: doc/tin.1:2471 doc/tin.5:2235 msgid "B, do nothing." msgstr "" #. type: Plain text -#: doc/tin.1:2445 doc/tin.5:2223 +#: doc/tin.1:2473 doc/tin.5:2237 msgid "B." msgstr "" #. type: Plain text -#: doc/tin.1:2447 doc/tin.5:2225 +#: doc/tin.1:2475 doc/tin.5:2239 msgid "B." msgstr "" #. type: Plain text -#: doc/tin.1:2449 doc/tin.5:2227 +#: doc/tin.1:2477 doc/tin.5:2241 msgid "" "B, skip leading and trailing blank " "lines." msgstr "" #. type: Plain text -#: doc/tin.1:2452 doc/tin.5:2230 +#: doc/tin.1:2480 doc/tin.5:2244 msgid "" "B, replace multiple blank lines between " "textblocks with one blank line." msgstr "" #. type: Plain text -#: doc/tin.1:2454 doc/tin.5:2232 +#: doc/tin.1:2482 doc/tin.5:2246 msgid "B, 4 + 1" msgstr "" #. type: Plain text -#: doc/tin.1:2456 doc/tin.5:2234 +#: doc/tin.1:2484 doc/tin.5:2248 msgid "B, 4 + 2" msgstr "" #. type: Plain text -#: doc/tin.1:2458 doc/tin.5:2236 +#: doc/tin.1:2486 doc/tin.5:2250 msgid "B, 4 + 3" msgstr "" #. type: TP -#: doc/tin.1:2459 +#: doc/tin.1:2487 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2464 +#: doc/tin.1:2492 msgid "" "A regular expression that will be applied when reading articles. All " "matching words are shown in B or B. If " @@ -5893,142 +5903,142 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2464 +#: doc/tin.1:2492 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2467 +#: doc/tin.1:2495 msgid "If ON remove I<~/.article> after posting. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2467 +#: doc/tin.1:2495 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2472 +#: doc/tin.1:2500 doc/tin.5:2267 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." +"The program that will be run when launching URLs in the article viewer using " +"B ('B'). The actual URL will be appended to this. Default is " +"B." msgstr "" #. type: TP -#: doc/tin.1:2472 +#: doc/tin.1:2500 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2475 doc/tin.5:2256 +#: doc/tin.1:2503 doc/tin.5:2270 msgid "Enable highlighting URLs in message body. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2475 +#: doc/tin.1:2503 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2478 +#: doc/tin.1:2506 msgid "If enabled B uses ANSI-colors. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:2478 +#: doc/tin.1:2506 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:2481 +#: doc/tin.1:2509 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2487 doc/tin.5:2270 +#: doc/tin.1:2515 doc/tin.5:2284 msgid "" "Allows the mouse button support in a B<\\%xterm>(1x) to be " "enabled/disabled. Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:2487 +#: doc/tin.1:2515 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2497 +#: doc/tin.1:2525 msgid "" "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 " +"header. For this option to have any effect, B must be running in a " "B<\\%xterm>(1x) and B<\\%slrnface>(1) must be in your $B. Default is " "OFF." msgstr "" #. type: TP -#: doc/tin.1:2497 +#: doc/tin.1:2525 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2501 doc/tin.5:2286 +#: doc/tin.1:2529 doc/tin.5:2300 msgid "" "If ON use UTF-8 characters for indicator ('-E'), thread/attachment tree " "and ellipsis ('...'). Default is OFF." msgstr "" #. type: TP -#: doc/tin.1:2501 +#: doc/tin.1:2529 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2504 +#: doc/tin.1:2532 msgid "" "A regular expression that tin will use to find the begin of a verbatim " "block." msgstr "" #. type: TP -#: doc/tin.1:2504 +#: doc/tin.1:2532 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2507 +#: doc/tin.1:2535 msgid "A regular expression that tin will use to find the end of a verbatim block." msgstr "" #. type: TP -#: doc/tin.1:2507 +#: doc/tin.1:2535 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2510 +#: doc/tin.1:2538 msgid "If ON verbatim blocks will be detected. Default is ON." msgstr "" #. type: TP -#: doc/tin.1:2510 +#: doc/tin.1:2538 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2524 +#: doc/tin.1:2552 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. " @@ -6040,41 +6050,41 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2524 +#: doc/tin.1:2552 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2528 doc/tin.5:2314 +#: doc/tin.1:2556 doc/tin.5:2332 msgid "" "Should the leading and ending stars, slashes, strokes and dashes also be " "displayed, even when they are highlighting marks?" msgstr "" #. type: Plain text -#: doc/tin.1:2531 doc/tin.5:2317 +#: doc/tin.1:2559 doc/tin.5:2335 msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2533 doc/tin.5:2319 +#: doc/tin.1:2561 doc/tin.5:2337 msgid "yes, B" msgstr "" #. type: Plain text -#: doc/tin.1:2535 doc/tin.5:2321 +#: doc/tin.1:2563 doc/tin.5:2339 msgid "print a B instead" msgstr "" #. type: TP -#: doc/tin.1:2536 +#: doc/tin.1:2564 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2544 +#: doc/tin.1:2572 doc/tin.5:2348 msgid "" "Enable word highlighting. See B for the options " "available. If B is enabled the colors specified in " @@ -6085,13 +6095,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2544 +#: doc/tin.1:2572 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2555 doc/tin.5:2341 +#: doc/tin.1:2583 doc/tin.5:2359 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 " @@ -6104,26 +6114,26 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2555 +#: doc/tin.1:2583 #, no-wrap -msgid "B" +msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2562 doc/tin.5:2351 +#: doc/tin.1:2590 doc/tin.5:2369 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 -#: doc/tin.1:2562 +#: doc/tin.1:2590 #, no-wrap msgid "ATTRIBUTES MENU AND GROUP ATTRIBUTES" msgstr "" #. type: Plain text -#: doc/tin.1:2569 +#: doc/tin.1:2597 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> " @@ -6134,29 +6144,29 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2577 +#: doc/tin.1:2605 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 " +"to change (e.g., B). All toggle attributes are set by specifying " "ON/OFF. Otherwise, these function exactly the same as their global " "equivalents. For more details see B<\\%tin>(5)." msgstr "" #. type: Plain text -#: doc/tin.1:2584 +#: doc/tin.1:2612 msgid "" "Attributes can also be changed from the attributes menu which can be " "accessed by B ('BTABE>') from the options menu " "or B ('B<^J>' or 'BCRE>') from the scopes menu. The " "attributes menu looks and behaves very similar to the options menu. The " "title shows the current scope. Attributes set in the current scope are " -"marked with '\\+' to the left of the attributes number." +"marked with '+' to the left of the attributes number." msgstr "" #. type: Plain text -#: doc/tin.1:2591 +#: doc/tin.1:2619 msgid "" "Besides the keys for moving around and changing values known from the " "options menu the attributes menu provides the following command: " @@ -6164,13 +6174,13 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:2591 +#: doc/tin.1:2619 #, no-wrap msgid "SCOPES MENU" msgstr "" #. type: Plain text -#: doc/tin.1:2596 +#: doc/tin.1:2624 msgid "" "The scopes menu (accessible from the options menu with B " "('B')) shows all scopes read from the global and local attributes file. " @@ -6179,7 +6189,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2607 +#: doc/tin.1:2635 msgid "" "In addition to the common moving keys the following commands are available: " "B ('B<^J>' or 'BCRE>') enter the attributes menu for " @@ -6192,14 +6202,14 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:2607 +#: doc/tin.1:2635 #, no-wrap msgid "FILTERING ARTICLES" msgstr "" #. FIXME - add scoring description #. type: Plain text -#: doc/tin.1:2614 +#: doc/tin.1:2642 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 " @@ -6209,7 +6219,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2620 +#: doc/tin.1:2648 msgid "" "When B starts up the user's kill-file " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter> (see also B<\\%tin>(5)) is " @@ -6218,7 +6228,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2625 +#: doc/tin.1:2653 msgid "" "The degree to which rules are applied depend on the B tinrc " "setting. By default killed articles will only be marked read. Adjust " @@ -6227,7 +6237,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2630 +#: doc/tin.1:2658 msgid "" "Filtering rules can be manually entered into " "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter> (but don't do this whilst running " @@ -6236,7 +6246,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2635 +#: doc/tin.1:2663 msgid "" "The filtering capabilities of B have been significantly enhanced over " "previous versions to include scoring and better pattern matching. It is " @@ -6245,13 +6255,13 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2637 +#: doc/tin.1:2665 msgid "Ehttp://www.tin.org/filtering.txtE." msgstr "" #. FIXME - Next paragraph is out of date #. type: Plain text -#: doc/tin.1:2650 +#: doc/tin.1:2678 msgid "" "The on-screen filtering menu is accessed by pressing B " "('B<^K>') or B ('B<^A>') at the Group and Article " @@ -6265,20 +6275,20 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:2650 +#: doc/tin.1:2678 #, no-wrap msgid "POSTING ARTICLES" msgstr "" #. type: Plain text -#: doc/tin.1:2653 +#: doc/tin.1:2681 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 -#: doc/tin.1:2663 +#: doc/tin.1:2691 msgid "" "Use the B ('B') command to post an article to a newsgroup. After " "entering the post subject the default editor (i.e., B<\\%vi>(1)) or the " @@ -6291,7 +6301,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2668 +#: doc/tin.1:2696 msgid "" "Use the B ('B') command to display a history of the " "articles you have posted. The date the article was posted, which newsgroups " @@ -6299,7 +6309,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2676 +#: doc/tin.1:2704 msgid "" "Use the B ('B'), B ('B') or " "B ('B<^W>') command to post a follow-up article to " @@ -6311,7 +6321,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2690 +#: doc/tin.1:2718 msgid "" "Use the B ('B'), B ('B') or " "B ('B<^E>') command to reply direct through mail to " @@ -6326,13 +6336,13 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:2690 +#: doc/tin.1:2718 #, no-wrap msgid "CUSTOMIZING THE ARTICLE QUOTE STRING" msgstr "" #. type: Plain text -#: doc/tin.1:2698 +#: doc/tin.1:2726 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 " @@ -6344,13 +6354,13 @@ msgid "" msgstr "" #. type: ta -#: doc/tin.1:2700 +#: doc/tin.1:2728 #, no-wrap msgid "\\w'%A 'u +\\w'Address'u" msgstr "" #. type: Plain text -#: doc/tin.1:2709 +#: doc/tin.1:2737 #, no-wrap msgid "" "B<%A>\tAddress (Email)\n" @@ -6364,12 +6374,12 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2712 +#: doc/tin.1:2740 msgid "e.g.," msgstr "" #. type: Plain text -#: doc/tin.1:2717 +#: doc/tin.1:2745 #, no-wrap msgid "" "CW, B, B or " "B ('B'), B ('B<|>'), B ('B'), B " @@ -6417,7 +6427,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2748 +#: doc/tin.1:2776 msgid "" "Auto-saving with B<*AutoSave> ('B') is a special case and operates only " "on marked articles. They will processed without any further prompting " @@ -6426,15 +6436,15 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2752 +#: doc/tin.1:2780 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." +"hot (auto-selected), regular expression pattern, tagged articles you wish to " +"mail, pipe etc." msgstr "" #. type: Plain text -#: doc/tin.1:2756 +#: doc/tin.1:2784 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 " @@ -6442,17 +6452,17 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2762 +#: doc/tin.1:2790 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 " -"News\"). Any articles that match the entered expression will be mailed, " -"piped etc. See also the B tinrc variable for advanced pattern " -"matching options." +"If a regular expression pattern is selected you are asked to enter a pattern " +"(e.g., to match all articles subject lines containing 'net News' you enter " +"\"net News\"). Any articles that match the entered expression will be " +"mailed, piped etc. See also the B tinrc variable for advanced " +"pattern matching options." msgstr "" #. type: Plain text -#: doc/tin.1:2767 +#: doc/tin.1:2795 msgid "" "Various expansion characters are recognized when entering the directory and " "file to save to. Environment variables (prefixed with '$') and user home " @@ -6461,7 +6471,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2772 +#: doc/tin.1:2800 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 " @@ -6470,7 +6480,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2776 +#: doc/tin.1:2804 msgid "" "To save in savedir/Enews.group.nameE/EfilenameE format enter " "'+EfilenameE'. Environment variables are allowed within a filename " @@ -6478,20 +6488,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2782 +#: doc/tin.1:2810 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 -#: doc/tin.1:2782 +#: doc/tin.1:2810 #, no-wrap msgid "AUTOMATIC MAILING AND SAVING NEW NEWS" msgstr "" #. type: Plain text -#: doc/tin.1:2794 +#: doc/tin.1:2822 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 " @@ -6500,13 +6510,13 @@ msgid "" "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 " +"structure under your B 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 -#: doc/tin.1:2798 +#: doc/tin.1:2826 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 " @@ -6514,7 +6524,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2805 +#: doc/tin.1:2833 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 " @@ -6525,50 +6535,50 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:2806 +#: doc/tin.1:2834 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2810 +#: doc/tin.1:2838 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 -#: doc/tin.1:2811 +#: doc/tin.1:2839 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2815 +#: doc/tin.1:2843 msgid "" "(save any unread articles in newsgroups specified in file newsrc.save and " "mark them as read)" msgstr "" #. type: TP -#: doc/tin.1:2816 +#: doc/tin.1:2844 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:2821 +#: doc/tin.1:2849 msgid "(read any articles saved by B)" msgstr "" #. type: SS -#: doc/tin.1:2821 +#: doc/tin.1:2849 #, no-wrap msgid "RANGES" msgstr "" #. type: Plain text -#: doc/tin.1:2832 +#: doc/tin.1:2860 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 " @@ -6582,13 +6592,13 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:2833 +#: doc/tin.1:2861 #, no-wrap msgid "NEWSGROUP LISTS & WILDCARDS" msgstr "" #. type: Plain text -#: doc/tin.1:2844 +#: doc/tin.1:2872 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 " @@ -6601,30 +6611,30 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2846 +#: doc/tin.1:2874 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:2848 +#: doc/tin.1:2876 msgid "Matches alt.config and everything in the 'news' hierarchy except news.test" msgstr "" #. type: Plain text -#: doc/tin.1:2853 +#: doc/tin.1:2881 msgid "" "See the explanation for the $B variables for further " "examples." msgstr "" #. type: SS -#: doc/tin.1:2853 +#: doc/tin.1:2881 #, no-wrap msgid "SIGNATURES" msgstr "" #. type: Plain text -#: doc/tin.1:2862 +#: doc/tin.1:2890 msgid "" "B will recognize a signature in either " "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature> or " @@ -6636,19 +6646,19 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2865 +#: doc/tin.1:2893 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 -#: doc/tin.1:2867 +#: doc/tin.1:2895 msgid "The following is an example of a I<.Sig> file:" msgstr "" #. type: Plain text -#: doc/tin.1:2872 +#: doc/tin.1:2900 #, no-wrap msgid "" "CWjoe@example.orgE\n" @@ -6656,7 +6666,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2887 +#: doc/tin.1:2915 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 " @@ -6670,13 +6680,13 @@ msgid "" msgstr "" #. type: SS -#: doc/tin.1:2887 +#: doc/tin.1:2915 #, no-wrap msgid "CUSTOMIZING THE SCREEN FORMAT" msgstr "" #. type: Plain text -#: doc/tin.1:2892 +#: doc/tin.1:2920 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 " @@ -6685,13 +6695,13 @@ msgid "" msgstr "" #. type: ta -#: doc/tin.1:2895 +#: doc/tin.1:2923 #, no-wrap msgid "\\w'%G 'u +\\w'current group/thread/article number'u" msgstr "" #. type: Plain text -#: doc/tin.1:2912 +#: doc/tin.1:2940 #, no-wrap msgid "" "B<%D>\tdate\n" @@ -6713,14 +6723,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2917 +#: doc/tin.1:2945 msgid "" "Not all variables can be used in each level. The following table provides an " "overview:" msgstr "" #. type: ta -#: doc/tin.1:2920 +#: doc/tin.1:2948 #, no-wrap msgid "" "\\w'%G 'uC +\\w'B 'uC +\\w'B 'uC " @@ -6728,7 +6738,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2938 +#: doc/tin.1:2966 #, no-wrap msgid "" "\tB\tB\tB\n" @@ -6751,18 +6761,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2942 +#: doc/tin.1:2970 msgid "Defaults for the format strings:" msgstr "" #. type: ta -#: doc/tin.1:2945 +#: doc/tin.1:2973 #, no-wrap msgid "\\w'select_format 'u +\\w'\"B<%n %m [%L] %T %F>\"'u" msgstr "" #. type: Plain text -#: doc/tin.1:2949 +#: doc/tin.1:2977 #, no-wrap msgid "" "B:\t\"B<%f %n %U %G %d>\"\n" @@ -6771,7 +6781,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2955 +#: doc/tin.1:2983 msgid "" "B controls whether the newsgroup description is shown or " "not. The description can also be toggled with B " @@ -6779,7 +6789,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2960 +#: doc/tin.1:2988 msgid "" "The information displayed with 'B<%F>' depends on the value of " "B. B resp. B " @@ -6787,35 +6797,50 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2964 +#: doc/tin.1:2992 msgid "" -"\\(cqB<%D>' uses B for date representation. It is possible to " +"For date representation 'B<%D>' uses B. 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:2974 +#: doc/tin.1:2996 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:" +"thread level 10 characters wide: 'B<%10S>'." +msgstr "" + +#. type: Plain text +#: doc/tin.1:3002 +msgid "" +"If the newsgroup name is displayed together with the newsgroup description, " +"the width of the newsgroup name can be controlled via a optional comma " +"separated second value (e.g. 'B<%60,20G>'). It is valid to omit the first " +"value (e.g. ('B<%,20G>')). If no second value is given, B uses a " +"default value of 32." +msgstr "" + +#. type: Plain text +#: doc/tin.1:3009 +msgid "" +"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, " +"that is 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, e.g. 'B<%6n>'. Here is an overview of the defaults:" msgstr "" #. type: ta -#: doc/tin.1:2977 +#: doc/tin.1:3012 #, no-wrap -msgid "\\w'Variable 'u\t+\\w'width'u" +msgid "\\w'Variable 'u +\\w'width'u" msgstr "" #. type: Plain text -#: doc/tin.1:2986 +#: doc/tin.1:3021 #, no-wrap msgid "" "Variable\twidth\n" @@ -6829,7 +6854,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:2997 +#: doc/tin.1:3032 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 " @@ -6842,7 +6867,15 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3001 +#: doc/tin.1:3036 +msgid "" +"In case the format string contains 'B<%G>' and 'B<%d>' and no length are " +"given, B determines the longest newsgroup name and uses this length for " +"'B<%G>'. The remaining space will used for 'B<%d>'." +msgstr "" + +#. type: Plain text +#: doc/tin.1:3040 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 " @@ -6850,35 +6883,35 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3009 +#: doc/tin.1:3048 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 " +"'B<%%>'). 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:3017 +#: doc/tin.1:3056 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>'." +"'B<%10E100S>'." msgstr "" #. type: SS -#: doc/tin.1:3017 +#: doc/tin.1:3056 #, no-wrap msgid "TIPS AND TRICKS" msgstr "" #. type: Plain text -#: doc/tin.1:3021 +#: doc/tin.1:3060 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 " @@ -6886,33 +6919,33 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3023 +#: doc/tin.1:3062 msgid "" "The following newsgroups provide useful information concerning news " "software:" msgstr "" #. type: Plain text -#: doc/tin.1:3026 +#: doc/tin.1:3065 msgid "" "\\(emnews.software.readers (info. about news user agents tin, rn, nn, slrn " "etc.)" msgstr "" #. type: Plain text -#: doc/tin.1:3028 +#: doc/tin.1:3067 msgid "\\(emnews.software.nntp (info. about NNTP)" msgstr "" #. type: Plain text -#: doc/tin.1:3030 +#: doc/tin.1:3069 msgid "" "\\(emnews.answers (Frequently Asked Questions (FAQ) about many different " "themes)" msgstr "" #. type: Plain text -#: doc/tin.1:3034 +#: doc/tin.1:3073 msgid "" "Many prompts within B offer a default choice that the cursor is " "positioned on. By pressing 'BCRE>' the default value is taken. " @@ -6920,14 +6953,14 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3041 +#: doc/tin.1:3080 msgid "" -"When B is run in an B<\\%xterm>(1x) it will resize itself each time " -"the B<\\%xterm>(1x) is resized." +"When B is run in a B<\\%xterm>(1x) it will resize itself each time the " +"B<\\%xterm>(1x) is resized." msgstr "" #. type: Plain text -#: doc/tin.1:3045 +#: doc/tin.1:3084 msgid "" "B will reread the " "I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}> file at set " @@ -6935,20 +6968,20 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3050 +#: doc/tin.1:3089 msgid "" "If you find large number of new newsgroups cluttering up your screen, " "pressing B ('B') will make them go away." msgstr "" #. type: SS -#: doc/tin.1:3050 +#: doc/tin.1:3089 #, no-wrap msgid "XTERM BUTTONS" msgstr "" #. type: Plain text -#: doc/tin.1:3056 +#: doc/tin.1:3095 msgid "" "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 " @@ -6957,103 +6990,103 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3058 +#: doc/tin.1:3097 msgid "In general (i.e., for the group, thread and article menus)," msgstr "" #. type: TP -#: doc/tin.1:3058 +#: doc/tin.1:3097 #, no-wrap msgid "Button1 (left)" msgstr "" #. type: Plain text -#: doc/tin.1:3061 +#: doc/tin.1:3100 msgid "enters next (lower) level if you click on an article, otherwise pages down." msgstr "" #. type: TP -#: doc/tin.1:3061 +#: doc/tin.1:3100 #, no-wrap msgid "Button2 (center)" msgstr "" #. type: Plain text -#: doc/tin.1:3065 +#: doc/tin.1:3104 msgid "" "returns to the previous (upper) level if you click on an article, otherwise " "pages up." msgstr "" #. type: TP -#: doc/tin.1:3065 +#: doc/tin.1:3104 #, no-wrap msgid "Button3 (right)" msgstr "" #. type: Plain text -#: doc/tin.1:3069 +#: doc/tin.1:3108 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 -#: doc/tin.1:3071 +#: doc/tin.1:3110 msgid "In the group selection menu, if the mouse is pointing at a group then:" msgstr "" #. type: TP -#: doc/tin.1:3071 doc/tin.1:3083 doc/tin.1:3097 +#: doc/tin.1:3110 doc/tin.1:3122 doc/tin.1:3136 #, no-wrap msgid "left button" msgstr "" #. type: Plain text -#: doc/tin.1:3075 +#: doc/tin.1:3114 msgid "" "moves to and selects the group pointed at, just like B " "('BCRE>')." msgstr "" #. type: TP -#: doc/tin.1:3075 doc/tin.1:3087 doc/tin.1:3100 +#: doc/tin.1:3114 doc/tin.1:3126 doc/tin.1:3139 #, no-wrap msgid "center button" msgstr "" #. type: Plain text -#: doc/tin.1:3078 +#: doc/tin.1:3117 msgid "quits the program, just like B ('B')." msgstr "" #. type: TP -#: doc/tin.1:3078 doc/tin.1:3092 doc/tin.1:3105 +#: doc/tin.1:3117 doc/tin.1:3131 doc/tin.1:3144 #, no-wrap msgid "right button" msgstr "" #. type: Plain text -#: doc/tin.1:3081 +#: doc/tin.1:3120 msgid "moves to the group pointed at." msgstr "" #. type: Plain text -#: doc/tin.1:3083 +#: doc/tin.1:3122 msgid "" "In the article menu, if the mouse is pointing at an article (or thread) " "then:" msgstr "" #. type: Plain text -#: doc/tin.1:3087 +#: doc/tin.1:3126 msgid "" "reads the article pointed at, just like B " "('BCRE>'), or the thread, just like B ('B')." msgstr "" #. type: Plain text -#: doc/tin.1:3092 +#: doc/tin.1:3131 msgid "" "exits the menu, catching up on the group if you have " "B set in your configuration, just like B " @@ -7061,22 +7094,22 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3095 +#: doc/tin.1:3134 msgid "moves to the article (or thread) pointed at." msgstr "" #. type: Plain text -#: doc/tin.1:3097 +#: doc/tin.1:3136 msgid "In the thread menu, if the mouse is pointing at an article then:" msgstr "" #. type: Plain text -#: doc/tin.1:3100 +#: doc/tin.1:3139 msgid "reads article pointed at, just like B ('BCRE>')." msgstr "" #. type: Plain text -#: doc/tin.1:3105 +#: doc/tin.1:3144 msgid "" "exits the menu, catching up on the thread if you have " "B set in your configuration, just like B " @@ -7084,25 +7117,25 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3108 +#: doc/tin.1:3147 msgid "moves to the article pointed at." msgstr "" #. type: Plain text -#: doc/tin.1:3115 +#: doc/tin.1:3154 msgid "" "In other menus and areas button pressing reverts back to usual cut and paste " "of B<\\%xterm>(1x), but after one click of any button." msgstr "" #. type: SS -#: doc/tin.1:3115 +#: doc/tin.1:3154 #, no-wrap msgid "INDEX FILES" msgstr "" #. type: Plain text -#: doc/tin.1:3120 +#: doc/tin.1:3159 msgid "" "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 " @@ -7110,7 +7143,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3126 +#: doc/tin.1:3165 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 " @@ -7120,7 +7153,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3135 +#: doc/tin.1:3174 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 " @@ -7132,7 +7165,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3142 +#: doc/tin.1:3181 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 " @@ -7143,27 +7176,27 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3147 +#: doc/tin.1:3186 msgid "" "As indexing might take some time you may want to run B form the system " "batcher B<\\%cron>(1) with the ''B<-u>'' option:" msgstr "" #. type: Plain text -#: doc/tin.1:3152 +#: doc/tin.1:3191 #, no-wrap msgid "CW<30 6 * * * /usr/local/bin/tin -u>\n" msgstr "" #. type: Plain text -#: doc/tin.1:3158 +#: doc/tin.1:3197 msgid "" "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 -#: doc/tin.1:3164 +#: doc/tin.1:3203 #, no-wrap msgid "" "CW(5)." msgstr "" #. type: Plain text -#: doc/tin.1:3189 doc/tin.5:43 +#: doc/tin.1:3228 doc/tin.5:43 msgid "I<$MAILCAPS>" msgstr "" #. type: Plain text -#: doc/tin.1:3191 doc/tin.5:45 +#: doc/tin.1:3230 doc/tin.5:45 msgid "I<~/.mailcap>" msgstr "" #. type: Plain text -#: doc/tin.1:3193 doc/tin.5:47 +#: doc/tin.1:3232 doc/tin.5:47 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3195 doc/tin.5:49 +#: doc/tin.1:3234 doc/tin.5:49 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3197 doc/tin.5:51 +#: doc/tin.1:3236 doc/tin.5:51 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3199 doc/tin.5:53 +#: doc/tin.1:3238 doc/tin.5:53 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3202 doc/tin.5:222 +#: doc/tin.1:3241 doc/tin.5:222 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3205 doc/tin.5:232 +#: doc/tin.1:3244 doc/tin.5:232 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.cancelsecret>" msgstr "" #. type: Plain text -#: doc/tin.1:3208 doc/tin.5:242 +#: doc/tin.1:3247 doc/tin.5:242 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.mime.types>" msgstr "" #. type: Plain text -#: doc/tin.1:3210 doc/tin.5:244 +#: doc/tin.1:3249 doc/tin.5:244 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3212 doc/tin.5:246 +#: doc/tin.1:3251 doc/tin.5:246 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3215 doc/tin.5:253 +#: doc/tin.1:3254 doc/tin.5:253 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsauth>" msgstr "" #. type: Plain text -#: doc/tin.1:3218 doc/tin.5:286 +#: doc/tin.1:3257 doc/tin.5:286 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>" msgstr "" #. type: Plain text -#: doc/tin.1:3222 doc/tin.5:315 +#: doc/tin.1:3261 doc/tin.5:315 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER${NNTPPORT:+\":$NNTPPORT\"}/.oldnewsrc>\n" msgstr "" #. type: Plain text -#: doc/tin.1:3226 doc/tin.5:323 +#: doc/tin.1:3265 doc/tin.5:323 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.signature>" msgstr "" #. type: Plain text -#: doc/tin.1:3228 doc/tin.5:325 +#: doc/tin.1:3267 doc/tin.5:325 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.Sig>" msgstr "" #. type: Plain text -#: doc/tin.1:3231 doc/tin.5:332 +#: doc/tin.1:3270 doc/tin.5:332 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.sigfixed>" msgstr "" #. type: Plain text -#: doc/tin.1:3234 doc/tin.5:339 +#: doc/tin.1:3273 doc/tin.5:339 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/.inputhistory>" msgstr "" #. type: Plain text -#: doc/tin.1:3237 doc/tin.5:346 +#: doc/tin.1:3276 doc/tin.5:346 msgid "I<${TIN_INDEX_MAILDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.mail/>" msgstr "" #. type: Plain text -#: doc/tin.1:3241 doc/tin.5:354 +#: doc/tin.1:3280 doc/tin.5:354 #, no-wrap msgid "I<${TIN_INDEX_NEWSDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.news${NNTPSERVER:+\"-$NNTPSERVER\"}/>\n" msgstr "" #. type: Plain text -#: doc/tin.1:3245 doc/tin.5:362 +#: doc/tin.1:3284 doc/tin.5:362 msgid "I<${TIN_INDEX_SAVEDIR:-\"${TIN_HOMEDIR:-\"$HOME\"}/.tin\"}/.save/>" msgstr "" #. type: Plain text -#: doc/tin.1:3248 doc/tin.5:369 +#: doc/tin.1:3287 doc/tin.5:369 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.mail>" msgstr "" #. type: Plain text -#: doc/tin.1:3251 doc/tin.5:403 +#: doc/tin.1:3290 doc/tin.5:403 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/active.save>" msgstr "" @@ -7319,66 +7352,66 @@ msgstr "" #. we should think about checking for the new Paths (/news/etc/) #. ${TIN_LIBDIR\-/news/etc"}/attributes #. type: Plain text -#: doc/tin.1:3255 doc/tin.5:414 +#: doc/tin.1:3294 doc/tin.5:414 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3257 doc/tin.5:416 +#: doc/tin.1:3296 doc/tin.5:416 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/attributes>" msgstr "" #. TODO: add missing descriptions and explain things in detail. #. type: Plain text -#: doc/tin.1:3260 doc/tin.5:747 +#: doc/tin.1:3299 doc/tin.5:750 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/filter>" msgstr "" #. type: Plain text -#: doc/tin.1:3264 doc/tin.5:829 +#: doc/tin.1:3303 doc/tin.5:832 #, no-wrap msgid "I\n" msgstr "" #. type: Plain text -#: doc/tin.1:3266 doc/tin.5:831 +#: doc/tin.1:3305 doc/tin.5:834 #, 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 -#: doc/tin.1:3270 doc/tin.5:1064 +#: doc/tin.1:3309 doc/tin.5:1067 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/mailgroups>" msgstr "" #. type: Plain text -#: doc/tin.1:3273 doc/tin.5:1080 +#: doc/tin.1:3312 doc/tin.5:1083 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/newsrctable>" msgstr "" #. type: Plain text -#: doc/tin.1:3276 doc/tin.5:1106 +#: doc/tin.1:3315 doc/tin.5:1109 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/posted>" msgstr "" #. type: Plain text -#: doc/tin.1:3279 doc/tin.5:1113 +#: doc/tin.1:3318 doc/tin.5:1116 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/Mail/posted>" msgstr "" #. type: Plain text -#: doc/tin.1:3282 doc/tin.5:1123 +#: doc/tin.1:3321 doc/tin.5:1126 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/postponed.articles>" msgstr "" #. type: Plain text -#: doc/tin.1:3286 +#: doc/tin.1:3325 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/newsgroups>\n" msgstr "" #. type: Plain text -#: doc/tin.1:3291 +#: doc/tin.1:3330 #, no-wrap msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/$NNTPSERVER:${NNTPPORT:+\":$NNTPPORT\"}/serverrc>\n" msgstr "" @@ -7388,22 +7421,22 @@ msgstr "" #. we should think about checking for the new Paths (/news/etc/) #. .IR ${TIN_LIBDIR\-"/news/etc"}/tinrc #. type: Plain text -#: doc/tin.1:3296 doc/tin.5:1176 +#: doc/tin.1:3335 doc/tin.5:1179 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3298 doc/tin.5:1178 +#: doc/tin.1:3337 doc/tin.5:1181 msgid "I<${TIN_HOMEDIR:-\"$HOME\"}/.tin/tinrc>" msgstr "" #. type: Plain text -#: doc/tin.1:3301 doc/tin.5:2355 +#: doc/tin.1:3340 doc/tin.5:2373 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3304 +#: doc/tin.1:3343 msgid "I" msgstr "" @@ -7412,51 +7445,51 @@ msgstr "" #. we should think about checking for the new Paths #. (described shown below). #. type: Plain text -#: doc/tin.1:3307 doc/tin.5:2465 +#: doc/tin.1:3346 doc/tin.5:2483 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}\"/\"${TIN_ACTIVEFILE:-active}>" msgstr "" #. type: Plain text -#: doc/tin.1:3310 doc/tin.5:2525 +#: doc/tin.1:3349 doc/tin.5:2543 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/active.times>" msgstr "" #. type: Plain text -#: doc/tin.1:3313 doc/tin.5:2552 +#: doc/tin.1:3352 doc/tin.5:2570 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/newsgroups>" msgstr "" #. type: Plain text -#: doc/tin.1:3316 doc/tin.5:2575 +#: doc/tin.1:3355 doc/tin.5:2593 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/organization>" msgstr "" #. is the Path correct? or is it /news/etc/overview.fmt #. type: Plain text -#: doc/tin.1:3319 doc/tin.5:2585 +#: doc/tin.1:3358 doc/tin.5:2603 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/overview.fmt>" msgstr "" #. is the Path correct? or is it /news/etc/subscriptions #. type: Plain text -#: doc/tin.1:3322 doc/tin.5:2603 +#: doc/tin.1:3361 doc/tin.5:2621 msgid "I<${TIN_LIBDIR:-NEWSLIBDIR}/subscriptions>" msgstr "" #. type: SH -#: doc/tin.1:3325 +#: doc/tin.1:3364 #, no-wrap msgid "ENVIRONMENT" msgstr "" #. type: TP -#: doc/tin.1:3328 +#: doc/tin.1:3367 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3336 +#: doc/tin.1:3375 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 " @@ -7467,13 +7500,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3336 +#: doc/tin.1:3375 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3341 +#: doc/tin.1:3380 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 " @@ -7481,13 +7514,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3341 +#: doc/tin.1:3380 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3347 +#: doc/tin.1:3386 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 " @@ -7495,13 +7528,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3347 +#: doc/tin.1:3386 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3353 +#: doc/tin.1:3392 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 " @@ -7509,13 +7542,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3353 +#: doc/tin.1:3392 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3359 +#: doc/tin.1:3398 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 " @@ -7523,13 +7556,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3359 +#: doc/tin.1:3398 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3364 +#: doc/tin.1:3403 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 " @@ -7537,13 +7570,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3364 +#: doc/tin.1:3403 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3369 +#: doc/tin.1:3408 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 " @@ -7551,13 +7584,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3369 +#: doc/tin.1:3408 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3374 +#: doc/tin.1:3413 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 " @@ -7565,27 +7598,27 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3374 +#: doc/tin.1:3413 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3380 +#: doc/tin.1:3419 msgid "" -"Define this variable if you want to override the B file name " +"Define this variable if you want to override the B filename " "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:3380 +#: doc/tin.1:3419 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3386 +#: doc/tin.1:3425 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 " @@ -7594,13 +7627,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3386 +#: doc/tin.1:3425 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3392 +#: doc/tin.1:3431 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 " @@ -7609,13 +7642,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3392 +#: doc/tin.1:3431 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3397 +#: doc/tin.1:3436 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 " @@ -7623,105 +7656,105 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3397 +#: doc/tin.1:3436 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3401 +#: doc/tin.1:3440 msgid "" "Set the article header field ''Distribution:'' to the contents of the " "variable instead of the system default." msgstr "" #. type: TP -#: doc/tin.1:3401 +#: doc/tin.1:3440 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3405 +#: doc/tin.1:3444 msgid "" "Set the ISO to ASCII charset decoding table character to use in decoding an " "article text. Values can range from -1 to 6." msgstr "" #. type: TP -#: doc/tin.1:3406 +#: doc/tin.1:3445 #, no-wrap msgid "B<-1>" msgstr "" #. type: Plain text -#: doc/tin.1:3409 +#: doc/tin.1:3448 msgid "no conversion" msgstr "" #. type: Plain text -#: doc/tin.1:3412 +#: doc/tin.1:3451 msgid "universal table for many languages" msgstr "" #. type: Plain text -#: doc/tin.1:3415 +#: doc/tin.1:3454 msgid "single-spacing universal table" msgstr "" #. type: Plain text -#: doc/tin.1:3418 +#: doc/tin.1:3457 msgid "table for Danish, Dutch, German, Norwegian and Swedish" msgstr "" #. type: TP -#: doc/tin.1:3418 +#: doc/tin.1:3457 #, no-wrap msgid "B<3>" msgstr "" #. type: Plain text -#: doc/tin.1:3421 +#: doc/tin.1:3460 msgid "" "table for Danish, Finnish, Norwegian and Swedish using the appropriate ISO " "646 variant" msgstr "" #. type: Plain text -#: doc/tin.1:3424 +#: doc/tin.1:3463 msgid "table with B codes in brackets" msgstr "" #. type: TP -#: doc/tin.1:3424 +#: doc/tin.1:3463 #, no-wrap msgid "B<5>" msgstr "" #. type: Plain text -#: doc/tin.1:3427 +#: doc/tin.1:3466 msgid "table for printers that allow overstriking with backspace" msgstr "" #. type: TP -#: doc/tin.1:3427 +#: doc/tin.1:3466 #, no-wrap msgid "B<6>" msgstr "" #. type: Plain text -#: doc/tin.1:3430 +#: doc/tin.1:3469 msgid "table for IBM PC character set (code page 437)" msgstr "" #. type: TP -#: doc/tin.1:3431 +#: doc/tin.1:3470 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3437 +#: doc/tin.1:3476 msgid "" "Set the article header field ''Organization:'' to the contents of the " "variable instead of the system default. If reading news on an Apollo " @@ -7730,24 +7763,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3437 +#: doc/tin.1:3476 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3440 +#: doc/tin.1:3479 msgid "DomainOS specific, same as $B on other OSs (see above)." msgstr "" #. type: TP -#: doc/tin.1:3440 +#: doc/tin.1:3479 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3445 +#: doc/tin.1:3484 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 " @@ -7755,72 +7788,72 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3445 +#: doc/tin.1:3484 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3449 +#: doc/tin.1:3488 msgid "" "Overrides the full name given in the gecos-files in I, see also " "B." msgstr "" #. type: TP -#: doc/tin.1:3449 +#: doc/tin.1:3488 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3452 +#: doc/tin.1:3491 msgid "Same as $B." msgstr "" #. type: TP -#: doc/tin.1:3452 +#: doc/tin.1:3491 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3457 +#: doc/tin.1:3496 msgid "Pathname of the user's home directory. See B<\\%environ>(5) for more info." msgstr "" #. type: TP -#: doc/tin.1:3457 +#: doc/tin.1:3496 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3461 +#: doc/tin.1:3500 msgid "" "This variable has precedence over the default mailer that is used in all " "mailing operations within B." msgstr "" #. type: TP -#: doc/tin.1:3461 +#: doc/tin.1:3500 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3464 +#: doc/tin.1:3503 msgid "Full path to the user's mailbox." msgstr "" #. type: TP -#: doc/tin.1:3464 +#: doc/tin.1:3503 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3473 +#: doc/tin.1:3512 msgid "" "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, " @@ -7829,13 +7862,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3473 +#: doc/tin.1:3512 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3482 +#: doc/tin.1:3521 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 " @@ -7844,13 +7877,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3482 +#: doc/tin.1:3521 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3488 +#: doc/tin.1:3527 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 " @@ -7859,12 +7892,12 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3490 +#: doc/tin.1:3529 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3495 +#: doc/tin.1:3534 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 " @@ -7873,25 +7906,25 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3495 +#: doc/tin.1:3534 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3499 +#: doc/tin.1:3538 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 -#: doc/tin.1:3501 +#: doc/tin.1:3540 msgid "I" msgstr "" #. type: Plain text -#: doc/tin.1:3505 +#: doc/tin.1:3544 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 " @@ -7899,104 +7932,104 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3505 +#: doc/tin.1:3544 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3509 +#: doc/tin.1:3548 msgid "" "A pathname of a directory made available for B to create temporary " "files." msgstr "" #. type: TP -#: doc/tin.1:3509 +#: doc/tin.1:3548 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3515 +#: doc/tin.1:3554 msgid "" "This variable can be used to override the default path search for " "B<\\%mailcap>(5) files. See also B<\\%tin>(5)." msgstr "" #. type: TP -#: doc/tin.1:3515 +#: doc/tin.1:3554 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3520 +#: doc/tin.1:3559 msgid "" "Set this variable to disable the use of B<\\%metamail>(1) or a replacement " "(e.g. metamutt)." msgstr "" #. type: TP -#: doc/tin.1:3520 +#: doc/tin.1:3559 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:3522 +#: doc/tin.1:3561 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3527 +#: doc/tin.1:3566 msgid "" "Set this variable to point to B<\\%ispell>(1) or a replacement and its " "cmd-line options." msgstr "" #. type: TP -#: doc/tin.1:3527 +#: doc/tin.1:3566 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3534 +#: doc/tin.1:3573 msgid "" "Define any additional options that you wish to pass to your B<\\%pgp>(1) or " "B<\\%gpg>(1) program." msgstr "" #. type: TP -#: doc/tin.1:3534 +#: doc/tin.1:3573 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3539 +#: doc/tin.1:3578 msgid "" "Override the name of the B<\\%pgp>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" #. type: TP -#: doc/tin.1:3539 +#: doc/tin.1:3578 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3544 +#: doc/tin.1:3583 msgid "" "Override the name of the B<\\%gpg>(1) directory in B<$HOME> that holds your " "keys etc.." msgstr "" #. type: TP -#: doc/tin.1:3544 +#: doc/tin.1:3583 #, no-wrap msgid "B" msgstr "" @@ -8004,7 +8037,7 @@ msgstr "" #. TODO: document LC_CTYPEs influence on #. ~/.tin/keymap.*, 8bit char display, ... #. type: Plain text -#: doc/tin.1:3558 +#: doc/tin.1:3597 msgid "" "This variable determines the B<\\%locale>(5) category for character " "handling functions. Usually it determines the character classes for pattern " @@ -8016,13 +8049,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3558 +#: doc/tin.1:3597 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3567 +#: doc/tin.1:3606 msgid "" "Formats of informative and diagnostic messages and interactive responses. " "It's value should be of the form " @@ -8031,13 +8064,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3567 +#: doc/tin.1:3606 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3575 +#: doc/tin.1:3614 msgid "" "Date and time formats. It's value should be of the form " "I[I<_territory>][I<.codeset>][I<@modifier>]. See B<\\%locale>(5) " @@ -8045,13 +8078,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3575 +#: doc/tin.1:3614 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3584 +#: doc/tin.1:3623 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 " @@ -8060,13 +8093,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3584 +#: doc/tin.1:3623 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3593 +#: doc/tin.1:3632 msgid "" "This variable determines the B<\\%locale>(5) category for any category not " "specifically selected with a variable starting with B<$LC_>. It's value " @@ -8075,13 +8108,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3593 +#: doc/tin.1:3632 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3601 +#: doc/tin.1:3640 msgid "" "This variable defines a priority list for translations. Whenever a " "translation is not available in the language selected via B<$LC_ALL> or " @@ -8091,13 +8124,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3601 +#: doc/tin.1:3640 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3611 +#: doc/tin.1:3650 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 " @@ -8110,13 +8143,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3611 +#: doc/tin.1:3650 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3621 +#: doc/tin.1:3660 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 " @@ -8129,108 +8162,108 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.1:3621 +#: doc/tin.1:3660 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3627 +#: doc/tin.1:3666 msgid "" "The type of terminal in use. This is used when looking up termcap " "sequences. See B<\\%environ>(5) for more information." msgstr "" #. type: TP -#: doc/tin.1:3627 +#: doc/tin.1:3666 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3630 +#: doc/tin.1:3669 msgid "Display name, pointing to the X server; required for xface." msgstr "" #. type: TP -#: doc/tin.1:3630 +#: doc/tin.1:3669 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3634 +#: doc/tin.1:3673 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:3634 +#: doc/tin.1:3673 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3638 +#: doc/tin.1:3677 msgid "" "The pathname of the user's login shell. Used to set " "B." msgstr "" #. type: TP -#: doc/tin.1:3638 +#: doc/tin.1:3677 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3643 -msgid "The pathname of the user's dir to put non-essential runtime files into." +#: doc/tin.1:3682 +msgid "The pathname of the user's dir to put non-essential run time files into." msgstr "" #. type: SH -#: doc/tin.1:3643 +#: doc/tin.1:3682 #, no-wrap msgid "SIGNALS" msgstr "" #. TODO: add missing, sort useful, document in detail #. type: Plain text -#: doc/tin.1:3647 +#: doc/tin.1:3686 msgid "B handles a couple of signals:" msgstr "" #. type: TP -#: doc/tin.1:3647 +#: doc/tin.1:3686 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3650 doc/tin.1:3653 +#: doc/tin.1:3689 doc/tin.1:3692 msgid "Terminate gracefully." msgstr "" #. type: TP -#: doc/tin.1:3650 +#: doc/tin.1:3689 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.1:3653 +#: doc/tin.1:3692 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.1:3656 -msgid "Terminate gracefully but do not restore tty." +#: doc/tin.1:3695 +msgid "Terminate gracefully but do not restore terminal (tty)." msgstr "" #. type: TP -#: doc/tin.1:3656 +#: doc/tin.1:3695 #, no-wrap msgid "B" msgstr "" @@ -8241,18 +8274,18 @@ msgstr "" #. give an overview of the most common error messages and how to cope with #. them. #. type: Plain text -#: doc/tin.1:3667 +#: doc/tin.1:3706 msgid "Write out I<${TIN_HOMEDIR:-\"$HOME\"}/.newsrc>-file." msgstr "" #. type: SH -#: doc/tin.1:3667 +#: doc/tin.1:3706 #, no-wrap msgid "SECURITY" msgstr "" #. type: Plain text -#: doc/tin.1:3675 +#: doc/tin.1:3714 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 " @@ -8261,7 +8294,7 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3675 +#: doc/tin.1:3714 #, no-wrap msgid "CONFORMING TO" msgstr "" @@ -8269,7 +8302,7 @@ msgstr "" #. - 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:3683 +#: doc/tin.1:3722 msgid "" "B does conform to the Base Definitions volume of IEEE Std 1003.1-2008, " "Section 12, Utility Conventions (Utility Argument Syntax, Utility Syntax " @@ -8277,13 +8310,13 @@ msgid "" msgstr "" #. type: SH -#: doc/tin.1:3683 +#: doc/tin.1:3722 #, no-wrap msgid "NOTES" msgstr "" #. type: Plain text -#: doc/tin.1:3688 +#: doc/tin.1:3727 msgid "" "Regular expression support is provided by the PCRE library package " "B<\\%pcre>(3), which is open source software, written by Philip Hazel, and " @@ -8291,18 +8324,18 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3692 +#: doc/tin.1:3731 msgid "Eftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/E" msgstr "" #. type: SH -#: doc/tin.1:3692 +#: doc/tin.1:3731 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: doc/tin.1:3700 +#: doc/tin.1:3739 msgid "" "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 " @@ -8311,24 +8344,24 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3709 +#: doc/tin.1:3748 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! " "Have a look at the doc/TODO file for known bugs. If you still think you've " "found a bug, please use the B ('B') function and write in " -"English. Please do NOT enclose a core-file in your bugreport until we " +"English. Please do NOT enclose a core-file in your bug-report until we " "request it." msgstr "" #. type: SH -#: doc/tin.1:3709 +#: doc/tin.1:3748 #, no-wrap msgid "HISTORY" msgstr "" #. type: Plain text -#: doc/tin.1:3718 +#: doc/tin.1:3757 msgid "" "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 " @@ -8339,169 +8372,169 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.1:3722 +#: doc/tin.1:3761 msgid "Ehttp://www.tin.org/history.htmlE." msgstr "" #. type: SH -#: doc/tin.1:3722 +#: doc/tin.1:3761 #, no-wrap msgid "CREDITS" msgstr "" #. type: IP -#: doc/tin.1:3724 +#: doc/tin.1:3763 #, no-wrap msgid "Rich Skrenta" msgstr "" #. type: Plain text -#: doc/tin.1:3728 +#: doc/tin.1:3767 msgid "author of B<\\%tass>(1) v3.2 which this newsreader used as its base." msgstr "" #. type: IP -#: doc/tin.1:3728 +#: doc/tin.1:3767 #, no-wrap msgid "Bill Davidsen" msgstr "" #. type: Plain text -#: doc/tin.1:3730 +#: doc/tin.1:3769 msgid "author of envarg.c environment variable reading routine." msgstr "" #. type: IP -#: doc/tin.1:3730 +#: doc/tin.1:3769 #, no-wrap msgid "Mike Gleason" msgstr "" #. type: Plain text -#: doc/tin.1:3732 +#: doc/tin.1:3771 msgid "author of sigfile.c random signature generation routines." msgstr "" #. type: IP -#: doc/tin.1:3732 +#: doc/tin.1:3771 #, no-wrap msgid "Markus Kuhn EMarkus.Kuhn@cl.cam.ac.ukE" msgstr "" #. type: Plain text -#: doc/tin.1:3734 +#: doc/tin.1:3773 msgid "author of langinfo.c, charset.c and iso2asc.txt ISO-8859-1 documentation." msgstr "" #. type: IP -#: doc/tin.1:3734 +#: doc/tin.1:3773 #, no-wrap msgid "Arnold Robbins" msgstr "" #. type: Plain text -#: doc/tin.1:3736 +#: doc/tin.1:3775 msgid "author of strftime.c date formatting routine." msgstr "" #. type: IP -#: doc/tin.1:3736 +#: doc/tin.1:3775 #, no-wrap msgid "Rich Salz" msgstr "" #. type: Plain text -#: doc/tin.1:3738 +#: doc/tin.1:3777 msgid "author of wildmat.c pattern matching and parsdate.y date parsing routines." msgstr "" #. type: IP -#: doc/tin.1:3738 +#: doc/tin.1:3777 #, no-wrap msgid "Dave Taylor" msgstr "" #. type: Plain text -#: doc/tin.1:3742 +#: doc/tin.1:3781 msgid "author of curses.c from the B<\\%elm>(1) mailreader." msgstr "" #. type: IP -#: doc/tin.1:3742 +#: doc/tin.1:3781 #, no-wrap msgid "Chris Thewalt" msgstr "" #. type: Plain text -#: doc/tin.1:3746 +#: doc/tin.1:3785 msgid "author of getline.c B<\\%emacs>(1) style editing routine." msgstr "" #. type: IP -#: doc/tin.1:3746 +#: doc/tin.1:3785 #, no-wrap msgid "Steven Madsen" msgstr "" #. type: Plain text -#: doc/tin.1:3750 +#: doc/tin.1:3789 msgid "for adding B<\\%pgp>(1) (Pretty Good Privacy) support." msgstr "" #. type: IP -#: doc/tin.1:3750 +#: doc/tin.1:3789 #, no-wrap msgid "Philip Hazel Eph10@cam.ac.ukE" msgstr "" #. type: Plain text -#: doc/tin.1:3754 +#: doc/tin.1:3793 msgid "for B<\\%pcre>(3) (Perl-compatible regular expression library)." msgstr "" #. type: IP -#: doc/tin.1:3754 +#: doc/tin.1:3793 #, no-wrap msgid "Patrick Powell Epapowell@astart.comE" msgstr "" #. type: Plain text -#: doc/tin.1:3762 +#: doc/tin.1:3801 msgid "for B<\\%snprintf>(3) and B<\\%vsnprintf>(3) fallbacks." msgstr "" #. type: SH -#: doc/tin.1:3762 +#: doc/tin.1:3801 #, no-wrap msgid "AUTHOR" msgstr "" #. type: TP -#: doc/tin.1:3763 +#: doc/tin.1:3802 #, no-wrap msgid "Iain Lea Eiain@bricbrac.deE" msgstr "" #. type: SH -#: doc/tin.1:3767 +#: doc/tin.1:3806 #, no-wrap msgid "MAINTAINER" msgstr "" #. type: TP -#: doc/tin.1:3768 +#: doc/tin.1:3807 #, no-wrap msgid "Urs Janssen Eurs@tin.orgE" msgstr "" #. type: SH -#: doc/tin.1:3772 doc/tin.5:2616 +#: doc/tin.1:3811 doc/tin.5:2634 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: doc/tin.1:3826 +#: doc/tin.1:3865 msgid "" "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), " @@ -8526,7 +8559,7 @@ msgstr "" #. type: Plain text #: doc/tin.5:20 msgid "" -"This manpage describes the various (config) files and their formats used by " +"This man page describes the various (config) files and their formats used by " "the B<\\%tin>(1) newsreader. All files are expected to have unix style " "('\\en' aka LF) line endings." msgstr "" @@ -8714,7 +8747,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:154 doc/tin.5:1073 +#: doc/tin.5:154 doc/tin.5:1076 #, no-wrap msgid "B" msgstr "" @@ -8767,7 +8800,7 @@ msgstr "" #. type: Plain text #: doc/tin.5:180 msgid "" -"The \"nametemplate\" field gives a file name format, in which %s will be " +"The \"nametemplate\" field gives a filename format, in which %s will be " "replaced by a short unique string to give the name of the temporary file to " "be passed to the viewing command. This is only expected to be relevant in " "environments where filename extensions are meaningful, e.g., one could " @@ -8785,7 +8818,7 @@ msgid "" msgstr "" #. 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 +#: doc/tin.5:185 doc/tin.5:271 doc/tin.5:299 doc/tin.5:389 doc/tin.5:707 doc/tin.5:814 doc/tin.5:1096 #, no-wrap msgid "Example:" msgstr "" @@ -8895,13 +8928,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:261 doc/tin.5:1084 +#: doc/tin.5:261 doc/tin.5:1087 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:264 doc/tin.5:1087 +#: doc/tin.5:264 doc/tin.5:1090 msgid "full qualified domain name of the news server." msgstr "" @@ -9152,24 +9185,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:434 doc/tin.5:1196 +#: doc/tin.5:434 doc/tin.5:1199 #, no-wrap msgid "B" msgstr "" #. 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 +#: 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:481 doc/tin.5:494 doc/tin.5:497 doc/tin.5:500 doc/tin.5:503 doc/tin.5:506 doc/tin.5:513 doc/tin.5:516 doc/tin.5:543 doc/tin.5:546 doc/tin.5:549 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:586 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:610 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:643 doc/tin.5:697 msgid "Identical to the tinrc variable of the same name" msgstr "" #. type: TP -#: doc/tin.5:437 doc/tin.5:1200 +#: doc/tin.5:437 doc/tin.5:1203 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:440 doc/tin.5:1203 +#: doc/tin.5:440 doc/tin.5:1206 #, no-wrap msgid "B" msgstr "" @@ -9181,19 +9214,19 @@ msgid "B" msgstr "" #. type: TP -#: doc/tin.5:446 doc/tin.5:1246 +#: doc/tin.5:446 doc/tin.5:1249 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:449 doc/tin.5:1250 +#: doc/tin.5:449 doc/tin.5:1253 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:452 doc/tin.5:1257 +#: doc/tin.5:452 doc/tin.5:1260 #, no-wrap msgid "B" msgstr "" @@ -9212,7 +9245,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:459 doc/tin.5:1263 +#: doc/tin.5:459 doc/tin.5:1266 #, no-wrap msgid "B" msgstr "" @@ -9226,7 +9259,7 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:465 doc/tin.5:1377 +#: doc/tin.5:465 doc/tin.5:1383 #, no-wrap msgid "B" msgstr "" @@ -9247,109 +9280,115 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:475 doc/tin.5:1492 +#: doc/tin.5:475 doc/tin.5:1500 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:478 +#: doc/tin.5:478 doc/tin.5:1505 +#, no-wrap +msgid "B" +msgstr "" + +#. type: TP +#: doc/tin.5:481 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:482 +#: doc/tin.5:485 msgid "" "Mailbox to save sent mails. The format of the mailbox is controlled via the " "tinrc B variable." msgstr "" #. type: TP -#: doc/tin.5:482 +#: doc/tin.5:485 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:485 +#: doc/tin.5:488 msgid "Set ''Followup-To:'' header to the specified group(s)." msgstr "" #. type: TP -#: doc/tin.5:485 doc/tin.5:774 +#: doc/tin.5:488 doc/tin.5:777 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:488 +#: doc/tin.5:491 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:488 doc/tin.5:1516 +#: doc/tin.5:491 doc/tin.5:1532 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:491 doc/tin.5:1519 +#: doc/tin.5:494 doc/tin.5:1535 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:494 doc/tin.5:1603 +#: doc/tin.5:497 doc/tin.5:1615 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:497 doc/tin.5:1615 doc/tin.5:2392 +#: doc/tin.5:500 doc/tin.5:1627 doc/tin.5:2410 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:500 doc/tin.5:1634 +#: doc/tin.5:503 doc/tin.5:1646 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:503 +#: doc/tin.5:506 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:507 +#: doc/tin.5:510 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 -#: doc/tin.5:507 doc/tin.5:1672 +#: doc/tin.5:510 doc/tin.5:1684 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:510 doc/tin.5:1669 +#: doc/tin.5:513 doc/tin.5:1681 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:513 +#: doc/tin.5:516 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:530 +#: doc/tin.5:533 msgid "" "Determines whether usenet articles are forwarded as attachment or " "inline. When set to OFF, the forwarded article will be included in the body " @@ -9368,13 +9407,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:530 +#: doc/tin.5:533 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:537 +#: doc/tin.5:540 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 " @@ -9383,31 +9422,31 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:537 doc/tin.5:1751 +#: doc/tin.5:540 doc/tin.5:1763 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:540 doc/tin.5:1758 +#: doc/tin.5:543 doc/tin.5:1770 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:543 doc/tin.5:1767 +#: doc/tin.5:546 doc/tin.5:1779 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:546 doc/tin.5:2365 +#: doc/tin.5:549 doc/tin.5:2383 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:553 +#: doc/tin.5:556 msgid "" "This can be used to set the article header field ''Organization:''. It " "overrides the setting (if any) of organization in I " @@ -9416,193 +9455,193 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:553 doc/tin.5:1795 +#: doc/tin.5:556 doc/tin.5:1807 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:556 doc/tin.5:1799 +#: doc/tin.5:559 doc/tin.5:1811 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:559 doc/tin.5:1810 doc/tin.5:2389 +#: doc/tin.5:562 doc/tin.5:1822 doc/tin.5:2407 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:562 doc/tin.5:1823 +#: doc/tin.5:565 doc/tin.5:1835 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:565 doc/tin.5:1815 +#: doc/tin.5:568 doc/tin.5:1827 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:568 doc/tin.5:1846 +#: doc/tin.5:571 doc/tin.5:1858 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:571 doc/tin.5:1860 +#: doc/tin.5:574 doc/tin.5:1872 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:574 doc/tin.5:1864 +#: doc/tin.5:577 doc/tin.5:1876 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:577 doc/tin.5:1868 +#: doc/tin.5:580 doc/tin.5:1880 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:580 doc/tin.5:1928 +#: doc/tin.5:583 doc/tin.5:1940 #, no-wrap msgid "B" msgstr "" #. TODO: document option #. type: TP -#: doc/tin.5:583 +#: doc/tin.5:586 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:586 doc/tin.5:1985 +#: doc/tin.5:589 doc/tin.5:1997 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:589 doc/tin.5:2011 +#: doc/tin.5:592 doc/tin.5:2023 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:592 doc/tin.5:2029 +#: doc/tin.5:595 doc/tin.5:2041 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:595 doc/tin.5:2037 +#: doc/tin.5:598 doc/tin.5:2049 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:598 doc/tin.5:2040 +#: doc/tin.5:601 doc/tin.5:2052 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:601 doc/tin.5:2043 +#: doc/tin.5:604 doc/tin.5:2055 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:604 doc/tin.5:2054 +#: doc/tin.5:607 doc/tin.5:2066 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:607 doc/tin.5:2064 +#: doc/tin.5:610 doc/tin.5:2076 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:610 +#: doc/tin.5:613 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:610 doc/tin.5:2093 +#: doc/tin.5:613 doc/tin.5:2105 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:613 doc/tin.5:2122 +#: doc/tin.5:616 doc/tin.5:2136 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:616 doc/tin.5:2151 +#: doc/tin.5:619 doc/tin.5:2165 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:619 doc/tin.5:2156 +#: doc/tin.5:622 doc/tin.5:2170 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:622 doc/tin.5:2190 +#: doc/tin.5:625 doc/tin.5:2204 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:625 doc/tin.5:2166 +#: doc/tin.5:628 doc/tin.5:2180 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:628 doc/tin.5:2185 +#: doc/tin.5:631 doc/tin.5:2199 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:631 doc/tin.5:2214 +#: doc/tin.5:634 doc/tin.5:2228 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:634 doc/tin.5:2294 +#: doc/tin.5:637 doc/tin.5:2308 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:637 doc/tin.5:2341 +#: doc/tin.5:640 doc/tin.5:2359 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:640 +#: doc/tin.5:643 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:645 +#: doc/tin.5:648 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 " @@ -9610,24 +9649,24 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:645 +#: doc/tin.5:648 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:648 +#: doc/tin.5:651 msgid "Insert ''X-Comment-To:'' header, this is only useful in FIDO groups." msgstr "" #. type: TP -#: doc/tin.5:648 +#: doc/tin.5:651 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:656 +#: doc/tin.5:659 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 " @@ -9638,13 +9677,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:656 +#: doc/tin.5:659 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:662 +#: doc/tin.5:665 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 " @@ -9652,46 +9691,46 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:662 +#: doc/tin.5:665 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:665 +#: doc/tin.5:668 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:665 +#: doc/tin.5:668 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:668 +#: doc/tin.5:671 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:668 +#: doc/tin.5:671 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:671 +#: doc/tin.5:674 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:671 +#: doc/tin.5:674 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:677 +#: doc/tin.5:680 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 " @@ -9700,65 +9739,65 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:677 +#: doc/tin.5:680 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:680 +#: doc/tin.5:683 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:680 +#: doc/tin.5:683 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:683 +#: doc/tin.5:686 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:683 +#: doc/tin.5:686 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:686 +#: doc/tin.5:689 msgid "Identical to the tinrc variable B" msgstr "" #. type: TP -#: doc/tin.5:686 +#: doc/tin.5:689 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:691 +#: doc/tin.5:694 msgid "" "Path and options for B<\\%ispell>(1)-like spell-checker, e.g. \"aspell " "--mode=email --dont-backup check\"" msgstr "" #. type: TP -#: doc/tin.5:691 doc/tin.5:1705 +#: doc/tin.5:694 doc/tin.5:1717 #, no-wrap msgid "B" msgstr "" #. type: TP -#: doc/tin.5:694 +#: doc/tin.5:697 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:703 +#: doc/tin.5:706 msgid "" "Assume (broken) articles without MIME charset declaration have this charset " "- default is US-ASCII. This attribute works only on systems with working " @@ -9767,7 +9806,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:713 +#: doc/tin.5:716 #, no-wrap msgid "" "# include extra headers\n" @@ -9778,7 +9817,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:717 +#: doc/tin.5:720 #, no-wrap msgid "" "# in *sources* set post process type to shar only\n" @@ -9787,7 +9826,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:724 +#: doc/tin.5:727 #, no-wrap msgid "" "# in *binaries* turn on full post processing,\n" @@ -9799,7 +9838,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:730 +#: doc/tin.5:733 #, no-wrap msgid "" "# in fido.* newsgroups change quote_chars\n" @@ -9810,7 +9849,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:736 +#: doc/tin.5:739 #, no-wrap msgid "" "# in *.test newsgroups, don't append signature\n" @@ -9821,7 +9860,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:740 +#: doc/tin.5:743 #, no-wrap msgid "" "# assume ISO-2022-JP-2 as charset\n" @@ -9830,7 +9869,7 @@ msgid "" msgstr "" #. type: Plain text -#: doc/tin.5:752 +#: doc/tin.5:755 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 " @@ -9838,13 +9877,13 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:752 +#: doc/tin.5:755 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:761 +#: doc/tin.5:764 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 " @@ -9855,55 +9894,55 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:761 +#: doc/tin.5:764 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:765 +#: doc/tin.5:768 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 -#: doc/tin.5:765 +#: doc/tin.5:768 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:768 +#: doc/tin.5:771 msgid "0=case-sensitive, 1=case-insensitive" msgstr "" #. type: TP -#: doc/tin.5:768 +#: doc/tin.5:771 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:771 +#: doc/tin.5:774 msgid "" "Score value of the rule; can also be one of the magic words \"kill\" or " "\"hot\"." msgstr "" #. type: TP -#: doc/tin.5:771 +#: doc/tin.5:774 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:774 +#: doc/tin.5:777 msgid "Match against ''Subject:''" msgstr "" #. type: Plain text -#: doc/tin.5:782 +#: doc/tin.5:785 msgid "" "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 " @@ -9912,57 +9951,57 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:782 +#: doc/tin.5:785 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:785 +#: doc/tin.5:788 msgid "Match against ''Message-ID:'' and full ''References:''" msgstr "" #. type: TP -#: doc/tin.5:785 +#: doc/tin.5:788 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:788 +#: doc/tin.5:791 msgid "Match against ''Message-ID:'' and last ''References:'' entry only" msgstr "" #. type: TP -#: doc/tin.5:788 +#: doc/tin.5:791 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:791 +#: doc/tin.5:794 msgid "Match against ''Message-ID:''" msgstr "" #. type: TP -#: doc/tin.5:791 +#: doc/tin.5:794 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:794 +#: doc/tin.5:797 msgid "Match against ''References:''" msgstr "" #. type: TP -#: doc/tin.5:794 +#: doc/tin.5:797 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:797 +#: doc/tin.5:800 msgid "" "Match against ''Lines:'', Enum matches less than, Enum matches more " "than." @@ -9970,24 +10009,24 @@ msgstr "" #. TODO: document option in detail #. type: TP -#: doc/tin.5:797 +#: doc/tin.5:800 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:801 +#: doc/tin.5:804 msgid "Match against ''From:'' address parser return codes." msgstr "" #. type: TP -#: doc/tin.5:801 +#: doc/tin.5:804 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: doc/tin.5:807 +#: doc/tin.5:810 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 " @@ -9996,18 +10035,18 @@ msgid "" msgstr "" #. type: TP -#: doc/tin.5:807 doc/tin.5:2535 +#: doc/tin.5:810 doc/tin.5:2553 #, no-wrap msgid "B